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_util.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_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 |