diff options
| author | Loïc Hoguin <[email protected]> | 2012-01-23 09:28:29 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2012-01-23 09:28:29 +0100 |
| commit | 8622dff906a1bdddf588e1fe006307488a824d3a (patch) | |
| tree | f957733116d115154a4b6602d18948acb0937398 | |
| parent | 314483a0b6609873f5c215d24e662016374128ec (diff) | |
| download | cowboy-8622dff906a1bdddf588e1fe006307488a824d3a.tar.gz cowboy-8622dff906a1bdddf588e1fe006307488a824d3a.tar.bz2 cowboy-8622dff906a1bdddf588e1fe006307488a824d3a.zip | |
Rename the type http_version/0 to cowboy_http:version/0
| -rw-r--r-- | include/http.hrl | 3 | ||||
| -rw-r--r-- | src/cowboy_http.erl | 3 | ||||
| -rw-r--r-- | src/cowboy_http_protocol.erl | 4 | ||||
| -rw-r--r-- | src/cowboy_http_req.erl | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/http.hrl b/include/http.hrl index 0be6652..e807937 100644 --- a/include/http.hrl +++ b/include/http.hrl @@ -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_version() :: {Major::non_neg_integer(), Minor::non_neg_integer()}. -type http_header() :: 'Cache-Control' | 'Connection' | 'Date' | 'Pragma' | 'Transfer-Encoding' | 'Upgrade' | 'Via' | 'Accept' | 'Accept-Charset' | 'Accept-Encoding' | 'Accept-Language' | 'Authorization' | 'From' | 'Host' @@ -42,7 +41,7 @@ %% Request. pid = undefined :: pid(), method = 'GET' :: cowboy_http:method(), - version = {1, 1} :: http_version(), + version = {1, 1} :: cowboy_http:version(), peer = undefined :: undefined | {inet:ip_address(), inet:ip_port()}, host = undefined :: undefined | cowboy_dispatcher:tokens(), host_info = undefined :: undefined | cowboy_dispatcher:tokens(), diff --git a/src/cowboy_http.erl b/src/cowboy_http.erl index 4891d72..41c1a71 100644 --- a/src/cowboy_http.erl +++ b/src/cowboy_http.erl @@ -32,8 +32,9 @@ Port::integer() | undefined, Path::binary()} | {scheme, Scheme::binary(), binary()} | {abs_path, binary()} | binary(). +-type version() :: {Major::non_neg_integer(), Minor::non_neg_integer()}. --export_type([method/0, uri/0]). +-export_type([method/0, uri/0, version/0]). -include("include/http.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/src/cowboy_http_protocol.erl b/src/cowboy_http_protocol.erl index e4aaf27..48268a1 100644 --- a/src/cowboy_http_protocol.erl +++ b/src/cowboy_http_protocol.erl @@ -109,7 +109,7 @@ wait_request(State=#state{socket=Socket, transport=Transport, end. -spec request({http_request, cowboy_http:method(), cowboy_http:uri(), - http_version()}, #state{}) -> ok | none(). + cowboy_http:version()}, #state{}) -> ok | none(). request({http_request, _Method, _URI, Version}, State) when Version =/= {1, 0}, Version =/= {1, 1} -> error_terminate(505, State); @@ -422,7 +422,7 @@ terminate(#state{socket=Socket, transport=Transport}) -> %% Internal. --spec version_to_connection(http_version()) -> keepalive | close. +-spec version_to_connection(cowboy_http:version()) -> keepalive | close. version_to_connection({1, 1}) -> keepalive; version_to_connection(_Any) -> close. diff --git a/src/cowboy_http_req.erl b/src/cowboy_http_req.erl index 520dab8..5e0c304 100644 --- a/src/cowboy_http_req.erl +++ b/src/cowboy_http_req.erl @@ -61,7 +61,7 @@ method(Req) -> {Req#http_req.method, Req}. %% @doc Return the HTTP version used for the request. --spec version(#http_req{}) -> {http_version(), #http_req{}}. +-spec version(#http_req{}) -> {cowboy_http:version(), #http_req{}}. version(Req) -> {Req#http_req.version, Req}. |