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

Rename the type http_uri/0 to cowboy_http:uri/0

Browse source
This commit is contained in:
Loïc Hoguin 2012-01-23 09:23:58 +01:00
parent 9f40167487
commit 314483a0b6
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/http.hrl
View file

@ -13,10 +13,6 @@
%% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF %% ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
%% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. %% OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-type http_uri() :: '*' | {absoluteURI, http | https, Host::binary(),
Port::integer() | undefined, Path::binary()}
| {scheme, Scheme::binary(), binary()}
| {abs_path, binary()} | binary().
-type http_version() :: {Major::non_neg_integer(), Minor::non_neg_integer()}. -type http_version() :: {Major::non_neg_integer(), Minor::non_neg_integer()}.
-type http_header() :: 'Cache-Control' | 'Connection' | 'Date' | 'Pragma' -type http_header() :: 'Cache-Control' | 'Connection' | 'Date' | 'Pragma'
| 'Transfer-Encoding' | 'Upgrade' | 'Via' | 'Accept' | 'Accept-Charset' | 'Transfer-Encoding' | 'Upgrade' | 'Via' | 'Accept' | 'Accept-Charset'

6
src/cowboy_http.erl
View file

@ -28,8 +28,12 @@
-type method() :: 'OPTIONS' | 'GET' | 'HEAD' -type method() :: 'OPTIONS' | 'GET' | 'HEAD'
| 'POST' | 'PUT' | 'DELETE' | 'TRACE' | binary(). | '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("include/http.hrl").
-include_lib("eunit/include/eunit.hrl"). -include_lib("eunit/include/eunit.hrl").

2
src/cowboy_http_protocol.erl
View file

@ -108,7 +108,7 @@ wait_request(State=#state{socket=Socket, transport=Transport,
{error, _Reason} -> terminate(State) {error, _Reason} -> terminate(State)
end. 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(). http_version()}, #state{}) -> ok | none().
request({http_request, _Method, _URI, Version}, State) request({http_request, _Method, _URI, Version}, State)
when Version =/= {1, 0}, Version =/= {1, 1} -> when Version =/= {1, 0}, Version =/= {1, 1} ->