diff options
| author | Erlang/OTP <[email protected]> | 2015-11-12 10:50:12 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-11-12 10:50:12 +0100 |
| commit | 29e1771c44d7d12ab7f0a52e1286886973d3b525 (patch) | |
| tree | 79431c2e8f5f3e775d2d33444f51176496a6a89f /lib/inets/src/http_server/httpd_util.erl | |
| parent | fe1df7fc6bf050cb6c9bbd99eb9393c426b62f67 (diff) | |
| parent | 35214e082400c8a0a072308986271a28a7a1cc30 (diff) | |
| download | otp-29e1771c44d7d12ab7f0a52e1286886973d3b525.tar.gz otp-29e1771c44d7d12ab7f0a52e1286886973d3b525.tar.bz2 otp-29e1771c44d7d12ab7f0a52e1286886973d3b525.zip | |
Merge branch 'ia/maint-18/inets/httpd-chunk-length-handling/OTP-13061/nodelay/OTP-13062' into maint-18
* ia/maint-18/inets/httpd-chunk-length-handling/OTP-13061/nodelay/OTP-13062:
inets: Prepare for release
inets: Do not use internal or shell convenience functions in application
Inets: Clean up code
inets: httpd - Add possibility to specify socket options for HTTP
inets: Remove debug macros that mimic call trace
inets: Improve max header size handling
inets: CT'ify http_format_SUITE
inets: Terminate gracfully when an invalid chunked length header is encountered
Diffstat (limited to 'lib/inets/src/http_server/httpd_util.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_util.erl | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/inets/src/http_server/httpd_util.erl b/lib/inets/src/http_server/httpd_util.erl index fc69baf829..0387d71911 100644 --- a/lib/inets/src/http_server/httpd_util.erl +++ b/lib/inets/src/http_server/httpd_util.erl @@ -42,17 +42,7 @@ ip_address({_,_,_,_,_,_,_,_} = Address, _IpFamily) -> {ok, Address}; ip_address(Host, IpFamily) when ((IpFamily =:= inet) orelse (IpFamily =:= inet6)) -> - inet:getaddr(Host, IpFamily); -ip_address(Host, inet6fb4 = _IpFamily) -> - Inet = case gen_tcp:listen(0, [inet6]) of - {ok, Dummyport} -> - gen_tcp:close(Dummyport), - inet6; - _ -> - inet - end, - inet:getaddr(Host, Inet). - + inet:getaddr(Host, IpFamily). %% lookup |