From 314483a0b6609873f5c215d24e662016374128ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 23 Jan 2012 09:23:58 +0100 Subject: Rename the type http_uri/0 to cowboy_http:uri/0 --- src/cowboy_http.erl | 6 +++++- src/cowboy_http_protocol.erl | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/cowboy_http.erl b/src/cowboy_http.erl index 2f29375..4891d72 100644 --- a/src/cowboy_http.erl +++ b/src/cowboy_http.erl @@ -28,8 +28,12 @@ -type method() :: 'OPTIONS' | 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'TRACE' | binary(). +-type uri() :: '*' | {absoluteURI, http | https, Host::binary(), + Port::integer() | undefined, Path::binary()} + | {scheme, Scheme::binary(), binary()} + | {abs_path, binary()} | binary(). --export_type([method/0]). +-export_type([method/0, uri/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 1202dbe..e4aaf27 100644 --- a/src/cowboy_http_protocol.erl +++ b/src/cowboy_http_protocol.erl @@ -108,7 +108,7 @@ wait_request(State=#state{socket=Socket, transport=Transport, {error, _Reason} -> terminate(State) end. --spec request({http_request, cowboy_http:method(), http_uri(), +-spec request({http_request, cowboy_http:method(), cowboy_http:uri(), http_version()}, #state{}) -> ok | none(). request({http_request, _Method, _URI, Version}, State) when Version =/= {1, 0}, Version =/= {1, 1} -> -- cgit v1.2.3