Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1770)

Unified Diff: trunk/src/net/http/http_network_transaction.cc

Issue 388493002: Revert 282307 "Map WebSocket URL schemes to HTTP URL schemes for..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/net/http/http_network_transaction.cc
===================================================================
--- trunk/src/net/http/http_network_transaction.cc (revision 282330)
+++ trunk/src/net/http/http_network_transaction.cc (working copy)
@@ -61,7 +61,6 @@
#include "net/ssl/ssl_cert_request_info.h"
#include "net/ssl/ssl_connection_status_flags.h"
#include "url/gurl.h"
-#include "url/url_canon.h"
#if defined(SPDY_PROXY_AUTH_ORIGIN)
#include <algorithm>
@@ -1546,17 +1545,6 @@
proxy_info_.proxy_server().host_port_pair().ToString());
}
case HttpAuth::AUTH_SERVER:
- if (ForWebSocketHandshake()) {
- const GURL& url = request_->url;
- url::Replacements<char> ws_to_http;
- if (url.SchemeIs("ws")) {
- ws_to_http.SetScheme("http", url::Component(0, 4));
- } else {
- DCHECK(url.SchemeIs("wss"));
- ws_to_http.SetScheme("https", url::Component(0, 5));
- }
- return url.ReplaceComponents(ws_to_http);
- }
return request_->url;
default:
return GURL();
« no previous file with comments | « trunk/src/net/data/websocket/connect_to.html ('k') | trunk/src/net/test/spawned_test_server/base_test_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698