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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 6d11d78fb9e92706031a51f7461544c9404c0943
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 2 22:39:08 2002 +0000

    2002-04-02  Chris Blumenberg  <cblu at apple.com>
    
            * Plugins.subproj/IFPluginView.mm: (-[IFPluginView
            IFURLHandleResourceDidCancelLoading:]), (-[IFPluginView
            IFURLHandle:resourceDidFailLoadingWithResult:]), (-[IFPluginView
            IFURLHandle:didRedirectToURL:]):
    
            Added support for the above callbacks.
    
            * WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
            IFURLHandle:resourceDataDidBecomeAvailable:]):
    
            Return an error if non-html is requested.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@940 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f585c51..902abde 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2002-04-02  Chris Blumenberg  <cblu at apple.com>
+
+	* Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+	IFURLHandleResourceDidCancelLoading:]), (-[IFPluginView
+	IFURLHandle:resourceDidFailLoadingWithResult:]), (-[IFPluginView
+	IFURLHandle:didRedirectToURL:]):
+
+	Added support for the above callbacks.
+
+	* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+	IFURLHandle:resourceDataDidBecomeAvailable:]):
+
+	Return an error if non-html is requested.	
+
 2002-04-02  Richard Williamson  <rjw at apple.com>
 
         More relaxed about invalid states.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f585c51..902abde 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-04-02  Chris Blumenberg  <cblu at apple.com>
+
+	* Plugins.subproj/IFPluginView.mm: (-[IFPluginView
+	IFURLHandleResourceDidCancelLoading:]), (-[IFPluginView
+	IFURLHandle:resourceDidFailLoadingWithResult:]), (-[IFPluginView
+	IFURLHandle:didRedirectToURL:]):
+
+	Added support for the above callbacks.
+
+	* WebView.subproj/IFMainURLHandleClient.mm: (-[IFMainURLHandleClient
+	IFURLHandle:resourceDataDidBecomeAvailable:]):
+
+	Return an error if non-html is requested.	
+
 2002-04-02  Richard Williamson  <rjw at apple.com>
 
         More relaxed about invalid states.
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index de221e4..4f9bd0d 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -375,10 +375,17 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
 
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
 {
+    [self stop];
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
 {
+    [self stop];
+}
+
+- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
+{
+    
 }
 
 // event methods
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index de221e4..4f9bd0d 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -375,10 +375,17 @@ static id IFPluginMake(NSRect rect, WCPlugin *plugin, NSString *url, NSString *m
 
 - (void)IFURLHandleResourceDidCancelLoading:(IFURLHandle *)sender
 {
+    [self stop];
 }
 
 - (void)IFURLHandle:(IFURLHandle *)sender resourceDidFailLoadingWithResult:(int)result
 {
+    [self stop];
+}
+
+- (void)IFURLHandle:(IFURLHandle *)sender didRedirectToURL:(NSURL *)url
+{
+    
 }
 
 // event methods
diff --git a/WebKit/WebView.subproj/IFMainURLHandleClient.mm b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
index 42435b5..4c6ccd4 100644
--- a/WebKit/WebView.subproj/IFMainURLHandleClient.mm
+++ b/WebKit/WebView.subproj/IFMainURLHandleClient.mm
@@ -63,6 +63,17 @@
 {
     WEBKITDEBUGLEVEL3 (WEBKIT_LOG_LOADING, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
     
+    //FIXME: This is a temporary hack to make sure we don't load non-html content. 
+    //Since the cache returns nil for contentType when the URL is in the cache (2892912),
+    //I assume the contentType is text/html for that case.
+    NSString *contentType = [sender contentType];
+    if(![contentType isEqualToString:@"text/html"] && contentType != nil){
+        [sender cancelLoadInBackground];
+        IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultUnsupportedMediaType failingURL: [sender url]];
+        [[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress:nil fromDataSource: dataSource];
+        [error release];
+        return;
+    }
     part->slotData(sender, (const char *)[data bytes], [data length]);
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 42435b5..4c6ccd4 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -63,6 +63,17 @@
 {
     WEBKITDEBUGLEVEL3 (WEBKIT_LOG_LOADING, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
     
+    //FIXME: This is a temporary hack to make sure we don't load non-html content. 
+    //Since the cache returns nil for contentType when the URL is in the cache (2892912),
+    //I assume the contentType is text/html for that case.
+    NSString *contentType = [sender contentType];
+    if(![contentType isEqualToString:@"text/html"] && contentType != nil){
+        [sender cancelLoadInBackground];
+        IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultUnsupportedMediaType failingURL: [sender url]];
+        [[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress:nil fromDataSource: dataSource];
+        [error release];
+        return;
+    }
     part->slotData(sender, (const char *)[data bytes], [data length]);
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 42435b5..4c6ccd4 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -63,6 +63,17 @@
 {
     WEBKITDEBUGLEVEL3 (WEBKIT_LOG_LOADING, "url = %s, data = 0x%08x, length %d\n", [[[sender url] absoluteString] cString], data, [data length]);
     
+    //FIXME: This is a temporary hack to make sure we don't load non-html content. 
+    //Since the cache returns nil for contentType when the URL is in the cache (2892912),
+    //I assume the contentType is text/html for that case.
+    NSString *contentType = [sender contentType];
+    if(![contentType isEqualToString:@"text/html"] && contentType != nil){
+        [sender cancelLoadInBackground];
+        IFError *error = [[IFError alloc] initWithErrorCode: IFURLHandleResultUnsupportedMediaType failingURL: [sender url]];
+        [[dataSource controller] _mainReceivedError: error forResource: [[sender url] absoluteString] partialProgress:nil fromDataSource: dataSource];
+        [error release];
+        return;
+    }
     part->slotData(sender, (const char *)[data bytes], [data length]);
     
     IFLoadProgress *loadProgress = [[IFLoadProgress alloc] init];

-- 
WebKit Debian packaging