[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 708e23d6e5f1d85fade2765b8b21ca00a28f257d
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 19 22:25:08 2003 +0000

    	Fixed: <rdar://problem/3488783>: Flash at http://www.sjwilson.net/reef/ does not load photos
    
            Reviewed by rjw.
    
            * Misc.subproj/WebKitNSStringExtras.h:
            * Misc.subproj/WebKitNSStringExtras.m:
            (-[NSString _web_stringByStrippingReturnCharacters]): new
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView requestWithURLCString:]): call _web_stringByStrippingReturnCharacters on the relative string
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 249908c..c22a003 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-11-19  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3488783>: Flash at http://www.sjwilson.net/reef/ does not load photos
+	
+        Reviewed by rjw.
+
+        * Misc.subproj/WebKitNSStringExtras.h:
+        * Misc.subproj/WebKitNSStringExtras.m:
+        (-[NSString _web_stringByStrippingReturnCharacters]): new
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView requestWithURLCString:]): call _web_stringByStrippingReturnCharacters on the relative string
+
 2003-11-19  Richard Williamson   <rjw at apple.com>
 
 	More LiveConnect stuff.  Horrible polling hack that
diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.h b/WebKit/Misc.subproj/WebKitNSStringExtras.h
index c220ae4..26f93d8 100644
--- a/WebKit/Misc.subproj/WebKitNSStringExtras.h
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.h
@@ -18,4 +18,6 @@
 // This works around 2774250.
 - (NSString *)_web_stringByAbbreviatingWithTildeInPath;
 
+- (NSString *)_web_stringByStrippingReturnCharacters;
+
 @end
diff --git a/WebKit/Misc.subproj/WebKitNSStringExtras.m b/WebKit/Misc.subproj/WebKitNSStringExtras.m
index 39d7a17..8761e67 100644
--- a/WebKit/Misc.subproj/WebKitNSStringExtras.m
+++ b/WebKit/Misc.subproj/WebKitNSStringExtras.m
@@ -114,4 +114,12 @@ static BOOL canUseFastRenderer (const UniChar *buffer, unsigned length)
     return [path stringByAbbreviatingWithTildeInPath];
 }
 
+- (NSString *)_web_stringByStrippingReturnCharacters
+{
+    NSMutableString *newString = [[self mutableCopy] autorelease];
+    [newString replaceOccurrencesOfString:@"\r" withString:@"" options:NSLiteralSearch range:NSMakeRange(0, [newString length])];
+    [newString replaceOccurrencesOfString:@"\n" withString:@"" options:NSLiteralSearch range:NSMakeRange(0, [newString length])];
+    return newString;
+}
+
 @end
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 51458cd..29a0b33 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -13,6 +13,7 @@
 #import <WebKit/WebFramePrivate.h> 
 #import <WebKit/WebFrameView.h>
 #import <WebKit/WebKitLogging.h>
+#import <WebKit/WebKitNSStringExtras.h>
 #import <WebKit/WebNetscapePluginStream.h>
 #import <WebKit/WebNullPluginView.h>
 #import <WebKit/WebNSURLExtras.h>
@@ -1193,9 +1194,12 @@ static OSStatus TSMEventHandler(EventHandlerCallRef inHandlerRef, EventRef inEve
         return nil;
     }
     
-    NSString *URLString = (NSString *)CFStringCreateWithCString(kCFAllocatorDefault, URLCString, kCFStringEncodingWindowsLatin1);
+    NSString *string = (NSString *)CFStringCreateWithCString(kCFAllocatorDefault, URLCString, kCFStringEncodingWindowsLatin1);
+    NSString *URLString = [string _web_stringByStrippingReturnCharacters];
+    [string release];
+    
     NSURL *URL = [NSURL _web_URLWithDataAsString:URLString relativeToURL:baseURL];
-    [URLString release];
+    
 
     if (!URL) {
         return nil;

-- 
WebKit Debian packaging