diff options
Diffstat (limited to 'archives/extend/attachments/20140420/bf45e4d0')
| -rw-r--r-- | archives/extend/attachments/20140420/bf45e4d0/attachment-0001.bin | 59 | ||||
| -rw-r--r-- | archives/extend/attachments/20140420/bf45e4d0/attachment.bin | 113 |
2 files changed, 172 insertions, 0 deletions
diff --git a/archives/extend/attachments/20140420/bf45e4d0/attachment-0001.bin b/archives/extend/attachments/20140420/bf45e4d0/attachment-0001.bin new file mode 100644 index 00000000..67d03d72 --- /dev/null +++ b/archives/extend/attachments/20140420/bf45e4d0/attachment-0001.bin @@ -0,0 +1,59 @@ +diff --git a/examples/websocket/priv/index.html b/examples/websocket/priv/index.html +index 5bc7f15..3e233fa 100644 +--- a/examples/websocket/priv/index.html ++++ b/examples/websocket/priv/index.html +@@ -1,7 +1,7 @@ + <html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +- <title>Websocket client</title> ++ <title>Websocket client foo</title> + <script src="/static/jquery.min.js"></script> + <script type="text/javascript"> + +@@ -13,7 +13,7 @@ + $('#status').append('<p><span style="color: red;">websockets are not supported </span></p>'); + $("#navigation").hide(); + } else { +- $('#status').append('<p><span style="color: green;">websockets are supported </span></p>'); ++ $('#status').append('<p><span style="color: green;">websockets are supported ok </span></p>'); + connect(); + }; + $("#connected").hide(); +diff --git a/examples/websocket/src/ws_handler.erl b/examples/websocket/src/ws_handler.erl +index bbbf716..cc73513 100644 +--- a/examples/websocket/src/ws_handler.erl ++++ b/examples/websocket/src/ws_handler.erl +@@ -8,10 +8,12 @@ + -export([websocket_terminate/3]). + + init({tcp, http}, _Req, _Opts) -> ++ io:format("[ws_handler:init] _Req ~p _Opts ~p", [_Req, _Opts]), + {upgrade, protocol, cowboy_websocket}. + + websocket_init(_TransportName, Req, _Opts) -> +- erlang:start_timer(1000, self(), <<"Hello!">>), ++ io:format("[websocket_init:init] Req ~p _Opts ~p", [Req, _Opts]), ++ % erlang:start_timer(1000, self(), <<"Hello!">>), + {ok, Req, undefined_state}. + + websocket_handle({text, Msg}, Req, State) -> +@@ -19,11 +21,15 @@ websocket_handle({text, Msg}, Req, State) -> + websocket_handle(_Data, Req, State) -> + {ok, Req, State}. + +-websocket_info({timeout, _Ref, Msg}, Req, State) -> +- erlang:start_timer(1000, self(), <<"How' you doin'?">>), +- {reply, {text, Msg}, Req, State}; ++% websocket_info({timeout, _Ref, Msg}, Req, State) -> ++% erlang:start_timer(1000, self(), <<"How' you doin'?">>), ++% {reply, {text, Msg}, Req, State}; + websocket_info(_Info, Req, State) -> ++ io:format("[ws_handler:websocket_info] _Info ~p Req ~p State ~p", ++ [_Info, Req, State]), + {ok, Req, State}. + + websocket_terminate(_Reason, _Req, _State) -> ++ io:format("[ws_handler:websocket_terminate] _Reason ~p _Req ~p State ~p", ++ [_Reason, _Req, _State]), + ok. diff --git a/archives/extend/attachments/20140420/bf45e4d0/attachment.bin b/archives/extend/attachments/20140420/bf45e4d0/attachment.bin new file mode 100644 index 00000000..68ecb32b --- /dev/null +++ b/archives/extend/attachments/20140420/bf45e4d0/attachment.bin @@ -0,0 +1,113 @@ +diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl +index 98e25e6..3f3016a 100644 +--- a/src/cowboy_websocket.erl ++++ b/src/cowboy_websocket.erl +@@ -62,6 +62,8 @@ + | {suspend, module(), atom(), [any()]} + when Req::cowboy_req:req(), Env::cowboy_middleware:env(). + upgrade(Req, Env, Handler, HandlerOpts) -> ++ io:format("[cowboy_websocket:upgrade] Req ~p, Env ~p, Handler ~p, HandlerOpts ~p", ++ [Req, Env, Handler, HandlerOpts]), + {_, Ref} = lists:keyfind(listener, 1, Env), + ranch:remove_connection(Ref), + [Socket, Transport] = cowboy_req:get([socket, transport], Req), +@@ -78,6 +80,8 @@ upgrade(Req, Env, Handler, HandlerOpts) -> + -spec websocket_upgrade(#state{}, Req) + -> {ok, #state{}, Req} when Req::cowboy_req:req(). + websocket_upgrade(State, Req) -> ++ io:format("[cowboy_websocket:websocket_upgrade] State ~p Req ~p", ++ [State, Req]), + {ok, ConnTokens, Req2} + = cowboy_req:parse_header(<<"connection">>, Req), + true = lists:member(<<"upgrade">>, ConnTokens), +@@ -96,6 +100,7 @@ websocket_upgrade(State, Req) -> + -spec websocket_extensions(#state{}, Req) + -> {ok, #state{}, Req} when Req::cowboy_req:req(). + websocket_extensions(State, Req) -> ++ io:format("[cowboy_websocket:websocket_extensions] State ~p Req ~p", [State, Req]), + case cowboy_req:parse_header(<<"sec-websocket-extensions">>, Req) of + {ok, Extensions, Req2} when Extensions =/= undefined -> + [Compress] = cowboy_req:get([resp_compress], Req), +@@ -129,6 +134,8 @@ websocket_extensions(State, Req) -> + when Req::cowboy_req:req(). + handler_init(State=#state{env=Env, transport=Transport, + handler=Handler}, Req, HandlerOpts) -> ++ io:format("[cowboy_websocket:handler_init] State ~p, Req ~p HandlerOpts ~p", ++ [State, Req, HandlerOpts]), + try Handler:websocket_init(Transport:name(), Req, HandlerOpts) of + {ok, Req2, HandlerState} -> + websocket_handshake(State, Req2, HandlerState); +@@ -162,6 +169,8 @@ handler_init(State=#state{env=Env, transport=Transport, + websocket_handshake(State=#state{ + transport=Transport, key=Key, deflate_frame=DeflateFrame}, + Req, HandlerState) -> ++ io:format("[cowboy_websocket:websocket_handshake] State ~p Req ~p HandlerState ~p", ++ [State, Req, HandlerState]), + %% @todo Change into crypto:hash/2 for R17B+ or when supporting only R16B+. + Challenge = base64:encode(crypto:sha( + << Key/binary, "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" >>)), +@@ -188,18 +197,24 @@ websocket_handshake(State=#state{ + handler_before_loop(State=#state{ + socket=Socket, transport=Transport, hibernate=true}, + Req, HandlerState, SoFar) -> ++ io:format("[cowboy_websocket:handler_before_loop 1] State ~p Req ~p HandlerState ~p SoFar ~p", ++ [State, Req, HandlerState, SoFar]), + Transport:setopts(Socket, [{active, once}]), + {suspend, ?MODULE, handler_loop, + [State#state{hibernate=false}, Req, HandlerState, SoFar]}; + handler_before_loop(State=#state{socket=Socket, transport=Transport}, + Req, HandlerState, SoFar) -> ++ io:format("[cowboy_websocket:handler_before_loop 2] State ~p Req ~p HandlerState ~p SoFar ~p", ++ [State, Req, HandlerState, SoFar]), + Transport:setopts(Socket, [{active, once}]), + handler_loop(State, Req, HandlerState, SoFar). + + -spec handler_loop_timeout(#state{}) -> #state{}. + handler_loop_timeout(State=#state{timeout=infinity}) -> ++ io:format("[cowboy_websocket:handler_loop_timeout 1] State ~p", [State]), + State#state{timeout_ref=undefined}; + handler_loop_timeout(State=#state{timeout=Timeout, timeout_ref=PrevRef}) -> ++ io:format("[cowboy_websocket:handler_loop_timeout 2] State ~p", [State]), + _ = case PrevRef of undefined -> ignore; PrevRef -> + erlang:cancel_timer(PrevRef) end, + TRef = erlang:start_timer(Timeout, self(), ?MODULE), +@@ -211,6 +226,8 @@ handler_loop_timeout(State=#state{timeout=Timeout, timeout_ref=PrevRef}) -> + when Req::cowboy_req:req(). + handler_loop(State=#state{socket=Socket, messages={OK, Closed, Error}, + timeout_ref=TRef}, Req, HandlerState, SoFar) -> ++ io:format("[cowboy_websocket:handler_loop_timeout] State ~p Req ~p HandlerState ~p SoFar ~p", ++ [State, Req, HandlerState, SoFar]), + receive + {OK, Socket, Data} -> + State2 = handler_loop_timeout(State), +@@ -516,6 +533,9 @@ is_utf8(_) -> + websocket_payload_loop(State=#state{socket=Socket, transport=Transport, + messages={OK, Closed, Error}, timeout_ref=TRef}, + Req, HandlerState, Opcode, Len, MaskKey, Unmasked, UnmaskedLen, Rsv) -> ++ io:format("[cowboy_websocket:websocket_payload_loop] State ~p Req ~p" ++ "HandlerState ~p Opcode ~p Len ~p MaskKey ~p Unmasked ~p UnmaskedLen ~p Rsv ~p", ++ [State, Req, HandlerState, Opcode, Len, MaskKey, Unmasked, UnmaskedLen, Rsv]), + Transport:setopts(Socket, [{active, once}]), + receive + {OK, Socket, Data} -> +@@ -726,6 +746,8 @@ websocket_send_many([Frame|Tail], State) -> + when Req::cowboy_req:req(). + websocket_close(State=#state{socket=Socket, transport=Transport}, + Req, HandlerState, Reason) -> ++ io:format("[cowboy_websocket:websocket_close] State ~p Req ~p HandlerState ~p Reason ~p", ++ [State, Req, HandlerState, Reason]), + case Reason of + {normal, _} -> + Transport:send(Socket, << 1:1, 0:3, 8:4, 0:1, 2:7, 1000:16 >>); +@@ -745,8 +767,10 @@ websocket_close(State=#state{socket=Socket, transport=Transport}, + -spec handler_terminate(#state{}, Req, any(), terminate_reason()) + -> {ok, Req, cowboy_middleware:env()} + when Req::cowboy_req:req(). +-handler_terminate(#state{env=Env, handler=Handler}, ++handler_terminate(#state{env=Env, handler=Handler} = State, + Req, HandlerState, TerminateReason) -> ++ io:format("[cowboy_websocket:handler_terminate] State ~p Req ~p HandlerState ~p TerminateReason ~p", ++ [State, Req, HandlerState, TerminateReason]), + try + Handler:websocket_terminate(TerminateReason, Req, HandlerState) + catch Class:Reason -> |