Title: [273950] trunk/Source
Revision
273950
Author
commit-qu...@webkit.org
Date
2021-03-04 23:05:47 -0800 (Thu, 04 Mar 2021)

Log Message

Add internal preference to disable HTTPS upgrade
https://bugs.webkit.org/show_bug.cgi?id=222778

Patch by Alex Christensen <achristen...@webkit.org> on 2021-03-04
Reviewed by Simon Fraser.

Source/WebKit:

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::creationParameters):

Source/WTF:

This is needed for an internal performance benchmark, which serves canned content from a local http server
pretending to be from different domains that are in our internal HTTPS upgrade list because the real server
supports HTTPS.  That internal benchmark should eventually change, but that's not going to happen this year.
This is also likely going to be useful for QA purposes to be able to easily tell on an internal build
whether HTTPS upgrade is breaking something.

* Scripts/Preferences/WebPreferencesInternal.yaml:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (273949 => 273950)


--- trunk/Source/WTF/ChangeLog	2021-03-05 05:47:46 UTC (rev 273949)
+++ trunk/Source/WTF/ChangeLog	2021-03-05 07:05:47 UTC (rev 273950)
@@ -1,5 +1,20 @@
 2021-03-04  Alex Christensen  <achristen...@webkit.org>
 
+        Add internal preference to disable HTTPS upgrade
+        https://bugs.webkit.org/show_bug.cgi?id=222778
+
+        Reviewed by Simon Fraser.
+
+        This is needed for an internal performance benchmark, which serves canned content from a local http server
+        pretending to be from different domains that are in our internal HTTPS upgrade list because the real server
+        supports HTTPS.  That internal benchmark should eventually change, but that's not going to happen this year.
+        This is also likely going to be useful for QA purposes to be able to easily tell on an internal build
+        whether HTTPS upgrade is breaking something.
+
+        * Scripts/Preferences/WebPreferencesInternal.yaml:
+
+2021-03-04  Alex Christensen  <achristen...@webkit.org>
+
         Remove the HTTPSUpgradeEnabled experimental feature
         https://bugs.webkit.org/show_bug.cgi?id=222706
 

Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml (273949 => 273950)


--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml	2021-03-05 05:47:46 UTC (rev 273949)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesInternal.yaml	2021-03-05 07:05:47 UTC (rev 273950)
@@ -754,6 +754,16 @@
     WebCore:
       default: false
 
+UpgradeKnownHostsToHTTPSEnabled:
+  type: bool
+  humanReadableName: "Upgrade known hosts to HTTPS"
+  humanReadableDescription: "Upgrade known hosts to HTTPS"
+  webcoreBinding: none
+  exposed: [ WebKit ]
+  defaultValue:
+    WebKit:
+      default: true
+
 UseGPUProcessForCanvasRenderingEnabled:
   type: bool
   humanReadableName: "GPU Process: Canvas Rendering"

Modified: trunk/Source/WebKit/ChangeLog (273949 => 273950)


--- trunk/Source/WebKit/ChangeLog	2021-03-05 05:47:46 UTC (rev 273949)
+++ trunk/Source/WebKit/ChangeLog	2021-03-05 07:05:47 UTC (rev 273950)
@@ -1,5 +1,15 @@
 2021-03-04  Alex Christensen  <achristen...@webkit.org>
 
+        Add internal preference to disable HTTPS upgrade
+        https://bugs.webkit.org/show_bug.cgi?id=222778
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::creationParameters):
+
+2021-03-04  Alex Christensen  <achristen...@webkit.org>
+
         Fix clean build after r273946
         https://bugs.webkit.org/show_bug.cgi?id=222706
 

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (273949 => 273950)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2021-03-05 05:47:46 UTC (rev 273949)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2021-03-05 07:05:47 UTC (rev 273950)
@@ -7981,7 +7981,7 @@
 #endif
     
     parameters.textInteractionEnabled = preferences().textInteractionEnabled();
-    parameters.httpsUpgradeEnabled = m_configuration->httpsUpgradeEnabled();
+    parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false;
 
 #if PLATFORM(IOS)
     parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to