umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 20:30:23 +00:00
Code Issues Wiki Activity

Rename the type http_status/0 to cowboy_http:status/0

Browse source
This commit is contained in:
Loïc Hoguin 2012-01-23 09:43:26 +01:00
parent 67e5713b2b
commit 16d3cb76c7
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/http.hrl
View file

@ -13,7 +13,6 @@
%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-type http_status() :: non_neg_integer() | binary().
-type http_resp_body() :: iodata() | {non_neg_integer(),
fun(() -> {sent, non_neg_integer()})}.

3
src/cowboy_http.erl
View file

@ -47,8 +47,9 @@
| 'Set-Cookie2' | 'X-Forwarded-For' | 'Cookie' | 'Keep-Alive'
| 'Proxy-Connection' | binary().
-type headers() :: [{header(), iodata()}].
-type status() :: non_neg_integer() | binary().
-export_type([method/0, uri/0, version/0, header/0, headers/0]).
-export_type([method/0, uri/0, version/0, header/0, headers/0, status/0]).
-include("include/http.hrl").
-include_lib("eunit/include/eunit.hrl").

2
src/cowboy_http_protocol.erl
View file

@ -403,7 +403,7 @@ ensure_response(#http_req{socket=Socket, transport=Transport,
close.
%% Only send an error reply if there is no resp_sent message.
-spec error_terminate(http_status(), #state{}) -> ok.
-spec error_terminate(cowboy_http:status(), #state{}) -> ok.
error_terminate(Code, State=#state{socket=Socket, transport=Transport}) ->
receive
{cowboy_http_req, resp_sent} -> ok

16
src/cowboy_http_req.erl
View file

@ -528,18 +528,18 @@ has_resp_body(#http_req{resp_body=RespBody}) ->
iolist_size(RespBody) > 0.
%% @equiv reply(Status, [], [], Req)
-spec reply(http_status(), #http_req{}) -> {ok, #http_req{}}.
-spec reply(cowboy_http:status(), #http_req{}) -> {ok, #http_req{}}.
reply(Status, Req=#http_req{resp_body=Body}) ->
reply(Status, [], Body, Req).
%% @equiv reply(Status, Headers, [], Req)
-spec reply(http_status(), cowboy_http:headers(), #http_req{})
-spec reply(cowboy_http:status(), cowboy_http:headers(), #http_req{})
-> {ok, #http_req{}}.
reply(Status, Headers, Req=#http_req{resp_body=Body}) ->
reply(Status, Headers, Body, Req).
%% @doc Send a reply to the client.
-spec reply(http_status(), cowboy_http:headers(), iodata(), #http_req{})
-spec reply(cowboy_http:status(), cowboy_http:headers(), iodata(), #http_req{})
-> {ok, #http_req{}}.
reply(Status, Headers, Body, Req=#http_req{socket=Socket,
transport=Transport, connection=Connection, pid=ReqPid,
@ -562,13 +562,13 @@ reply(Status, Headers, Body, Req=#http_req{socket=Socket,
resp_headers=[], resp_body= <<>>}}.
%% @equiv chunked_reply(Status, [], Req)
-spec chunked_reply(http_status(), #http_req{}) -> {ok, #http_req{}}.
-spec chunked_reply(cowboy_http:status(), #http_req{}) -> {ok, #http_req{}}.
chunked_reply(Status, Req) ->
chunked_reply(Status, [], Req).
%% @doc Initiate the sending of a chunked reply to the client.
%% @see cowboy_http_req:chunk/2
-spec chunked_reply(http_status(), cowboy_http:headers(), #http_req{})
-spec chunked_reply(cowboy_http:status(), cowboy_http:headers(), #http_req{})
-> {ok, #http_req{}}.
chunked_reply(Status, Headers, Req=#http_req{socket=Socket,
transport=Transport, connection=Connection, pid=ReqPid,
@ -597,7 +597,7 @@ chunk(Data, #http_req{socket=Socket, transport=Transport, resp_state=chunks}) ->
%% @doc Send an upgrade reply.
%% @private
-spec upgrade_reply(http_status(), cowboy_http:headers(), #http_req{})
-spec upgrade_reply(cowboy_http:status(), cowboy_http:headers(), #http_req{})
-> {ok, #http_req{}}.
upgrade_reply(Status, Headers, Req=#http_req{socket=Socket, transport=Transport,
pid=ReqPid, resp_state=waiting, resp_headers=RespHeaders}) ->
@ -668,7 +668,7 @@ response_connection_parse(ReplyConn) ->
Tokens = cowboy_http:nonempty_list(ReplyConn, fun cowboy_http:token/2),
cowboy_http:connection_to_atom(Tokens).
-spec response_head(http_status(), cowboy_http:headers(),
-spec response_head(cowboy_http:status(), cowboy_http:headers(),
cowboy_http:headers(), cowboy_http:headers()) -> iolist().
response_head(Status, Headers, RespHeaders, DefaultHeaders) ->
StatusLine = <<"HTTP/1.1 ", (status(Status))/binary, "\r\n">>,
@ -698,7 +698,7 @@ atom_to_connection(keepalive) ->
atom_to_connection(close) ->
<<"close">>.
-spec status(http_status()) -> binary().
-spec status(cowboy_http:status()) -> binary().
status(100) -> <<"100 Continue">>;
status(101) -> <<"101 Switching Protocols">>;
status(102) -> <<"102 Processing">>;