[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 e9e8744eb0c2805c25cc8778fa30123c90a8a8ad
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 4 07:25:50 2003 +0000

            Fix checks for about: to avoid using our 'fake' request when
            using WebDataProtocol.  This fixes the assertion in the Snippet
            Editor.
    
            Reviewed by mjs.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient continueAfterContentPolicy:response:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4021 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 607ef0e..ee1582d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-03  Richard Williamson  <rjw at apple.com>
+
+        Fix checks for about: to avoid using our 'fake' request when
+        using WebDataProtocol.  This fixes the assertion in the Snippet
+        Editor.
+        
+        Reviewed by mjs.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient continueAfterContentPolicy:response:]):
+
 2003-04-03  Trey Matteson  <trey at apple.com>
 
 	3218212 REGRESSION: page on screen draws ugly while printing is happening
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 40d9d0b..ddce419 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -160,12 +160,11 @@
 -(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(NSURLResponse *)r
 {
     [[dataSource _controller] setDefersCallbacks:NO];
-    NSURLRequest *req = [dataSource request];
 
     switch (contentPolicy) {
     case WebPolicyUse:
 	if (![WebView canShowMIMEType:[r MIMEType]]) {
-	    [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:[req URL]];
+	    [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:[[dataSource request] URL]];
 	    [self stopLoadingForPolicyChange];
 	    return;
 	}
@@ -193,7 +192,7 @@
 
     [super connection:connection didReceiveResponse:r];
 
-    if ([[req URL] _web_shouldLoadAsEmptyDocument]) {
+    if ([[request URL] _web_shouldLoadAsEmptyDocument]) {
 	[self connectionDidFinishLoading:connection];
     }
 }
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 40d9d0b..ddce419 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -160,12 +160,11 @@
 -(void)continueAfterContentPolicy:(WebPolicyAction)contentPolicy response:(NSURLResponse *)r
 {
     [[dataSource _controller] setDefersCallbacks:NO];
-    NSURLRequest *req = [dataSource request];
 
     switch (contentPolicy) {
     case WebPolicyUse:
 	if (![WebView canShowMIMEType:[r MIMEType]]) {
-	    [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:[req URL]];
+	    [[dataSource webFrame] _handleUnimplementablePolicyWithErrorCode:WebKitErrorCannotShowMIMEType forURL:[[dataSource request] URL]];
 	    [self stopLoadingForPolicyChange];
 	    return;
 	}
@@ -193,7 +192,7 @@
 
     [super connection:connection didReceiveResponse:r];
 
-    if ([[req URL] _web_shouldLoadAsEmptyDocument]) {
+    if ([[request URL] _web_shouldLoadAsEmptyDocument]) {
 	[self connectionDidFinishLoading:connection];
     }
 }

-- 
WebKit Debian packaging