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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 650556d864bd9b318133844c1c5f31a19a9c1871
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 1 22:53:31 2003 +0000

            Reviewed by Richard.
    
    	<rdar://problem/3487185>: implement security checks for XMLHttpRequest
    
    	* WebCoreSupport.subproj/WebSubresourceClient.m:
            (-[WebSubresourceClient connection:willSendRequest:redirectResponse:]): Let
    	WebCore know about redirects.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5643 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5c92ef7..a9102e9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-21  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	<rdar://problem/3487185>: implement security checks for XMLHttpRequest
+        
+	* WebCoreSupport.subproj/WebSubresourceClient.m:
+        (-[WebSubresourceClient connection:willSendRequest:redirectResponse:]): Let
+	WebCore know about redirects.
+
 2003-12-01  Richard Williamson   <rjw at apple.com>
 
 	Moved grungy polling code from WebKit to the JavaPlugin.
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index ffa6d69..684b780 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -118,15 +118,14 @@
 
 - (NSURLRequest *)connection:(NSURLConnection *)con willSendRequest:(NSURLRequest *)newRequest redirectResponse:(NSURLResponse *)redirectResponse
 {
-    // FIXME: We do want to tell the client about redirects for subresources.
-    // But the current API doesn't give any way to tell redirects on
-    // the main page from redirects on subresources.
-
-    // FIXME: Need to make sure client sets cookie policy base URL
-    // properly on redirect when we have the new redirect
-    // request-adjusting API
+    NSURL *oldURL = [request URL];
+    NSURLRequest *clientRequest = [super connection:con willSendRequest:newRequest redirectResponse:redirectResponse];
+    
+    if (![oldURL isEqual:[clientRequest URL]]) {
+	[loader redirectedToURL:[clientRequest URL]];
+    }
 
-    return [super connection:con willSendRequest:newRequest redirectResponse:redirectResponse];
+    return clientRequest;
 }
 
 - (void)connection:(NSURLConnection *)con didReceiveResponse:(NSURLResponse *)r
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index ffa6d69..684b780 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -118,15 +118,14 @@
 
 - (NSURLRequest *)connection:(NSURLConnection *)con willSendRequest:(NSURLRequest *)newRequest redirectResponse:(NSURLResponse *)redirectResponse
 {
-    // FIXME: We do want to tell the client about redirects for subresources.
-    // But the current API doesn't give any way to tell redirects on
-    // the main page from redirects on subresources.
-
-    // FIXME: Need to make sure client sets cookie policy base URL
-    // properly on redirect when we have the new redirect
-    // request-adjusting API
+    NSURL *oldURL = [request URL];
+    NSURLRequest *clientRequest = [super connection:con willSendRequest:newRequest redirectResponse:redirectResponse];
+    
+    if (![oldURL isEqual:[clientRequest URL]]) {
+	[loader redirectedToURL:[clientRequest URL]];
+    }
 
-    return [super connection:con willSendRequest:newRequest redirectResponse:redirectResponse];
+    return clientRequest;
 }
 
 - (void)connection:(NSURLConnection *)con didReceiveResponse:(NSURLResponse *)r

-- 
WebKit Debian packaging