couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iil...@apache.org
Subject [26/50] couch-httpd commit: updated refs/heads/split_out_httpd_stack to e44a372
Date Tue, 01 Mar 2016 20:00:59 GMT
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 <iilyak@ca.ibm.com>
Authored: Fri Feb 26 10:36:01 2016 -0800
Committer: ILYA Khlopotov <iilyak@ca.ibm.com>
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}) ->


Mime
View raw message