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

Side by Side Diff: net/http/http_util_icu.cc

Issue 68213017: Fix HTTP protocol scheme debugging checks for WebSockets (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Additional minor #include tweak. Created 7 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // The rules for parsing content-types were borrowed from Firefox: 5 // The rules for parsing content-types were borrowed from Firefox:
6 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834 6 // http://lxr.mozilla.org/mozilla/source/netwerk/base/src/nsURLHelper.cpp#834
7 7
8 #include "net/http/http_util.h" 8 #include "net/http/http_util.h"
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "net/base/net_util.h" 11 #include "net/base/net_util.h"
12 12
13 namespace net { 13 namespace net {
14 14
15 // static 15 // static
16 std::string HttpUtil::PathForRequest(const GURL& url) { 16 std::string HttpUtil::PathForRequest(const GURL& url) {
17 DCHECK(url.is_valid() && url.SchemeIsHTTPOrHTTPS()); 17 DCHECK(url.is_valid() && (url.SchemeIsHTTPOrHTTPS() ||
18 url.SchemeIsWSOrWSS()));
18 if (url.has_query()) 19 if (url.has_query())
19 return url.path() + "?" + url.query(); 20 return url.path() + "?" + url.query();
20 return url.path(); 21 return url.path();
21 } 22 }
22 23
23 // static 24 // static
24 std::string HttpUtil::SpecForRequest(const GURL& url) { 25 std::string HttpUtil::SpecForRequest(const GURL& url) {
25 // We may get ftp scheme when fetching ftp resources through proxy. 26 // We may get ftp scheme when fetching ftp resources through proxy.
26 DCHECK(url.is_valid() && (url.SchemeIsHTTPOrHTTPS() || 27 DCHECK(url.is_valid() && (url.SchemeIsHTTPOrHTTPS() || url.SchemeIs("ftp") ||
27 url.SchemeIs("ftp"))); 28 url.SchemeIsWSOrWSS()));
28 return SimplifyUrlForRequest(url).spec(); 29 return SimplifyUrlForRequest(url).spec();
29 } 30 }
30 31
31 } // namespace net 32 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698