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

Move cowboy_http:version() to cowboy:http_version()

Browse source
This commit is contained in:
Loïc Hoguin 2013-05-16 16:06:52 +02:00
parent ba7e6c07ec
commit c0c333e41b
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/cowboy.erl
View file

@ -20,6 +20,9 @@
-export([stop_listener/1]). -export([stop_listener/1]).
-export([set_env/3]). -export([set_env/3]).
-type http_version() :: 'HTTP/1.1' | 'HTTP/1.0'.
-export_type([http_version/0]).
%% @doc Start an HTTP listener. %% @doc Start an HTTP listener.
-spec start_http(any(), non_neg_integer(), any(), any()) -> {ok, pid()}. -spec start_http(any(), non_neg_integer(), any(), any()) -> {ok, pid()}.
start_http(Ref, NbAcceptors, TransOpts, ProtoOpts) start_http(Ref, NbAcceptors, TransOpts, ProtoOpts)

2
src/cowboy_client.erl
View file

@ -40,7 +40,7 @@
timeout = 5000 :: timeout(), %% @todo Configurable. timeout = 5000 :: timeout(), %% @todo Configurable.
buffer = <<>> :: binary(), buffer = <<>> :: binary(),
connection = keepalive :: keepalive | close, connection = keepalive :: keepalive | close,
version = 'HTTP/1.1' :: cowboy_http:version(), version = 'HTTP/1.1' :: cowboy:http_version(),
response_body = undefined :: undefined | non_neg_integer() response_body = undefined :: undefined | non_neg_integer()
}). }).

2
src/cowboy_http.erl
View file

@ -52,11 +52,9 @@
-export([urlencode/2]). -export([urlencode/2]).
-export([x_www_form_urlencoded/1]). -export([x_www_form_urlencoded/1]).
-type version() :: 'HTTP/1.1' | 'HTTP/1.0'.
-type headers() :: [{binary(), iodata()}]. -type headers() :: [{binary(), iodata()}].
-type status() :: non_neg_integer() | binary(). -type status() :: non_neg_integer() | binary().
-export_type([version/0]).
-export_type([headers/0]). -export_type([headers/0]).
-export_type([status/0]). -export_type([status/0]).

6
src/cowboy_req.erl
View file

@ -143,7 +143,7 @@
%% Request. %% Request.
pid = undefined :: pid(), pid = undefined :: pid(),
method = <<"GET">> :: binary(), method = <<"GET">> :: binary(),
version = 'HTTP/1.1' :: cowboy_http:version(), version = 'HTTP/1.1' :: cowboy:http_version(),
peer = undefined :: undefined | {inet:ip_address(), inet:port_number()}, peer = undefined :: undefined | {inet:ip_address(), inet:port_number()},
host = undefined :: undefined | binary(), host = undefined :: undefined | binary(),
host_info = undefined :: undefined | cowboy_router:tokens(), host_info = undefined :: undefined | cowboy_router:tokens(),
@ -192,7 +192,7 @@
-spec new(inet:socket(), module(), -spec new(inet:socket(), module(),
undefined | {inet:ip_address(), inet:port_number()}, undefined | {inet:ip_address(), inet:port_number()},
binary(), binary(), binary(), binary(), binary(), binary(),
cowboy_http:version(), cowboy_http:headers(), binary(), cowboy:http_version(), cowboy_http:headers(), binary(),
inet:port_number() | undefined, binary(), boolean(), boolean(), inet:port_number() | undefined, binary(), boolean(), boolean(),
undefined | cowboy_protocol:onresponse_fun()) undefined | cowboy_protocol:onresponse_fun())
-> req(). -> req().
@ -224,7 +224,7 @@ method(Req) ->
{Req#http_req.method, Req}. {Req#http_req.method, Req}.
%% @doc Return the HTTP version used for the request. %% @doc Return the HTTP version used for the request.
-spec version(Req) -> {cowboy_http:version(), Req} when Req::req(). -spec version(Req) -> {cowboy:http_version(), Req} when Req::req().
version(Req) -> version(Req) ->
{Req#http_req.version, Req}. {Req#http_req.version, Req}.