diff options
| author | Loïc Hoguin <[email protected]> | 2011-10-06 01:07:49 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2011-10-06 01:07:49 +0200 |
| commit | 97460a599377eab084ffe99588b2c24bab23c27d (patch) | |
| tree | 6cff09da6e5cd0b5a67a359a0a95300689a216df | |
| parent | c2be0f20736bf3867b044e2f2bf6eb4fb862daf1 (diff) | |
| download | cowboy-97460a599377eab084ffe99588b2c24bab23c27d.tar.gz cowboy-97460a599377eab084ffe99588b2c24bab23c27d.tar.bz2 cowboy-97460a599377eab084ffe99588b2c24bab23c27d.zip | |
Fix a crash in websocket_handshake when cowboy_http_req:compact/1 is used
Also add a call to compact/1 in the websocket test handler so we may
catch bugs related to it faster later on.
| -rw-r--r-- | src/cowboy_http_req.erl | 2 | ||||
| -rw-r--r-- | test/websocket_handler.erl | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cowboy_http_req.erl b/src/cowboy_http_req.erl index 889fb10..66f2da4 100644 --- a/src/cowboy_http_req.erl +++ b/src/cowboy_http_req.erl @@ -366,7 +366,7 @@ chunk(Data, #http_req{socket=Socket, transport=Transport, resp_state=chunks}) -> -spec compact(#http_req{}) -> #http_req{}. compact(Req) -> Req#http_req{host=undefined, host_info=undefined, path=undefined, - path_info=undefined, qs_vals=undefined, raw_qs=undefined, + path_info=undefined, qs_vals=undefined, bindings=undefined, headers=[]}. %% Internal. diff --git a/test/websocket_handler.erl b/test/websocket_handler.erl index 4ba2a67..0cfc8f3 100644 --- a/test/websocket_handler.erl +++ b/test/websocket_handler.erl @@ -18,7 +18,8 @@ terminate(_Req, _State) -> websocket_init(_TransportName, Req, _Opts) -> erlang:start_timer(1000, self(), <<"websocket_init">>), - {ok, Req, undefined}. + Req2 = cowboy_http_req:compact(Req), + {ok, Req2, undefined}. websocket_handle({text, Data}, Req, State) -> {reply, {text, Data}, Req, State}; |