Title: [152682] branches/safari-537-branch/Source/WebCore
Revision
152682
Author
[email protected]
Date
2013-07-15 17:18:19 -0700 (Mon, 15 Jul 2013)

Log Message

Merged r152623.  <rdar://problem/14437753>

Modified Paths

Diff

Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152681 => 152682)


--- branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-16 00:15:30 UTC (rev 152681)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-16 00:18:19 UTC (rev 152682)
@@ -1,5 +1,20 @@
 2013-07-15  Lucas Forschler  <[email protected]>
 
+        Merge r152623
+
+    2013-07-14  Jon Lee  <[email protected]>
+
+            Origins with invalid ports are not marked as unique (118652)
+            https://bugs.webkit.org/show_bug.cgi?id=118652
+            <rdar://problem/14437753>
+
+            Reviewed by Sam Weinig.
+
+            * page/SecurityOrigin.cpp:
+            (WebCore::SecurityOrigin::create): Return a unique origin if the port is out of range.
+
+2013-07-15  Lucas Forschler  <[email protected]>
+
         Merge r152613
 
     2013-07-13  Commit Queue  <[email protected]>

Modified: branches/safari-537-branch/Source/WebCore/page/SecurityOrigin.cpp (152681 => 152682)


--- branches/safari-537-branch/Source/WebCore/page/SecurityOrigin.cpp	2013-07-16 00:15:30 UTC (rev 152681)
+++ branches/safari-537-branch/Source/WebCore/page/SecurityOrigin.cpp	2013-07-16 00:18:19 UTC (rev 152682)
@@ -539,7 +539,7 @@
 PassRefPtr<SecurityOrigin> SecurityOrigin::create(const String& protocol, const String& host, int port)
 {
     if (port < 0 || port > MaxAllowedPort)
-        createUnique();
+        return createUnique();
     String decodedHost = decodeURLEscapeSequences(host);
     return create(KURL(KURL(), protocol + "://" + host + ":" + String::number(port) + "/"));
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to