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

Unified Diff: net/server/web_socket.h

Issue 1340523002: Fix WebSocketServer extension parser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ws-constructor-fix
Patch Set: Created 5 years, 3 months 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
Index: net/server/web_socket.h
diff --git a/net/server/web_socket.h b/net/server/web_socket.h
index 935798a5698f5c07a6e636748875cb105a6e2b65..5309544182aea02aad1e03a33b01a9724ec67bd9 100644
--- a/net/server/web_socket.h
+++ b/net/server/web_socket.h
@@ -27,10 +27,7 @@ class WebSocket final {
FRAME_ERROR
};
- static WebSocket* CreateWebSocket(HttpServer* server,
- HttpConnection* connection,
- const HttpServerRequestInfo& request,
- size_t* pos);
+ WebSocket(HttpServer* server, HttpConnection* connection);
void Accept(const HttpServerRequestInfo& request);
ParseResult Read(std::string* message);
@@ -38,15 +35,12 @@ class WebSocket final {
~WebSocket();
private:
- WebSocket(HttpServer* server,
- HttpConnection* connection,
- const HttpServerRequestInfo& request,
- size_t* pos);
+ void Fail();
+ void SendErrorResponse(const std::string& message);
HttpServer* const server_;
HttpConnection* const connection_;
scoped_ptr<WebSocketEncoder> encoder_;
- std::string response_extensions_;
bool closed_;
DISALLOW_COPY_AND_ASSIGN(WebSocket);

Powered by Google App Engine
This is Rietveld 408576698