Repository: couchdb-chttpd Updated Branches: refs/heads/master b468c7de3 -> 0627357bf
Revert broken fix attempt for ssl sockname Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/22e90320 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/22e90320 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/22e90320 Branch: refs/heads/master Commit: 22e90320de9b1429b4e24e19015c27a62518830d Parents: b468c7d Author: Jay Doane <jay.s.do...@gmail.com> Authored: Thu Jul 7 08:37:14 2016 -0700 Committer: Jay Doane <jay.s.do...@gmail.com> Committed: Thu Jul 7 08:37:14 2016 -0700 ---------------------------------------------------------------------- src/chttpd.erl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/22e90320/src/chttpd.erl ---------------------------------------------------------------------- diff --git a/src/chttpd.erl b/src/chttpd.erl index 4672084..be4f9db 100644 --- a/src/chttpd.erl +++ b/src/chttpd.erl @@ -546,7 +546,7 @@ absolute_uri(#httpd{mochi_req=MochiReq, absolute_uri = undefined}, Path) -> undefined -> case MochiReq:get_header_value("Host") of undefined -> - {ok, {Address, Port}} = sockname(MochiReq:get(socket)), + {ok, {Address, Port}} = inet:sockname(MochiReq:get(socket)), inet_parse:ntoa(Address) ++ ":" ++ integer_to_list(Port); Value1 -> Value1 @@ -575,11 +575,6 @@ absolute_uri(#httpd{mochi_req=MochiReq, absolute_uri = undefined}, Path) -> absolute_uri(#httpd{absolute_uri = URI}, Path) -> URI ++ Path. -sockname(Socket) when is_pid(Socket) -> - inet:sockname(Socket); -sockname(Socket) when is_tuple(Socket) -> % is_tuple since ssl_api.hrl is not exposed - ssl:sockname(Socket). - unquote(UrlEncodedString) -> mochiweb_util:unquote(UrlEncodedString).
