[webkit-changes] [187554] branches/safari-600.1.4.17-branch

Wed, 29 Jul 2015 13:12:17 -0700

Title: [187554] branches/safari-600.1.4.17-branch

Diff

Modified: branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog (187553 => 187554)


--- branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog	2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog	2015-07-29 20:10:54 UTC (rev 187554)
@@ -1,3 +1,7 @@
+2015-07-29  Babak Shafiei  <[email protected]>
+
+        Roll out r185848.
+
 2015-07-27  Babak Shafiei  <[email protected]>
 
         Roll out r180020.

Deleted: branches/safari-600.1.4.17-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html (187553 => 187554)


--- branches/safari-600.1.4.17-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html	2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html	2015-07-29 20:10:54 UTC (rev 187554)
@@ -1,30 +0,0 @@
-<script src=""
-<script>
-window.jsTestIsAsync = true;
-
-function onSocketOpened() {
-    alert("WebSocket connection opened.");
-    finishJSTest();
-}
-
-function onSocketError() {
-    alert("WebSocket connection failed.");
-    finishJSTest();
-}
-
-function onSocketClosed() {
-    alert("WebSocket closed.");
-    finishJSTest();
-}
-
-try {
-    var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/echo");
-    ws._onopen_ = onSocketOpened;
-    ws._onerror_ = onSocketError;
-    ws._onclose_ = onSocketClosed;
-} catch (e) {
-    alert("Test failed: exception thrown");
-    finishJSTest();
-}
-</script>
-<script src=""

Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (187553 => 187554)


--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog	2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog	2015-07-29 20:10:54 UTC (rev 187554)
@@ -1,3 +1,7 @@
+2015-07-29  Babak Shafiei  <[email protected]>
+
+        Roll out r185848.
+
 2015-07-28  Babak Shafiei  <[email protected]>
 
         Merge r187490.

Modified: branches/safari-600.1.4.17-branch/Source/WebCore/Modules/websockets/WebSocket.cpp (187553 => 187554)


--- branches/safari-600.1.4.17-branch/Source/WebCore/Modules/websockets/WebSocket.cpp	2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/Modules/websockets/WebSocket.cpp	2015-07-29 20:10:54 UTC (rev 187554)
@@ -57,7 +57,6 @@
 #include <runtime/ArrayBufferView.h>
 #include <wtf/HashSet.h>
 #include <wtf/PassOwnPtr.h>
-#include <wtf/RunLoop.h>
 #include <wtf/StdLibExtras.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
@@ -279,23 +278,6 @@
         }
     }
 
-    if (scriptExecutionContext()->isDocument()) {
-        Document& document = toDocument(*scriptExecutionContext());
-        if (!document.frame()->loader().mixedContentChecker().canRunInsecureContent(document.securityOrigin(), m_url)) {
-            // Balanced by the call to ActiveDOMObject::unsetPendingActivity() in WebSocket::stop().
-            ActiveDOMObject::setPendingActivity(this);
-            // We must block this connection. Instead of throwing an exception, we indicate this
-            // using the error event. But since this code executes as part of the WebSocket's
-            // constructor, we have to wait until the constructor has completed before firing the
-            // event; otherwise, users can't connect to the event.
-            RunLoop::main().dispatch([this]() {
-                dispatchEvent(Event::create(eventNames().errorEvent, false, false));
-                stop();
-            });
-            return;
-        }
-    }
-
     String protocolString;
     if (!protocols.isEmpty())
         protocolString = joinStrings(protocols, subProtocolSeperator());

Modified: branches/safari-600.1.4.17-branch/Source/WebCore/platform/SchemeRegistry.cpp (187553 => 187554)


--- branches/safari-600.1.4.17-branch/Source/WebCore/platform/SchemeRegistry.cpp	2015-07-29 20:10:21 UTC (rev 187553)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/platform/SchemeRegistry.cpp	2015-07-29 20:10:54 UTC (rev 187554)
@@ -58,7 +58,6 @@
         secureSchemes.add("https");
         secureSchemes.add("about");
         secureSchemes.add("data");
-        secureSchemes.add("wss");
     }
 
     return secureSchemes;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to