[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit d750fec041956cb37af97d54484b8a84d18f0e2b
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 10 21:42:25 2003 +0000

            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: http://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
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-12-09  Maciej Stachowiak  <mjs at 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 at 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
--- 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 {
+	  // converting certain values (like null) to object can set an exception
+	  exec->clearException();
 	  body = args[0].toString(exec).qstring();
 	}
       }

-- 
WebKit Debian packaging