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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 9054a8573cd39572325cfcfaa86cd817c5f36900
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 25 22:08:30 2003 +0000

            Reviewed by Richard
    
    	Fixed a bug that could occur in the new immutable/mutable
    	request scheme. When opening a javascript window, it was
    	possible for a request passed as a method argument to be
    	released during the course of a method, particularly
    	after that request was passed to willSendRequest:.
    	The solution is to ask the data source for its current
    	request rather than using the one stored in the method
    	argument.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient startLoading:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3917 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 2d6f0dc..de06d97 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2003-03-25  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Richard
+
+	Fixed a bug that could occur in the new immutable/mutable
+	request scheme. When opening a javascript window, it was
+	possible for a request passed as a method argument to be
+	released during the course of a method, particularly
+	after that request was passed to willSendRequest:.
+	The solution is to ask the data source for its current
+	request rather than using the one stored in the method
+	argument.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient startLoading:]):
+
 2003-03-24  Trey Matteson  <trey at apple.com>
 
 	Pass -seg_addr_table_filename <FILENAME> to ld.  This makes our frameworks in
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index aca3ba5..635d12c 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -272,7 +272,7 @@
 	[self resource:resource willSendRequest:r];
 
 	WebResponse *rsp = [[WebResponse alloc] init];
-	[rsp setURL:[r URL]];
+	[rsp setURL:[[[self dataSource] request] URL]];
 	[rsp setContentType:@"text/html"];
 	[rsp setContentLength:0];
 	[self resource:resource didReceiveResponse:rsp];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index aca3ba5..635d12c 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -272,7 +272,7 @@
 	[self resource:resource willSendRequest:r];
 
 	WebResponse *rsp = [[WebResponse alloc] init];
-	[rsp setURL:[r URL]];
+	[rsp setURL:[[[self dataSource] request] URL]];
 	[rsp setContentType:@"text/html"];
 	[rsp setContentLength:0];
 	[self resource:resource didReceiveResponse:rsp];

-- 
WebKit Debian packaging