[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 9b9f9fc15db01835754b780bc42544c21a85d9c3
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 29 20:55:43 2003 +0000

    	3159529 - REGRESSION: URLs with no path are saved as "-.html"
    
            Reviewed by darin, trey, kocienda.
    
            * Misc.subproj/WebResourceResponseExtras.m:
            (-[NSURL _web_suggestedFilenameForSavingWithMIMEType:]): Don't use the lastPathComponent if it is "/".
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3492 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e297f35..d873dbe 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-29  Chris Blumenberg  <cblu at apple.com>
+
+	3159529 - REGRESSION: URLs with no path are saved as "-.html"
+
+        Reviewed by darin, trey, kocienda.
+
+        * Misc.subproj/WebResourceResponseExtras.m:
+        (-[NSURL _web_suggestedFilenameForSavingWithMIMEType:]): Don't use the lastPathComponent if it is "/".
+
 2003-01-28  Trey Matteson  <trey at apple.com>
 
 	Removing ERROR() that isn't an error, left over from the Safari-48 download firedrill.
diff --git a/WebKit/Misc.subproj/WebNSURLResponseExtras.m b/WebKit/Misc.subproj/WebNSURLResponseExtras.m
index 78cb060..e4e8556 100644
--- a/WebKit/Misc.subproj/WebNSURLResponseExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLResponseExtras.m
@@ -56,10 +56,11 @@
 - (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType
 {
     // Get the filename from the URL. Try the lastPathComponent first.
-    NSString *filename = [[[self path] lastPathComponent] _web_filenameByFixingIllegalCharacters];
+    NSString *lastPathComponent = [[self path] lastPathComponent];
+    NSString *filename = [lastPathComponent _web_filenameByFixingIllegalCharacters];
     NSString *extension = nil;
 
-    if ([filename length] == 0) {
+    if ([filename length] == 0 || [lastPathComponent isEqualToString:@"/"]) {
         // lastPathComponent is no good, try the host.
         filename = [[self host] _web_filenameByFixingIllegalCharacters];
         if ([filename length] == 0) {
diff --git a/WebKit/Misc.subproj/WebResourceResponseExtras.m b/WebKit/Misc.subproj/WebResourceResponseExtras.m
index 78cb060..e4e8556 100644
--- a/WebKit/Misc.subproj/WebResourceResponseExtras.m
+++ b/WebKit/Misc.subproj/WebResourceResponseExtras.m
@@ -56,10 +56,11 @@
 - (NSString *)_web_suggestedFilenameForSavingWithMIMEType:(NSString *)MIMEType
 {
     // Get the filename from the URL. Try the lastPathComponent first.
-    NSString *filename = [[[self path] lastPathComponent] _web_filenameByFixingIllegalCharacters];
+    NSString *lastPathComponent = [[self path] lastPathComponent];
+    NSString *filename = [lastPathComponent _web_filenameByFixingIllegalCharacters];
     NSString *extension = nil;
 
-    if ([filename length] == 0) {
+    if ([filename length] == 0 || [lastPathComponent isEqualToString:@"/"]) {
         // lastPathComponent is no good, try the host.
         filename = [[self host] _web_filenameByFixingIllegalCharacters];
         if ([filename length] == 0) {

-- 
WebKit Debian packaging