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

Unified Diff: net/http/http_auth_cache.cc

Issue 68213017: Fix HTTP protocol scheme debugging checks for WebSockets (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Use SchemeIsWsOrWss() in HttpAuthHandlerDigest. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/http/http_auth_handler_digest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_auth_cache.cc
diff --git a/net/http/http_auth_cache.cc b/net/http/http_auth_cache.cc
index 1c8c03fbb2520ac6067369971e64df1ae68ef7c2..2aca16faa5953b75d9df3e8c7ee85057c0185cca 100644
--- a/net/http/http_auth_cache.cc
+++ b/net/http/http_auth_cache.cc
@@ -6,6 +6,9 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
+#include "net/http/http_util.h"
+
+namespace net {
namespace {
@@ -43,7 +46,8 @@ bool IsEnclosingPath(const std::string& container, const std::string& path) {
void CheckOriginIsValid(const GURL& origin) {
DCHECK(origin.is_valid());
// Note that the scheme may be FTP when we're using a HTTP proxy.
- DCHECK(origin.SchemeIsHTTPOrHTTPS() || origin.SchemeIs("ftp"));
+ DCHECK(origin.SchemeIsHTTPOrHTTPS() || origin.SchemeIs("ftp") ||
+ HttpUtil::SchemeIsWsOrWss(origin));
szym 2013/11/19 02:42:50 Add SchemeIsWSOrWSS to GURL.
Adam Rice 2013/11/19 03:56:44 Done.
DCHECK(origin.GetOrigin() == origin);
}
@@ -58,8 +62,6 @@ struct IsEnclosedBy {
} // namespace
-namespace net {
-
HttpAuthCache::HttpAuthCache() {
}
« no previous file with comments | « no previous file | net/http/http_auth_handler_digest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698