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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 8a9fc67072b88344b6194d955be1d2519655459e
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 24 09:02:27 2002 +0000

            Flag error instead of ASSERTing as a result of fix to 3083013.
            Not clear why this condition occurs, but better than ASSERTing
            for Alex 29.
    
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _setRequest:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2447 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7a5f32a..1ef7a4a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-24  Richard Williamson   <rjw at apple.com>
+
+        Flag error instead of ASSERTing as a result of fix to 3083013.
+        Not clear why this condition occurs, but better than ASSERTing
+        for Alex 29.
+        
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _setRequest:]):
+
 2002-10-24  Darin Adler  <darin at apple.com>
 
 	- fixed a crash I ran into in the new delegate code
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7a5f32a..1ef7a4a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-10-24  Richard Williamson   <rjw at apple.com>
+
+        Flag error instead of ASSERTing as a result of fix to 3083013.
+        Not clear why this condition occurs, but better than ASSERTing
+        for Alex 29.
+        
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _setRequest:]):
+
 2002-10-24  Darin Adler  <darin at apple.com>
 
 	- fixed a crash I ran into in the new delegate code
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index e408e56..bb036e8 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -271,7 +271,10 @@
     // source is committed. It would be a WebFoundation bug if it sent
     // a redirect callback after commit.
     ASSERT(!_private->committed);
-    ASSERT(_private->request != request);
+    if (_private->request == request){
+        ERROR ("_private->request == request\n");
+        return;
+    }
     
     [request retain];
     [_private->request release];

-- 
WebKit Debian packaging