[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 1894f2ca1360909ae77903d8226d7c85c93aff62
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 4 21:07:11 2002 +0000

            Ensure that we return non-nil request  from handle:willSendRequest:
            even when WK's laod delegate is nil.
    
            * WebCoreSupport.subproj/WebSubresourceClient.m:
            (-[WebSubresourceClient handle:willSendRequest:]):
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:willSendRequest:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2248 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2f1f59d..b6b474f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-10-04  Richard Williamson   <rjw at apple.com>
+
+        Ensure that we return non-nil request  from handle:willSendRequest:
+        even when WK's laod delegate is nil.
+        
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (-[WebSubresourceClient handle:willSendRequest:]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         * Panels.subproj/WebAuthenticationPanel.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 2f1f59d..b6b474f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-10-04  Richard Williamson   <rjw at apple.com>
+
+        Ensure that we return non-nil request  from handle:willSendRequest:
+        even when WK's laod delegate is nil.
+        
+        * WebCoreSupport.subproj/WebSubresourceClient.m:
+        (-[WebSubresourceClient handle:willSendRequest:]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+
 2002-10-04  Darin Adler  <darin at apple.com>
 
         * Panels.subproj/WebAuthenticationPanel.m:
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 9587034..17e109f 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -137,7 +137,10 @@
     }
 
     // Let the resourceProgressDelegate get a crack at modifying the request.
-    newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+    if (resourceProgressDelegate)
+        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+        
+    ASSERT (newRequest != nil); 
 
     [newRequest retain];
     [request release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 9587034..17e109f 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -137,7 +137,10 @@
     }
 
     // Let the resourceProgressDelegate get a crack at modifying the request.
-    newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+    if (resourceProgressDelegate)
+        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+        
+    ASSERT (newRequest != nil); 
 
     [newRequest retain];
     [request release];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 140c051..1b0fbe4 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -218,7 +218,10 @@
     }
 
     // Let the resourceProgressDelegate get a crack at modifying the request.
-    newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+    if (resourceProgressDelegate)
+        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+
+    ASSERT (newRequest != nil);
 
     WebResourceRequest *oldRequest = request;
     request = [newRequest copy];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 140c051..1b0fbe4 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -218,7 +218,10 @@
     }
 
     // Let the resourceProgressDelegate get a crack at modifying the request.
-    newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+    if (resourceProgressDelegate)
+        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+
+    ASSERT (newRequest != nil);
 
     WebResourceRequest *oldRequest = request;
     request = [newRequest copy];

-- 
WebKit Debian packaging