diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-11-09 15:09:40 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-11-11 14:46:23 +0100 |
| commit | 4b7be97512d6fc62b337e810f697a6bb0db1773c (patch) | |
| tree | 77927f0f07f49f7b4a49634b6c37416b458e66cb /lib/inets/src/http_server/httpd_sup.erl | |
| parent | f05f7ae5e8ea4b19be5fa49681ad6efb01daae6d (diff) | |
| download | otp-4b7be97512d6fc62b337e810f697a6bb0db1773c.tar.gz otp-4b7be97512d6fc62b337e810f697a6bb0db1773c.tar.bz2 otp-4b7be97512d6fc62b337e810f697a6bb0db1773c.zip | |
inets: httpd - Add possibility to specify socket options for HTTP
Was already possible for HTTPS. Also remove use of legacy option
inet6fb4. IPv6 standard moved away from beeing able to fallback to IPv4
so this option makes little sense, will use inet (Ipv4) as default instead of
inet6fb4.
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) -> |