Reviewed by John.

	<rdar://problem/3504155>: Safari fails XMLHttpRequest abort test

	* khtml/ecma/xmlhttprequest.cpp:
        (KJS::XMLHttpRequestProtoFunc::tryCall): Avoid throwing an
	exception after send().

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@5743 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 58cf534..91e7256 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-12-09  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by John.
+
+       <rdar://problem/3504155>: Safari fails XMLHttpRequest abort test
+        
+       * khtml/ecma/xmlhttprequest.cpp:
+        (KJS::XMLHttpRequestProtoFunc::tryCall): Avoid throwing an
+       exception after send().
+

 2003-12-09  David Hyatt  <hyatt@apple.com>
 
        Rename -apple-aqua to auto for outline styles.
 2003-12-09  David Hyatt  <hyatt@apple.com>
 
        Rename -apple-aqua to auto for outline styles.

diff --git a/WebCore/khtml/ecma/xmlhttprequest.cpp b/WebCore/khtml/ecma/xmlhttprequest.cpp
index 2c3b501..2349369 100644 (file)
--- a/WebCore/khtml/ecma/xmlhttprequest.cpp
+++ b/WebCore/khtml/ecma/xmlhttprequest.cpp
@@ -549,6 +549,8 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L
             exec->setException(err);
          }
        } else {
             exec->setException(err);
          }
        } else {

+         // converting certain values (like null) to object can set an exception
+         exec->clearException();

          body = args[0].toString(exec).qstring();
        }
       }
          body = args[0].toString(exec).qstring();
        }
       }