diff options
author | Zandra <[email protected]> | 2015-11-13 10:44:19 +0100 |
---|---|---|
committer | Zandra <[email protected]> | 2015-11-13 10:44:19 +0100 |
commit | 263d1e6bb37cb09f0d09039da625f14db656f552 (patch) | |
tree | 24c31a5c668335cae79e59962ad0c75f329d0230 /lib/inets/src/http_server/httpd_sup.erl | |
parent | e8f6435d3c932a03101c12a1263d355112e399bf (diff) | |
parent | 0db6272323fd662cb43f5bb4d24f01daa8a6647d (diff) | |
download | otp-263d1e6bb37cb09f0d09039da625f14db656f552.tar.gz otp-263d1e6bb37cb09f0d09039da625f14db656f552.tar.bz2 otp-263d1e6bb37cb09f0d09039da625f14db656f552.zip |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/inets/src/http_server/httpd_sup.erl')
-rw-r--r-- | lib/inets/src/http_server/httpd_sup.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/httpd_sup.erl b/lib/inets/src/http_server/httpd_sup.erl index f0b1942e2f..bf40cedd5c 100644 --- a/lib/inets/src/http_server/httpd_sup.erl +++ b/lib/inets/src/http_server/httpd_sup.erl @@ -241,7 +241,7 @@ listen(Address, Port, Config) -> case http_transport:start(SocketType) of ok -> {ok, Fd} = get_fd(Port), - IpFamily = proplists:get_value(ipfamily, Config, inet6fb4), + IpFamily = proplists:get_value(ipfamily, Config, inet), case http_transport:listen(SocketType, Address, Port, Fd, IpFamily) of {ok, ListenSocket} -> NewConfig = proplists:delete(port, Config), @@ -286,6 +286,8 @@ socket_type(Config) -> socket_type(ip_comm = SocketType, _) -> SocketType; +socket_type({ip_comm, _} = SocketType, _) -> + SocketType; socket_type({essl, _} = SocketType, _) -> SocketType; socket_type(_, Config) -> |