[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 17ed5757719be57f0d9e3fd1374c8467a2a8640b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 24 06:50:38 2002 +0000

    	- fixed 3083013 -- REGRESSION: Cookie refused at http://directory/ even on reload
    
    	Restore a bit of the cruft.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:willSendRequest:]):
    	We need to change the request on the data source when a redirect happens,
    	because the data source goes on to ultimately communicate this to WebCore.
    	Restored the code that did that, with some changes to fit into the new regime.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2444 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 55d9052..f2d3dc4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-23  Darin Adler  <darin at apple.com>
+
+	- fixed 3083013 -- REGRESSION: Cookie refused at http://directory/ even on reload
+
+	Restore a bit of the cruft.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+	We need to change the request on the data source when a redirect happens,
+	because the data source goes on to ultimately communicate this to WebCore.
+	Restored the code that did that, with some changes to fit into the new regime.
+
 2002-10-23  Richard Williamson  <rjw at apple.com>
 
         Cleaned up months of accumulated cruft.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 55d9052..f2d3dc4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,15 @@
+2002-10-23  Darin Adler  <darin at apple.com>
+
+	- fixed 3083013 -- REGRESSION: Cookie refused at http://directory/ even on reload
+
+	Restore a bit of the cruft.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+	We need to change the request on the data source when a redirect happens,
+	because the data source goes on to ultimately communicate this to WebCore.
+	Restored the code that did that, with some changes to fit into the new regime.
+
 2002-10-23  Richard Williamson  <rjw at apple.com>
 
         Cleaned up months of accumulated cruft.
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 13f6043..5330397 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -106,6 +106,8 @@
 {
     WebResourceRequest *result;
 
+    BOOL firstRequest = request == nil;
+
     newRequest = [super handle: h willSendRequest: newRequest];
     
     ASSERT(newRequest != nil);
@@ -126,6 +128,12 @@
         if ([dataSource webFrame] == [[dataSource controller] mainFrame]) {
             [newRequest setCookiePolicyBaseURL:URL];
         }
+        
+	// Don't set this on the first request.  It is set
+	// when the main load was started.
+	if (!firstRequest)
+            [dataSource _setRequest:request];
+        
         result = newRequest;
     }
         
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 13f6043..5330397 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -106,6 +106,8 @@
 {
     WebResourceRequest *result;
 
+    BOOL firstRequest = request == nil;
+
     newRequest = [super handle: h willSendRequest: newRequest];
     
     ASSERT(newRequest != nil);
@@ -126,6 +128,12 @@
         if ([dataSource webFrame] == [[dataSource controller] mainFrame]) {
             [newRequest setCookiePolicyBaseURL:URL];
         }
+        
+	// Don't set this on the first request.  It is set
+	// when the main load was started.
+	if (!firstRequest)
+            [dataSource _setRequest:request];
+        
         result = newRequest;
     }
         

-- 
WebKit Debian packaging