Title: [105101] trunk/Source/WebKit/mac
- Revision
- 105101
- Author
- [email protected]
- Date
- 2012-01-16 16:04:56 -0800 (Mon, 16 Jan 2012)
Log Message
A follow-up fix for:
A warning is logged to console when typing a bare "/" in Safari address bar
https://bugs.webkit.org/show_bug.cgi?id=76236
<rdar://problem/10702986>
Reviewed by John Sullivan.
* Misc/WebNSURLExtras.mm: (+[NSURL _web_URLWithData:relativeToURL:]): It's OK to have a
path when there is a base URL.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (105100 => 105101)
--- trunk/Source/WebKit/mac/ChangeLog 2012-01-16 23:55:21 UTC (rev 105100)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-01-17 00:04:56 UTC (rev 105101)
@@ -1,3 +1,16 @@
+2012-01-16 Alexey Proskuryakov <[email protected]>
+
+ A follow-up fix for:
+ A warning is logged to console when typing a bare "/" in Safari address bar
+ https://bugs.webkit.org/show_bug.cgi?id=76236
+
+ <rdar://problem/10702986>
+
+ Reviewed by John Sullivan.
+
+ * Misc/WebNSURLExtras.mm: (+[NSURL _web_URLWithData:relativeToURL:]): It's OK to have a
+ path when there is a base URL.
+
2012-01-16 Jon Lee <[email protected]>
Build fix for r105086.
Modified: trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm (105100 => 105101)
--- trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2012-01-16 23:55:21 UTC (rev 105100)
+++ trunk/Source/WebKit/mac/Misc/WebNSURLExtras.mm 2012-01-17 00:04:56 UTC (rev 105101)
@@ -436,7 +436,7 @@
const UInt8 *bytes = static_cast<const UInt8*>([data bytes]);
// CFURLCreateAbsoluteURLWithBytes would complain to console if we passed a path to it.
- if (bytes[0] == '/')
+ if (bytes[0] == '/' && !baseURL)
return nil;
// NOTE: We use UTF-8 here since this encoding is used when computing strings when returning URL components
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
