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

Patch by Alex Christensen <achristensen@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:

Canonical link: https://commits.webkit.org/234898@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273950 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Alex Christensen authored and webkit-commit-queue committed Mar 5, 2021
1 parent 2973af5 commit e135a1d957e938456d10d01633f2ef0d540e6ef4
Showing 4 changed files with 36 additions and 1 deletion.
@@ -1,3 +1,18 @@
2021-03-04 Alex Christensen <achristensen@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 <achristensen@webkit.org>

Remove the HTTPSUpgradeEnabled experimental feature
@@ -754,6 +754,16 @@ UndoManagerAPIEnabled:
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"
@@ -1,3 +1,13 @@
2021-03-04 Alex Christensen <achristensen@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 <achristensen@webkit.org>

Fix clean build after r273946
@@ -7981,7 +7981,7 @@ WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& proc
#endif

parameters.textInteractionEnabled = preferences().textInteractionEnabled();
parameters.httpsUpgradeEnabled = m_configuration->httpsUpgradeEnabled();
parameters.httpsUpgradeEnabled = preferences().upgradeKnownHostsToHTTPSEnabled() ? m_configuration->httpsUpgradeEnabled() : false;

#if PLATFORM(IOS)
parameters.allowsDeprecatedSynchronousXMLHttpRequestDuringUnload = allowsDeprecatedSynchronousXMLHttpRequestDuringUnload();

0 comments on commit e135a1d

Please sign in to comment.