aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2012-08-27 12:58:04 +0200
committerLoïc Hoguin <[email protected]>2012-08-27 12:58:04 +0200
commit9e2622becb4d1a37d410f484a14ef32101e560ab (patch)
tree2381504b9be77b6f5b36595001afcd71cd9ca7cb
parentcc2e084d456c99b3d71f09c08f516195b6015dae (diff)
downloadcowboy-9e2622becb4d1a37d410f484a14ef32101e560ab.tar.gz
cowboy-9e2622becb4d1a37d410f484a14ef32101e560ab.tar.bz2
cowboy-9e2622becb4d1a37d410f484a14ef32101e560ab.zip
Rename cowboy_http_protocol to cowboy_protocol
-rw-r--r--src/cowboy.erl4
-rw-r--r--src/cowboy_http_static.erl2
-rw-r--r--src/cowboy_http_websocket.erl2
-rw-r--r--src/cowboy_protocol.erl (renamed from src/cowboy_http_protocol.erl)2
-rw-r--r--test/http_SUITE.erl2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/cowboy.erl b/src/cowboy.erl
index 94cae16..9e4a66a 100644
--- a/src/cowboy.erl
+++ b/src/cowboy.erl
@@ -24,14 +24,14 @@
start_http(Ref, NbAcceptors, TransOpts, ProtoOpts)
when is_integer(NbAcceptors), NbAcceptors > 0 ->
ranch:start_listener(Ref, NbAcceptors,
- ranch_tcp, TransOpts, cowboy_http_protocol, ProtoOpts).
+ ranch_tcp, TransOpts, cowboy_protocol, ProtoOpts).
%% @doc Start an HTTPS listener.
-spec start_https(any(), non_neg_integer(), any(), any()) -> {ok, pid()}.
start_https(Ref, NbAcceptors, TransOpts, ProtoOpts)
when is_integer(NbAcceptors), NbAcceptors > 0 ->
ranch:start_listener(Ref, NbAcceptors,
- ranch_ssl, TransOpts, cowboy_http_protocol, ProtoOpts).
+ ranch_ssl, TransOpts, cowboy_protocol, ProtoOpts).
%% @doc Stop a listener.
-spec stop_listener(any()) -> ok.
diff --git a/src/cowboy_http_static.erl b/src/cowboy_http_static.erl
index 1513eea..d204e5a 100644
--- a/src/cowboy_http_static.erl
+++ b/src/cowboy_http_static.erl
@@ -173,7 +173,7 @@
-include("http.hrl").
-include_lib("kernel/include/file.hrl").
-%% cowboy_http_protocol callbacks
+%% cowboy_protocol callbacks
-export([init/3]).
%% cowboy_http_rest callbacks
diff --git a/src/cowboy_http_websocket.erl b/src/cowboy_http_websocket.erl
index 4509479..2078e04 100644
--- a/src/cowboy_http_websocket.erl
+++ b/src/cowboy_http_websocket.erl
@@ -138,7 +138,7 @@ upgrade_error(Req) ->
Req#http_req{resp_state=waiting}),
closed.
-%% @see cowboy_http_protocol:ensure_response/1
+%% @see cowboy_protocol:ensure_response/1
-spec upgrade_denied(#http_req{}) -> closed.
upgrade_denied(#http_req{resp_state=done}) ->
closed;
diff --git a/src/cowboy_http_protocol.erl b/src/cowboy_protocol.erl
index 5ef76be..614f409 100644
--- a/src/cowboy_http_protocol.erl
+++ b/src/cowboy_protocol.erl
@@ -32,7 +32,7 @@
%%
%% @see cowboy_dispatcher
%% @see cowboy_http_handler
--module(cowboy_http_protocol).
+-module(cowboy_protocol).
%% API.
-export([start_link/4]).
diff --git a/test/http_SUITE.erl b/test/http_SUITE.erl
index 3be0735..a83da34 100644
--- a/test/http_SUITE.erl
+++ b/test/http_SUITE.erl
@@ -489,7 +489,7 @@ http10_hostless(Config) ->
Name = list_to_atom("http10_hostless_" ++ integer_to_list(Port10)),
ranch:start_listener(Name, 5,
?config(transport, Config), ?config(opts, Config) ++ [{port, Port10}],
- cowboy_http_protocol, [
+ cowboy_protocol, [
{dispatch, [{'_', [
{[<<"http1.0">>, <<"hostless">>], http_handler, []}]}]},
{max_keepalive, 50},