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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit c9dd8a1acc4a977290c1e42a7afcc36a5cf0925c
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 7 20:53:48 2003 +0000

            Reviewed by Darin
    
    	Fix for this bug:
    
    	<rdar://problem/3368552>: Fix inappropriate use of NSURL creation methods in WebKit
    
    	Change calls to URLWithString: or URLWithString:relativeToURL to
    	_web_URLWithDataAsString: and _web_URLWithDataAsString:relativeToURL,
    	respectively.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _loadItem:withLoadType:]):
            (-[WebFrame _loadURL:intoChild:]):
            * WebView.subproj/WebPreferences.m:
            (-[WebPreferences userStyleSheetLocation]):
            * WebView.subproj/WebView.m:
            (-[WebView takeStringURLFrom:]):
            (-[WebView setMainFrameURL:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4786 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 18fed22..090734e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,24 @@
+2003-08-07  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+	
+	Fix for this bug:
+
+	<rdar://problem/3368552>: Fix inappropriate use of NSURL creation methods in WebKit
+
+	Change calls to URLWithString: or URLWithString:relativeToURL to
+	_web_URLWithDataAsString: and _web_URLWithDataAsString:relativeToURL,
+	respectively.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadItem:withLoadType:]):
+        (-[WebFrame _loadURL:intoChild:]):
+        * WebView.subproj/WebPreferences.m:
+        (-[WebPreferences userStyleSheetLocation]):
+        * WebView.subproj/WebView.m:
+        (-[WebView takeStringURLFrom:]):
+        (-[WebView setMainFrameURL:]):
+
 2003-08-06  Darin Adler  <darin at apple.com>
 
         Reviewed by Richard.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index f3f85b0..9b7dda3 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1144,7 +1144,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 - (void)_loadItem:(WebHistoryItem *)item withLoadType:(WebFrameLoadType)loadType
 {
     NSURL *itemURL = [item URL];
-    NSURL *itemOriginalURL = [NSURL URLWithString:[item originalURLString]];
+    NSURL *itemOriginalURL = [NSURL _web_URLWithDataAsString:[item originalURLString]];
     NSURL *currentURL = [[[self dataSource] request] URL];
     NSData *formData = [item formData];
 
@@ -1771,7 +1771,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 	    // Use the original URL to ensure we get all the side-effects, such as
 	    // onLoad handlers, of any redirects that happened. An example of where
 	    // this is needed is Radar 3213556.
-            URL = [NSURL URLWithString:[childItem originalURLString]];
+            URL = [NSURL _web_URLWithDataAsString:[childItem originalURLString]];
             // These behaviors implied by these loadTypes should apply to the child frames
             childLoadType = loadType;
 
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index a944757..e6bbb11 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -6,6 +6,7 @@
 #import <WebKit/WebPreferencesPrivate.h>
 
 #import <WebKit/WebKitNSStringExtras.h>
+#import <WebKit/WebNSURLExtras.h>
 
 #import <Foundation/NSDictionary_NSURLExtras.h>
 #import <Foundation/NSString_NSURLExtras.h>
@@ -411,7 +412,7 @@ NS_ENDHANDLER
     NSString *locationString = [self _stringValueForKey: WebKitUserStyleSheetLocationPreferenceKey];
     
     if ([locationString _web_looksLikeAbsoluteURL]) {
-        return [NSURL URLWithString:locationString];
+        return [NSURL _web_URLWithDataAsString:locationString];
     } else {
         locationString = [locationString stringByExpandingTildeInPath];
         return [NSURL fileURLWithPath:locationString];
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index ad02be7..9fcc797 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -20,6 +20,7 @@
 #import <WebKit/WebKitErrors.h>
 #import <WebKit/WebKitStatisticsPrivate.h>
 #import <WebKit/WebNSPasteboardExtras.h>
+#import <WebKit/WebNSURLExtras.h>
 #import <WebKit/WebNSViewExtras.h>
 #import <WebKit/WebPluginDatabase.h>
 #import <WebKit/WebPolicyDelegate.h>
@@ -679,7 +680,7 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
 {
     NSString *URLString = [sender stringValue];
     
-    [[self mainFrame] loadRequest: [NSURLRequest requestWithURL: [NSURL URLWithString: URLString]]];
+    [[self mainFrame] loadRequest: [NSURLRequest requestWithURL: [NSURL _web_URLWithDataAsString: URLString]]];
 }
 
 - (BOOL)canGoBack
@@ -790,7 +791,7 @@ static WebFrame *incrementFrame(WebFrame *curr, BOOL forward, BOOL wrapFlag)
 
 - (void)setMainFrameURL:(NSString *)URLString
 {
-    [[self mainFrame] loadRequest: [NSURLRequest requestWithURL: [NSURL URLWithString: URLString]]];
+    [[self mainFrame] loadRequest: [NSURLRequest requestWithURL: [NSURL _web_URLWithDataAsString: URLString]]];
 }
 
 - (NSString *)mainFrameURL

-- 
WebKit Debian packaging