| commit | bec9560de247f82410abe2ed1741bccdb9ee7dc5 | |
| author | ricea <ricea@chromium.org> | |
| Thu, 30 Oct 2014 05:05:07 +0000 (29 22:05 -0700) | ||
| committer | Commit bot <commit-bot@chromium.org> | |
| Thu, 30 Oct 2014 05:05:31 +0000 (30 05:05 +0000) | ||
| tree | 0de69281a4f24158de24257099c3621bb1826b66 | treesnapshot (tar.gz zip) |
| parent | b35e7dda570c077399057d21503f97670f54313b | commitdiff |
Correct manual proxy selection for WebSockets.
When an HTTPS and/or HTTP proxy was manually configured, WebSocket
connections were mistakenly going direct to the origin server.
According to RFC6455, WebSocket connections should prefer SOCKS proxies,
then HTTPS, then HTTP proxies in that order. Fix the behaviour when
proxies are manually selected to match.
BUG=426736
TEST=net_unittests, manual
Review URL: https://codereview.chromium.org/678003002
Cr-Commit-Position: refs/heads/master@{#302037}
When an HTTPS and/or HTTP proxy was manually configured, WebSocket
connections were mistakenly going direct to the origin server.
According to RFC6455, WebSocket connections should prefer SOCKS proxies,
then HTTPS, then HTTP proxies in that order. Fix the behaviour when
proxies are manually selected to match.
BUG=426736
TEST=net_unittests, manual
Review URL: https://codereview.chromium.org/678003002
Cr-Commit-Position: refs/heads/master@{#302037}
| net/proxy/proxy_config.cc | diffblobblamehistory | |
| net/proxy/proxy_config.h | diffblobblamehistory | |
| net/proxy/proxy_config_unittest.cc | diffblobblamehistory |