generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 16:48:06 +02:00
Code Issues Projects Releases Wiki Activity

align with 1.4.6

Browse Source
This commit is contained in:
aleks-f
2013-02-27 00:32:31 -06:00
parent 363c66ebdf
commit c311263eed
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Net/src/WebSocket.cpp
View File

@@ -47,7 +47,6 @@
#include "Poco/SHA1Engine.h" #include "Poco/SHA1Engine.h"
#include "Poco/Base64Encoder.h" #include "Poco/Base64Encoder.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/StringTokenizer.h"
#include "Poco/Random.h" #include "Poco/Random.h"
#include "Poco/StreamCopier.h" #include "Poco/StreamCopier.h"
#include <sstream> #include <sstream>
@@ -134,8 +133,7 @@ WebSocket::Mode WebSocket::mode() const
WebSocketImpl* WebSocket::accept(HTTPServerRequest& request, HTTPServerResponse& response) WebSocketImpl* WebSocket::accept(HTTPServerRequest& request, HTTPServerResponse& response)
{ {
StringTokenizer st(request.get("Connection", ""), ",", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM); if (request.hasToken("Connection", "upgrade") && icompare(request.get("Upgrade", ""), "websocket") == 0)
if (st.has("Upgrade") && icompare(request.get("Upgrade", ""), "websocket") == 0)
{ {
std::string version = request.get("Sec-WebSocket-Version", ""); std::string version = request.get("Sec-WebSocket-Version", "");
if (version.empty()) throw WebSocketException("Missing Sec-WebSocket-Version in handshake request", WS_ERR_HANDSHAKE_NO_VERSION); if (version.empty()) throw WebSocketException("Missing Sec-WebSocket-Version in handshake request", WS_ERR_HANDSHAKE_NO_VERSION);