Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C8AF3B2A1 for ; Sun, 22 Jan 2012 23:43:59 +0000 (UTC) Received: (qmail 20387 invoked by uid 500); 22 Jan 2012 23:43:59 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 20342 invoked by uid 500); 22 Jan 2012 23:43:59 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 20313 invoked by uid 99); 22 Jan 2012 23:43:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jan 2012 23:43:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jan 2012 23:43:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 559573190C7; Sun, 22 Jan 2012 23:43:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fdmanana@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [15/50] git commit: fix couch_httpd:host_for_request/1 for ssl Message-Id: <20120122234313.559573190C7@tyr.zones.apache.org> Date: Sun, 22 Jan 2012 23:43:13 +0000 (UTC) fix couch_httpd:host_for_request/1 for ssl Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1e284b97 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1e284b97 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1e284b97 Branch: refs/heads/COUCHDB-1342 Commit: 1e284b979566a0bc4f5c002365b147c19f0b9efb Parents: 0ebfd22 Author: Randall Leeds Authored: Sun Jan 8 23:17:33 2012 -0800 Committer: Randall Leeds Committed: Sun Jan 8 23:21:21 2012 -0800 ---------------------------------------------------------------------- src/couchdb/couch_httpd.erl | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/1e284b97/src/couchdb/couch_httpd.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl index be121cb..9b59f71 100644 --- a/src/couchdb/couch_httpd.erl +++ b/src/couchdb/couch_httpd.erl @@ -473,7 +473,10 @@ host_for_request(#httpd{mochi_req=MochiReq}) -> undefined -> case MochiReq:get_header_value("Host") of undefined -> - {ok, {Address, Port}} = inet:sockname(MochiReq:get(socket)), + {ok, {Address, Port}} = case MochiReq:get(socket) of + {ssl, SslSocket} -> ssl:sockname(SslSocket); + Socket -> inet:sockname(Socket) + end, inet_parse:ntoa(Address) ++ ":" ++ integer_to_list(Port); Value1 -> Value1