summaryrefslogtreecommitdiffstats
path: root/net/server/web_socket.cc
diff options
context:
space:
mode:
authorloislo@chromium.org <loislo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 21:16:03 +0000
committerloislo@chromium.org <loislo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 21:16:03 +0000
commit202ff04b72117fa53a67bd8eec3e7cfbdc5dc3aa (patch)
treef1425b5b127d56ad0491b0234e33374ae16e2e4a /net/server/web_socket.cc
parent1f9e089f4335ae5487a884eba25efbdee5dc076d (diff)
downloadchromium_src-202ff04b72117fa53a67bd8eec3e7cfbdc5dc3aa.zip
chromium_src-202ff04b72117fa53a67bd8eec3e7cfbdc5dc3aa.tar.gz
chromium_src-202ff04b72117fa53a67bd8eec3e7cfbdc5dc3aa.tar.bz2
Expected version of WebSocket was adjusted for hybi17 that was introduced at wk r97249.
Now the server implementation of websocket accepts v.8 and v.13 BUG=none TEST=none Review URL: http://codereview.chromium.org/8329017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server/web_socket.cc')
-rw-r--r--net/server/web_socket.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server/web_socket.cc b/net/server/web_socket.cc
index 2409e0c..2f5ad5f 100644
--- a/net/server/web_socket.cc
+++ b/net/server/web_socket.cc
@@ -175,7 +175,7 @@ class WebSocketHybi10 : public WebSocket {
const HttpServerRequestInfo& request,
size_t* pos) {
std::string version = request.GetHeaderValue("Sec-WebSocket-Version");
- if (version != "8")
+ if (version != "8" && version != "13")
return NULL;
std::string key = request.GetHeaderValue("Sec-WebSocket-Key");