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

Merge branch 'iolist_path_support' of git://github.com/tsloughter/cowboy

Browse source
This commit is contained in:
Loïc Hoguin 2013-04-11 23:28:37 +02:00
commit 55cd18e4d8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cowboy_router.erl
View file

@ -37,7 +37,7 @@
| {atom(), function, fun ((binary()) -> true | {true, any()} | false)}]. | {atom(), function, fun ((binary()) -> true | {true, any()} | false)}].
-export_type([constraints/0]). -export_type([constraints/0]).
-type route_match() :: '_' | binary() | string(). -type route_match() :: '_' | iodata().
-type route_path() :: {Path::route_match(), Handler::module(), Opts::any()} -type route_path() :: {Path::route_match(), Handler::module(), Opts::any()}
| {Path::route_match(), constraints(), Handler::module(), Opts::any()}. | {Path::route_match(), constraints(), Handler::module(), Opts::any()}.
-type route_rule() :: {Host::route_match(), Paths::[route_path()]} -type route_rule() :: {Host::route_match(), Paths::[route_path()]}
@ -88,7 +88,7 @@ compile_paths([{PathMatch, Handler, Opts}|Tail], Acc) ->
compile_paths([{PathMatch, [], Handler, Opts}|Tail], Acc); compile_paths([{PathMatch, [], Handler, Opts}|Tail], Acc);
compile_paths([{PathMatch, Constraints, Handler, Opts}|Tail], Acc) compile_paths([{PathMatch, Constraints, Handler, Opts}|Tail], Acc)
when is_list(PathMatch) -> when is_list(PathMatch) ->
compile_paths([{list_to_binary(PathMatch), compile_paths([{iolist_to_binary(PathMatch),
Constraints, Handler, Opts}|Tail], Acc); Constraints, Handler, Opts}|Tail], Acc);
compile_paths([{'_', Constraints, Handler, Opts}|Tail], Acc) -> compile_paths([{'_', Constraints, Handler, Opts}|Tail], Acc) ->
compile_paths(Tail, [{'_', Constraints, Handler, Opts}] ++ Acc); compile_paths(Tail, [{'_', Constraints, Handler, Opts}] ++ Acc);