Repository: trafficserver Updated Branches: refs/heads/master cf22df8b9 -> 270d0a0f6
TS-2778: Websockets remap doesn't properly handle the implicit port for wss. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6396c485 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6396c485 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6396c485 Branch: refs/heads/master Commit: 6396c485bab8dbc4255f6790a5711de298b22787 Parents: cf22df8 Author: Brian Geffon <[email protected]> Authored: Fri May 2 12:20:56 2014 -0700 Committer: Brian Geffon <[email protected]> Committed: Fri May 2 12:20:56 2014 -0700 ---------------------------------------------------------------------- proxy/hdrs/URL.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6396c485/proxy/hdrs/URL.cc ---------------------------------------------------------------------- diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc index 4638420..e9b64cd 100644 --- a/proxy/hdrs/URL.cc +++ b/proxy/hdrs/URL.cc @@ -413,9 +413,9 @@ url_scheme_set(HdrHeap * heap, URLImpl * url, const char *scheme_str, int scheme else scheme_wks = NULL; - if (scheme_wks == URL_SCHEME_HTTP) + if (scheme_wks == URL_SCHEME_HTTP || scheme_wks == URL_SCHEME_WS) url->m_url_type = URL_TYPE_HTTP; - else if (scheme_wks == URL_SCHEME_HTTPS) + else if (scheme_wks == URL_SCHEME_HTTPS || scheme_wks == URL_SCHEME_WSS) url->m_url_type = URL_TYPE_HTTPS; else url->m_url_type = URL_TYPE_HTTP;
