Skip to content

Allow HTTPFallback for non-standard port#33258

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
sysrqb:eng/Allow-HTTPFallback-for-non-standard-port
Sep 6, 2024
Merged

Allow HTTPFallback for non-standard port#33258
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
sysrqb:eng/Allow-HTTPFallback-for-non-standard-port

Conversation

@sysrqb
Copy link
Contributor

@sysrqb sysrqb commented Sep 6, 2024

c2c4d78

Allow HTTPFallback for non-standard port
https://bugs.webkit.org/show_bug.cgi?id=279282
rdar://problem/135439726

Reviewed by Alex Christensen.

Currently, we restrict allowing HTTPFallback to either the default HTTPS port
(443) or a non-standard default port that is configured for the webview. This
conflicts with other places in the logic where we allow optimistically
upgrading regardless of whether the port is consider the "default".

This patch also moves adjusting the request timeout earlier in
NetworkResourceLoader::startNetworkLoad so the existing logging correctly
captures the timeout value.

* Source/WebCore/platform/network/mac/ResourceErrorMac.mm:
(WebCore::ResourceError::errorRecoveryMethod const):
* Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::startNetworkLoad):

Canonical link: https://commits.webkit.org/283283@main

ac7bd41

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug 🧪 wpe-wk2 ✅ 🧪 wincairo-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 vision 🧪 mac-AS-debug-wk2 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress 🧪 api-gtk
✅ 🧪 vision-wk2 🧪 mac-intel-wk2
✅ 🛠 🧪 unsafe-merge 🛠 tv
🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@sysrqb sysrqb self-assigned this Sep 6, 2024
@sysrqb sysrqb added the Page Loading For bugs in page loading, including handling of network callbacks. label Sep 6, 2024
@sysrqb sysrqb marked this pull request as ready for review September 6, 2024 21:46
@sysrqb sysrqb requested a review from cdumez as a code owner September 6, 2024 21:46
@sysrqb sysrqb force-pushed the eng/Allow-HTTPFallback-for-non-standard-port branch from fad4973 to ac7bd41 Compare September 6, 2024 22:00
@sysrqb sysrqb added safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed safe-merge-queue Applied to automatically send a pull-request to merge-queue after passing EWS checks labels Sep 6, 2024
https://bugs.webkit.org/show_bug.cgi?id=279282
rdar://problem/135439726

Reviewed by Alex Christensen.

Currently, we restrict allowing HTTPFallback to either the default HTTPS port
(443) or a non-standard default port that is configured for the webview. This
conflicts with other places in the logic where we allow optimistically
upgrading regardless of whether the port is consider the "default".

This patch also moves adjusting the request timeout earlier in
NetworkResourceLoader::startNetworkLoad so the existing logging correctly
captures the timeout value.

* Source/WebCore/platform/network/mac/ResourceErrorMac.mm:
(WebCore::ResourceError::errorRecoveryMethod const):
* Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::startNetworkLoad):

Canonical link: https://commits.webkit.org/283283@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Allow-HTTPFallback-for-non-standard-port branch from ac7bd41 to c2c4d78 Compare September 6, 2024 23:23
@webkit-commit-queue
Copy link
Collaborator

Committed 283283@main (c2c4d78): https://commits.webkit.org/283283@main

Reviewed commits have been landed. Closing PR #33258 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit c2c4d78 into WebKit:main Sep 6, 2024
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Sep 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Page Loading For bugs in page loading, including handling of network callbacks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants