summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_httpd_vhost.erl15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/couchdb/couch_httpd_vhost.erl b/src/couchdb/couch_httpd_vhost.erl
index 3dba2919..9bfb5951 100644
--- a/src/couchdb/couch_httpd_vhost.erl
+++ b/src/couchdb/couch_httpd_vhost.erl
@@ -301,6 +301,7 @@ make_target([P|Rest], Bindings, Remaining, Acc) ->
%% bind port
bind_port(Port, Port) -> ok;
+bind_port('*', _) -> ok;
bind_port(_,_) -> fail.
%% bind bhost
@@ -329,15 +330,15 @@ bind_path(_, _) ->
%% create vhost list from ini
make_vhosts() ->
- lists:foldl(fun({Vhost, Path}, Acc) ->
- [{parse_vhost(Vhost), split_path(Path)}|Acc]
- end, [], couch_config:get("vhosts")).
-
+ Vhosts = lists:foldl(fun({Vhost, Path}, Acc) ->
+ [{parse_vhost(Vhost), split_path(Path)}|Acc]
+ end, [], couch_config:get("vhosts")),
+ lists:reverse(lists:usort(Vhosts)).
parse_vhost(Vhost) ->
case urlsplit_netloc(Vhost, []) of
{[], Path} ->
- {make_spec("*", []), 80, Path};
+ {make_spec("*", []), '*', Path};
{HostPort, []} ->
{H, P} = split_host_port(HostPort),
H1 = make_spec(H, []),
@@ -352,13 +353,13 @@ parse_vhost(Vhost) ->
split_host_port(HostAsString) ->
case string:rchr(HostAsString, $:) of
0 ->
- {split_host(HostAsString), 80};
+ {split_host(HostAsString), '*'};
N ->
HostPart = string:substr(HostAsString, 1, N-1),
case (catch erlang:list_to_integer(HostAsString, N+1,
length(HostAsString))) of
{'EXIT', _} ->
- {split_host(HostAsString), 80};
+ {split_host(HostAsString), '*'};
Port ->
{split_host(HostPart), Port}
end