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 2BE8618872 for ; Tue, 1 Mar 2016 20:00:50 +0000 (UTC) Received: (qmail 97629 invoked by uid 500); 1 Mar 2016 20:00:35 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 97387 invoked by uid 500); 1 Mar 2016 20:00:35 -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 96517 invoked by uid 99); 1 Mar 2016 20:00:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2016 20:00:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C36D0DFAD9; Tue, 1 Mar 2016 20:00:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: iilyak@apache.org To: commits@couchdb.apache.org Date: Tue, 01 Mar 2016 20:01:04 -0000 Message-Id: In-Reply-To: <9d99c62cf9534dc1a0ead1c806934ff6@git.apache.org> References: <9d99c62cf9534dc1a0ead1c806934ff6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [31/50] couch-httpd commit: updated refs/heads/split_out_httpd_stack to e44a372 Remove no longer need function from original Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/commit/ebf1b53b Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/ebf1b53b Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/ebf1b53b Branch: refs/heads/split_out_httpd_stack Commit: ebf1b53b8864d78101e9b44560e464ce722a1490 Parents: d2c703d Author: ILYA Khlopotov Authored: Fri Feb 26 09:53:31 2016 -0800 Committer: ILYA Khlopotov Committed: Tue Mar 1 08:35:08 2016 -0800 ---------------------------------------------------------------------- src/couch_httpd_original.erl | 17 ----------------- 1 file changed, 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/ebf1b53b/src/couch_httpd_original.erl ---------------------------------------------------------------------- diff --git a/src/couch_httpd_original.erl b/src/couch_httpd_original.erl index c841399..8fa926b 100644 --- a/src/couch_httpd_original.erl +++ b/src/couch_httpd_original.erl @@ -414,23 +414,6 @@ increment_method_stats(Method) -> % Utilities -host_for_request(#httpd{mochi_req=MochiReq}) -> - XHost = config:get("httpd", "x_forwarded_host", "X-Forwarded-Host"), - case MochiReq:get_header_value(XHost) of - undefined -> - case MochiReq:get_header_value("Host") of - undefined -> - {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 - end; - Value -> Value - end. - verify_is_server_admin(#httpd{user_ctx=UserCtx}) -> verify_is_server_admin(UserCtx);