Changeset 238666 in webkit

Timestamp:

Nov 29, 2018, 4:34:26 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Remove some superfluous code in ContentSecurityPolicy::upgradeInsecureRequestIfNeeded
​https://bugs.webkit.org/show_bug.cgi?id=192076

Patch by Rob Buis <​rbuis@igalia.com> on 2018-11-29
Reviewed by Frédéric Wang.

Since we do an early return if the protocol is not http or ws, the if check
for ws protocol and else statement are not needed, so use an ASSERT instead.

• page/csp/ContentSecurityPolicy.cpp:

(WebCore::ContentSecurityPolicy::upgradeInsecureRequestIfNeeded const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/csp/ContentSecurityPolicy.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-29  Rob Buis  <rbuis@igalia.com>
+
+        Remove some superfluous code in ContentSecurityPolicy::upgradeInsecureRequestIfNeeded
+        https://bugs.webkit.org/show_bug.cgi?id=192076
+
+        Reviewed by Frédéric Wang.
+
+        Since we do an early return if the protocol is not http or ws, the if check
+        for ws protocol and else statement are not needed, so use an ASSERT instead.
+
+        * page/csp/ContentSecurityPolicy.cpp:
+        (WebCore::ContentSecurityPolicy::upgradeInsecureRequestIfNeeded const):
+
 2018-11-29  Frederic Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp

@@ -883 +883 @@
     if (requestType == InsecureRequestType::Load || requestType == InsecureRequestType::FormSubmission)
         upgradeRequest |= m_upgradeInsecureRequests;
-    
+
     if (!upgradeRequest)
         return;
@@ -889 +889 @@
     if (url.protocolIs("http"))
         url.setProtocol("https");
-    else if (url.protocolIs("ws"))
+    else {
+        ASSERT(url.protocolIs("ws"));
         url.setProtocol("wss");
-    else
-        return;
-    
+    }
+
     if (url.port() && url.port().value() == 80)
         url.setPort(443);