[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 92eedbdfa2456ca766cd8fa59b7a35472161d389
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 8 20:54:10 2002 +0000

    WebFoundation:
    
    	- Sniff file resources for HTML if we can't determine a MIME type.
    	- Assume resources without content types or extensions are HTML.
    
            * CacheLoader.subproj/WebResourceResponse.m:
            (-[WebResourceResponse contentType]): Cleaned up, make HTML assumption
            * Misc.subproj/WebNSStringExtras.h:
            * Misc.subproj/WebNSStringExtras.m:
            (-[NSString _web_isExtensionDefinite]): added, returns YES for common extensions that should be correct.
            * ProtocolHandlers.subproj/WebFileProtocolHandler.m:
            (-[WebFileProtocolHandler didLoadData:]): sniff if  !_web_isExtensionDefinite
    
    WebKit:
    
    	Moved assumption that a resource without a content type or extension is HTML to WebFoundation.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:didReceiveResponse:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 57ea189..44965f6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2002-10-08  Chris Blumenberg  <cblu at apple.com>
 
+	Moved assumption that a resource without a content type or extension is HTML to WebFoundation.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+
+2002-10-08  Chris Blumenberg  <cblu at apple.com>
+
 	Minor plug-in code clean-up.
 
         * Plugins.subproj/WebBaseNetscapePluginView.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 57ea189..44965f6 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-10-08  Chris Blumenberg  <cblu at apple.com>
 
+	Moved assumption that a resource without a content type or extension is HTML to WebFoundation.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveResponse:]):
+
+2002-10-08  Chris Blumenberg  <cblu at apple.com>
+
 	Minor plug-in code clean-up.
 
         * Plugins.subproj/WebBaseNetscapePluginView.m:
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 1b0fbe4..4674874 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -240,10 +240,6 @@
     
     [dataSource _setResponse:response];
 
-    // Make assumption that if the contentType is the default and there is no extension, this is text/html.
-    if ([contentType isEqualToString:@"application/octet-stream"]
-            && [[[currentURL path] pathExtension] isEqualToString:@""])
-        contentType = @"text/html";
     LOG(Download, "main content type: %@", contentType);
 
     // Retain the downloadProgressDelegate just in case this is a download.
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 1b0fbe4..4674874 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -240,10 +240,6 @@
     
     [dataSource _setResponse:response];
 
-    // Make assumption that if the contentType is the default and there is no extension, this is text/html.
-    if ([contentType isEqualToString:@"application/octet-stream"]
-            && [[[currentURL path] pathExtension] isEqualToString:@""])
-        contentType = @"text/html";
     LOG(Download, "main content type: %@", contentType);
 
     // Retain the downloadProgressDelegate just in case this is a download.

-- 
WebKit Debian packaging