[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 314ebd333a1986f3759b21f7706a2f8ff7e2ffe3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 10 22:29:55 2002 +0000

    	- fixed 3069366 -- REGRESSION: no pop-up window at inkfinder.com
    
    	The window now pops up, but it doesn't seem to work right. But I
    	think the window working right is a separate issue.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:willSendRequest:]): Make sure we
    	use the copy of the request that we're keeping around when we call
    	_setRequest on the data source, rather than the copy we're returning
    	which can be modified by WebFoundation. Also rearrange things so we're
    	more likely to get things right when the delegate changes the URL on
    	the request.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2303 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4728722..a2cbde4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,6 +1,22 @@
+2002-10-10  Darin Adler  <darin at apple.com>
+
+	- fixed 3069366 -- REGRESSION: no pop-up window at inkfinder.com
+
+	The window now pops up, but it doesn't seem to work right. But I
+	think the window working right is a separate issue.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]): Make sure we
+	use the copy of the request that we're keeping around when we call
+	_setRequest on the data source, rather than the copy we're returning
+	which can be modified by WebFoundation. Also rearrange things so we're
+	more likely to get things right when the delegate changes the URL on
+	the request.
+
 2002-10-10  Chris Blumenberg  <cblu at apple.com>
 
-	No need to send update event when activating/deactivating. This was as old workaround for the plug-in drawing problems.
+	No need to send update event when activating/deactivating.
+	This was as old workaround for the plug-in drawing problems.
 
         * Plugins.subproj/WebBaseNetscapePluginView.m:
         (-[WebBaseNetscapePluginView windowBecameKey:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4728722..a2cbde4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,6 +1,22 @@
+2002-10-10  Darin Adler  <darin at apple.com>
+
+	- fixed 3069366 -- REGRESSION: no pop-up window at inkfinder.com
+
+	The window now pops up, but it doesn't seem to work right. But I
+	think the window working right is a separate issue.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]): Make sure we
+	use the copy of the request that we're keeping around when we call
+	_setRequest on the data source, rather than the copy we're returning
+	which can be modified by WebFoundation. Also rearrange things so we're
+	more likely to get things right when the delegate changes the URL on
+	the request.
+
 2002-10-10  Chris Blumenberg  <cblu at apple.com>
 
-	No need to send update event when activating/deactivating. This was as old workaround for the plug-in drawing problems.
+	No need to send update event when activating/deactivating.
+	This was as old workaround for the plug-in drawing problems.
 
         * Plugins.subproj/WebBaseNetscapePluginView.m:
         (-[WebBaseNetscapePluginView windowBecameKey:]):
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index fb86ad0..66815fe 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -197,7 +197,14 @@
 
 -(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)newRequest
 {
-    WebController *controller = [dataSource controller];
+    [newRequest setUserAgent:[[dataSource controller] userAgentForURL:[newRequest URL]]];
+
+    // Let the resourceProgressDelegate get a crack at modifying the request.
+    if (resourceProgressDelegate)
+        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+    
+    ASSERT(newRequest != nil);
+
     NSURL *URL = [newRequest URL];
 
     LOG(Redirect, "URL = %@", URL);
@@ -205,12 +212,12 @@
     // FIXME: need to update main document URL here, or cookies set
     // via redirects might not work in main document mode
 
-    [newRequest setUserAgent:[controller userAgentForURL:URL]];
+    WebResourceRequest *copy = [newRequest copy];
 
     // Don't set this on the first request.  It is set
     // when the main load was started.
     if (request)
-        [dataSource _setRequest:newRequest];
+        [dataSource _setRequest:copy];
 
     // Not the first send, so reload.
     if (request) {
@@ -218,15 +225,8 @@
         [self didStartLoadingWithURL:URL];
     }
 
-    // Let the resourceProgressDelegate get a crack at modifying the request.
-    if (resourceProgressDelegate)
-        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
-
-    ASSERT (newRequest != nil);
-
-    WebResourceRequest *oldRequest = request;
-    request = [newRequest copy];
-    [oldRequest release];
+    [request release];
+    request = copy;
         
     return newRequest;
 }
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index fb86ad0..66815fe 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -197,7 +197,14 @@
 
 -(WebResourceRequest *)handle:(WebResourceHandle *)handle willSendRequest:(WebResourceRequest *)newRequest
 {
-    WebController *controller = [dataSource controller];
+    [newRequest setUserAgent:[[dataSource controller] userAgentForURL:[newRequest URL]]];
+
+    // Let the resourceProgressDelegate get a crack at modifying the request.
+    if (resourceProgressDelegate)
+        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
+    
+    ASSERT(newRequest != nil);
+
     NSURL *URL = [newRequest URL];
 
     LOG(Redirect, "URL = %@", URL);
@@ -205,12 +212,12 @@
     // FIXME: need to update main document URL here, or cookies set
     // via redirects might not work in main document mode
 
-    [newRequest setUserAgent:[controller userAgentForURL:URL]];
+    WebResourceRequest *copy = [newRequest copy];
 
     // Don't set this on the first request.  It is set
     // when the main load was started.
     if (request)
-        [dataSource _setRequest:newRequest];
+        [dataSource _setRequest:copy];
 
     // Not the first send, so reload.
     if (request) {
@@ -218,15 +225,8 @@
         [self didStartLoadingWithURL:URL];
     }
 
-    // Let the resourceProgressDelegate get a crack at modifying the request.
-    if (resourceProgressDelegate)
-        newRequest = [resourceProgressDelegate resourceRequest: request willSendRequest: newRequest fromDataSource: dataSource];
-
-    ASSERT (newRequest != nil);
-
-    WebResourceRequest *oldRequest = request;
-    request = [newRequest copy];
-    [oldRequest release];
+    [request release];
+    request = copy;
         
     return newRequest;
 }

-- 
WebKit Debian packaging