From 2beb5c8206cf33f04ef778ebc67839c1bd71add8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 18 Apr 2011 13:24:27 +0200 Subject: Move the dispatcher related types into cowboy_dispatcher. --- include/http.hrl | 6 +++--- include/types.hrl | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/http.hrl b/include/http.hrl index 6e46d5f..391e79a 100644 --- a/include/http.hrl +++ b/include/http.hrl @@ -46,13 +46,13 @@ method = 'GET' :: http_method(), version = {1, 1} :: http_version(), peer = undefined :: undefined | {Address::inet:ip_address(), Port::port_number()}, - host = undefined :: undefined | path_tokens(), + host = undefined :: undefined | cowboy_dispatcher:path_tokens(), raw_host = undefined :: undefined | string(), - path = undefined :: undefined | '*' | path_tokens(), + path = undefined :: undefined | '*' | cowboy_dispatcher:path_tokens(), raw_path = undefined :: undefined | string(), qs_vals = undefined :: undefined | list({Name::string(), Value::string() | true}), raw_qs = undefined :: undefined | string(), - bindings = undefined :: undefined | bindings(), + bindings = undefined :: undefined | cowboy_dispatcher:bindings(), headers = [] :: http_headers(), %% cookies = undefined :: undefined | http_cookies() %% @todo diff --git a/include/types.hrl b/include/types.hrl index 5ee9357..8842a8e 100644 --- a/include/types.hrl +++ b/include/types.hrl @@ -17,11 +17,3 @@ -type posix() :: atom(). -type port_number() :: 0..65535. - --type bindings() :: list({Key::atom(), Value::string()}). --type path_tokens() :: list(nonempty_string()). --type match_rule() :: '_' | '*' | list(string() | '_' | atom()). - --type dispatch_rule() :: {Host::match_rule(), list({Path::match_rule(), - Handler::module(), Opts::term()})}. --type dispatch_rules() :: list(dispatch_rule()). -- cgit v1.2.3