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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:58:23 UTC 2009


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

            * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]):
    	Slightly better fix. Essentially just take out the assert.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2609 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 037e036..b0cb48c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-08  Darin Adler  <darin at apple.com>
 
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]):
+	Slightly better fix. Essentially just take out the assert.
+
+2002-11-08  Darin Adler  <darin at apple.com>
+
 	- fixed an assert I am seeing a lot
 
         * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]): Oops.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 037e036..b0cb48c 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-11-08  Darin Adler  <darin at apple.com>
 
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]):
+	Slightly better fix. Essentially just take out the assert.
+
+2002-11-08  Darin Adler  <darin at apple.com>
+
 	- fixed an assert I am seeing a lot
 
         * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _setRequest:]): Oops.
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 5e48fb2..192580e 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -276,11 +276,6 @@
     // a redirect callback after commit.
     ASSERT(!_private->committed);
 
-    // This happens once at the start.
-    if (_private->request == request) {
-        return;
-    }
-    
     WebResourceRequest *oldRequest = _private->request;
     
     _private->request = [request retain];

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list