aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2012-08-27 14:00:28 +0200
committerLoïc Hoguin <[email protected]>2012-08-27 14:00:28 +0200
commit0e3adf1fee77f8f31ce4e604be19e3ef236924a4 (patch)
tree782df1b3792eec93470961359551a351cc15fa02 /src
parentf39c001c03aaaef9737f1b302a948455de6eefd7 (diff)
downloadcowboy-0e3adf1fee77f8f31ce4e604be19e3ef236924a4.tar.gz
cowboy-0e3adf1fee77f8f31ce4e604be19e3ef236924a4.tar.bz2
cowboy-0e3adf1fee77f8f31ce4e604be19e3ef236924a4.zip
Rename cowboy_http_websocket to cowboy_websocket
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_protocol.erl2
-rw-r--r--src/cowboy_websocket.erl (renamed from src/cowboy_http_websocket.erl)2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cowboy_protocol.erl b/src/cowboy_protocol.erl
index 06f18bb..fc5950a 100644
--- a/src/cowboy_protocol.erl
+++ b/src/cowboy_protocol.erl
@@ -327,7 +327,7 @@ handler_before_loop(HandlerState, Req, State) ->
State2 = handler_loop_timeout(State),
handler_loop(HandlerState, Req, State2).
-%% Almost the same code can be found in cowboy_http_websocket.
+%% Almost the same code can be found in cowboy_websocket.
-spec handler_loop_timeout(#state{}) -> #state{}.
handler_loop_timeout(State=#state{loop_timeout=infinity}) ->
State#state{loop_timeout_ref=undefined};
diff --git a/src/cowboy_http_websocket.erl b/src/cowboy_websocket.erl
index f4a774d..fe383c2 100644
--- a/src/cowboy_http_websocket.erl
+++ b/src/cowboy_websocket.erl
@@ -17,7 +17,7 @@
%% When using websockets, make sure that the crypto application is
%% included in your release. If you are not using releases then there
%% is no need for concern as crypto is already included.
--module(cowboy_http_websocket).
+-module(cowboy_websocket).
%% API.
-export([upgrade/4]).