From cfe396e155a519bd44c7e7f555d6569daf0dc1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= Date: Fri, 14 Sep 2012 18:34:58 +0200 Subject: [PATCH] Don't forget about webscoket_handlers in pipelined http requests --- src/web/ejabberd_http.erl | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/web/ejabberd_http.erl b/src/web/ejabberd_http.erl index 6352cd2ee..6c9167d2a 100644 --- a/src/web/ejabberd_http.erl +++ b/src/web/ejabberd_http.erl @@ -287,18 +287,22 @@ process_header(State, Data) -> gen_tcp -> inet:setopts(Socket, [{packet, http_bin}]); _ -> ok end, - #state{sockmod = SockMod, socket = Socket, - request_handlers = State#state.request_handlers}; + #state{sockmod = SockMod, socket = Socket, + request_handlers = State#state.request_handlers, + websocket_handlers = State#state.websocket_handlers}; _ -> - #state{end_of_request = true, - request_handlers = State#state.request_handlers} + #state{end_of_request = true, + request_handlers = State#state.request_handlers, + websocket_handlers = State#state.websocket_handlers} end; {error, _Reason} -> - #state{end_of_request = true, - request_handlers = State#state.request_handlers}; + #state{end_of_request = true, + request_handlers = State#state.request_handlers, + websocket_handlers = State#state.websocket_handlers}; _ -> - #state{end_of_request = true, - request_handlers = State#state.request_handlers} + #state{end_of_request = true, + request_handlers = State#state.request_handlers, + websocket_handlers = State#state.websocket_handlers} end. add_header(Name, Value, State)->