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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 8e256d0b8a53811f21b77d277b39075ac0433473
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 9 01:37:23 2002 +0000

    	- fixed an assert I am seeing a lot
    
            * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]): Oops.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2607 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 536ae60..037e036 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-08  Darin Adler  <darin at apple.com>
+
+	- fixed an assert I am seeing a lot
+
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]): Oops.
+
 2002-11-08  Richard Williamson   <rjw at apple.com>
 
         Solved missing glyph problem, but it's very slow, so
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 536ae60..037e036 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-11-08  Darin Adler  <darin at apple.com>
+
+	- fixed an assert I am seeing a lot
+
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]): Oops.
+
 2002-11-08  Richard Williamson   <rjw at apple.com>
 
         Solved missing glyph problem, but it's very slow, so
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 0713015..5e48fb2 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -275,7 +275,11 @@
     // source is committed. It would be a WebFoundation bug if it sent
     // a redirect callback after commit.
     ASSERT(!_private->committed);
-    ASSERT (_private->request != request);
+
+    // This happens once at the start.
+    if (_private->request == request) {
+        return;
+    }
     
     WebResourceRequest *oldRequest = _private->request;
     

-- 
WebKit Debian packaging