Bug 1347817 - Principal must always have a valid origin - part 6 - fixing tests, r=ehsan

2017-03-29 15:28:46 +02:00
parent 8333daf433
commit a8517d8f9f
6 changed files with 16 additions and 26 deletions
--- a/dom/base/WebSocket.cpp
+++ b/dom/base/WebSocket.cpp
@@ -1634,13 +1634,12 @@ WebSocketImpl::Init(JSContext* aCx,
      nsCOMPtr<nsPIDOMWindowInner> innerWindow;

      while (true) {
-        bool isNullPrincipal = true;
        if (principal) {
+          bool isNullPrincipal = true;
          isNullPrincipal = principal->GetIsNullPrincipal();
-        }
-
-        if (!isNullPrincipal) {
-          break;
+          if (isNullPrincipal || nsContentUtils::IsSystemPrincipal(principal)) {
+            break;
+          }
        }

        if (!innerWindow) {