summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-03 06:09:49 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-03 06:09:49 +0000
commitf5ce5d69683698b2843ed050d4027a7aeaa67f95 (patch)
tree99d9897eb87373be5847f416b63179ff4d1f0d8c /net/websockets
parent6c69c34c15357c8f0294dd208976c77565e4192d (diff)
downloadchromium_src-f5ce5d69683698b2843ed050d4027a7aeaa67f95.zip
chromium_src-f5ce5d69683698b2843ed050d4027a7aeaa67f95.tar.gz
chromium_src-f5ce5d69683698b2843ed050d4027a7aeaa67f95.tar.bz2
Remove DCHECK(!headers_.empty()) in WebSocketHandshakeResponseHandler
headers_ might be empty for wrong response from server. BUG=none TEST=none Review URL: http://codereview.chromium.org/7564002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_handshake_handler.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/net/websockets/websocket_handshake_handler.cc b/net/websockets/websocket_handshake_handler.cc
index 398e084..9f313b7 100644
--- a/net/websockets/websocket_handshake_handler.cc
+++ b/net/websockets/websocket_handshake_handler.cc
@@ -371,8 +371,7 @@ size_t WebSocketHandshakeResponseHandler::ParseRawResponse(
DCHECK_GT(length, 0);
if (HasResponse()) {
DCHECK(!status_line_.empty());
- DCHECK(!headers_.empty());
- DCHECK_EQ(GetResponseKeySize(), key_.size());
+ // headers_ might be empty for wrong response from server.
return 0;
}
@@ -507,8 +506,9 @@ void WebSocketHandshakeResponseHandler::GetHeaders(
std::vector<std::string>* values) {
DCHECK(HasResponse());
DCHECK(!status_line_.empty());
- DCHECK(!headers_.empty());
- DCHECK_EQ(GetResponseKeySize(), key_.size());
+ // headers_ might be empty for wrong response from server.
+ if (headers_.empty())
+ return;
FetchHeaders(headers_, headers_to_get, headers_to_get_len, values);
}
@@ -518,8 +518,9 @@ void WebSocketHandshakeResponseHandler::RemoveHeaders(
size_t headers_to_remove_len) {
DCHECK(HasResponse());
DCHECK(!status_line_.empty());
- DCHECK(!headers_.empty());
- DCHECK_EQ(GetResponseKeySize(), key_.size());
+ // headers_ might be empty for wrong response from server.
+ if (headers_.empty())
+ return;
headers_ = FilterHeaders(headers_, headers_to_remove, headers_to_remove_len);
}