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 7A90218866 for ; Tue, 1 Mar 2016 20:00:39 +0000 (UTC) Received: (qmail 97270 invoked by uid 500); 1 Mar 2016 20:00:35 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 97137 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 96380 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 B40EDE17B7; 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:00:59 -0000 Message-Id: <806ff54907564284908d2181e525432d@git.apache.org> In-Reply-To: <9d99c62cf9534dc1a0ead1c806934ff6@git.apache.org> References: <9d99c62cf9534dc1a0ead1c806934ff6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/50] couch-httpd commit: updated refs/heads/split_out_httpd_stack to e44a372 Use basic_headers/2 in serve_file 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/2bde01e3 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/tree/2bde01e3 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/diff/2bde01e3 Branch: refs/heads/split_out_httpd_stack Commit: 2bde01e3425bde66ed4cf8c0f842c63424a89a87 Parents: e7647e3 Author: ILYA Khlopotov Authored: Fri Feb 26 10:36:01 2016 -0800 Committer: ILYA Khlopotov Committed: Tue Mar 1 08:35:08 2016 -0800 ---------------------------------------------------------------------- src/couch_httpd.erl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd/blob/2bde01e3/src/couch_httpd.erl ---------------------------------------------------------------------- diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl index d43fe87..1ac15a4 100644 --- a/src/couch_httpd.erl +++ b/src/couch_httpd.erl @@ -322,11 +322,8 @@ serve_file(Req, RelativePath, DocumentRoot) -> serve_file(Req, RelativePath, DocumentRoot, []). serve_file(#httpd{mochi_req=MochiReq}=Req, RelativePath, DocumentRoot, - ExtraHeaders) -> - Headers = server_header() ++ - couch_httpd_auth:cookie_auth_header(Req, []) ++ - ExtraHeaders, - Headers1 = couch_httpd_cors:headers(Req, Headers), + Headers0) -> + Headers1 = basic_headers(Req, Headers0), {ok, MochiReq:serve_file(RelativePath, DocumentRoot, Headers1)}. path(#httpd{mochi_req=MochiReq}) ->