[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 bf66af9f1eab72f5916f5ef946057b983b8fd212
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 3 02:49:38 2002 +0000

            Fixed asseration failure caused by an iframe not having a correct mime type.
            We now assume that local files without extensions are html files.
    
            * WebView.subproj/IFWebControllerPrivate.mm:
            (+[IFWebController _MIMETypeForFile:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1498 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4e74ac1..a769079 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2002-07-02  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed asseration failure caused by an iframe not having a correct mime type.
+	We now assume that local files without extensions are html files. 
+
+        * WebView.subproj/IFWebControllerPrivate.mm:
+        (+[IFWebController _MIMETypeForFile:]):
+
+2002-07-02  Chris Blumenberg  <cblu at apple.com>
+
         - Moved all policy methods to IFWebControllerPolicyHandler.h
         - Moved all file URL error checking to WebKit
         - Implemented file URL policy methods
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 4e74ac1..a769079 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-07-02  Chris Blumenberg  <cblu at apple.com>
 
+	Fixed asseration failure caused by an iframe not having a correct mime type.
+	We now assume that local files without extensions are html files. 
+
+        * WebView.subproj/IFWebControllerPrivate.mm:
+        (+[IFWebController _MIMETypeForFile:]):
+
+2002-07-02  Chris Blumenberg  <cblu at apple.com>
+
         - Moved all policy methods to IFWebControllerPolicyHandler.h
         - Moved all file URL error checking to WebKit
         - Implemented file URL policy methods
diff --git a/WebKit/WebView.subproj/IFWebControllerPrivate.mm b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
index 499de5a..8c59f1d 100644
--- a/WebKit/WebView.subproj/IFWebControllerPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebControllerPrivate.mm
@@ -209,6 +209,9 @@
 {
     NSString *extension = [path pathExtension];
     
+    if([extension isEqualToString:@""])
+        return @"text/html";
+        
     return [[IFFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
 }
 
diff --git a/WebKit/WebView.subproj/WebControllerPrivate.m b/WebKit/WebView.subproj/WebControllerPrivate.m
index 499de5a..8c59f1d 100644
--- a/WebKit/WebView.subproj/WebControllerPrivate.m
+++ b/WebKit/WebView.subproj/WebControllerPrivate.m
@@ -209,6 +209,9 @@
 {
     NSString *extension = [path pathExtension];
     
+    if([extension isEqualToString:@""])
+        return @"text/html";
+        
     return [[IFFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
 }
 
diff --git a/WebKit/WebView.subproj/WebViewPrivate.m b/WebKit/WebView.subproj/WebViewPrivate.m
index 499de5a..8c59f1d 100644
--- a/WebKit/WebView.subproj/WebViewPrivate.m
+++ b/WebKit/WebView.subproj/WebViewPrivate.m
@@ -209,6 +209,9 @@
 {
     NSString *extension = [path pathExtension];
     
+    if([extension isEqualToString:@""])
+        return @"text/html";
+        
     return [[IFFileTypeMappings sharedMappings] MIMETypeForExtension:extension];
 }
 

-- 
WebKit Debian packaging