diff options
| author | Zandra <[email protected]> | 2015-11-13 10:43:08 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-13 10:43:08 +0100 |
| commit | 0db6272323fd662cb43f5bb4d24f01daa8a6647d (patch) | |
| tree | 2c65c4e9981aeedfb9b34978cf4fd6b7ac17db72 /lib/inets/src/http_server/httpd_sup.erl | |
| parent | 98e1d3394514181648c64ab9e5f7a1af2573d658 (diff) | |
| parent | 9dd0c95d56ec33bde9668bb47668aa27981ea18d (diff) | |
| download | otp-0db6272323fd662cb43f5bb4d24f01daa8a6647d.tar.gz otp-0db6272323fd662cb43f5bb4d24f01daa8a6647d.tar.bz2 otp-0db6272323fd662cb43f5bb4d24f01daa8a6647d.zip | |
Merge branch 'maint-18' into maint
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) -> |