diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-02-20 17:18:43 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-02-20 17:18:43 +0100 |
| commit | da3797589463002f28fc42ef27872650fe1de938 (patch) | |
| tree | 381d366a095356098b6487d24a8d22604de473fa /lib/inets/src/http_server/httpd_manager.erl | |
| parent | baca1b6cf223b03786ea47fc101f4249bda3cb3c (diff) | |
| download | otp-da3797589463002f28fc42ef27872650fe1de938.tar.gz otp-da3797589463002f28fc42ef27872650fe1de938.tar.bz2 otp-da3797589463002f28fc42ef27872650fe1de938.zip | |
inets httpd: Handle ipfamily option correctly when listning to port 0
Diffstat (limited to 'lib/inets/src/http_server/httpd_manager.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_manager.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/httpd_manager.erl b/lib/inets/src/http_server/httpd_manager.erl index b44bc77c41..672a70a394 100644 --- a/lib/inets/src/http_server/httpd_manager.erl +++ b/lib/inets/src/http_server/httpd_manager.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2010. All Rights Reserved. +%% Copyright Ericsson AB 2000-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -264,11 +264,12 @@ init([ConfigFile, ConfigList, AcceptTimeout, Addr, Port, ListenInfo]) -> end. do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port) -> + IpFamily = proplists:get_value(ipfamily, ConfigList, inet6fb4), NewConfigFile = proplists:get_value(file, ConfigList, ConfigFile), ConfigDB = do_initial_store(ConfigList), SocketType = httpd_conf:lookup_socket_type(ConfigDB), case httpd_acceptor_sup:start_acceptor(SocketType, Addr, - Port, ConfigDB, AcceptTimeout) of + Port, IpFamily, ConfigDB, AcceptTimeout) of {ok, _Pid} -> Status = [{max_conn, 0}, {last_heavy_load, never}, @@ -284,11 +285,12 @@ do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port) -> end. do_init(ConfigFile, ConfigList, AcceptTimeout, Addr, Port, ListenInfo) -> + IpFamily = proplists:get_value(ipfamily, ConfigList, inet6fb4), NewConfigFile = proplists:get_value(file, ConfigList, ConfigFile), ConfigDB = do_initial_store(ConfigList), SocketType = httpd_conf:lookup_socket_type(ConfigDB), case httpd_acceptor_sup:start_acceptor(SocketType, Addr, - Port, ConfigDB, + Port, IpFamily, ConfigDB, AcceptTimeout, ListenInfo) of {ok, _Pid} -> Status = [{max_conn,0}, {last_heavy_load,never}, |