summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2009-06-15 09:49:46 +0000
committerJan Lehnardt <jan@apache.org>2009-06-15 09:49:46 +0000
commit33b7dfe1eb1914aa1f192e05b44892c6e9ffc537 (patch)
treef94cd94fe41417e6b720f3061bc4a984cad8cebd /src
parentcd39ebe7d12d999324ff2cc9842567b34dc4d4c7 (diff)
Send CouchDB Server: header for all external queries. Fixes COUCHDB-379.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@784706 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_httpd.erl2
-rw-r--r--src/couchdb/couch_httpd_external.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 3417b850..91877cca 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -18,7 +18,7 @@
-export([header_value/2,header_value/3,qs_value/2,qs_value/3,qs/1,path/1,absolute_uri/2]).
-export([verify_is_server_admin/1,unquote/1,quote/1,recv/2,recv_chunked/4,error_info/1]).
-export([parse_form/1,json_body/1,json_body_obj/1,body/1,doc_etag/1, make_etag/1, etag_respond/3]).
--export([primary_header_value/2,partition/1,serve_file/3]).
+-export([primary_header_value/2,partition/1,serve_file/3, server_header/0]).
-export([start_chunked_response/3,send_chunk/2]).
-export([start_json_response/2, start_json_response/3, end_json_response/1]).
-export([send_response/4,send_method_not_allowed/2,send_error/4, send_redirect/2,send_chunked_error/2]).
diff --git a/src/couchdb/couch_httpd_external.erl b/src/couchdb/couch_httpd_external.erl
index 836efbd6..82a5542b 100644
--- a/src/couchdb/couch_httpd_external.erl
+++ b/src/couchdb/couch_httpd_external.erl
@@ -100,7 +100,7 @@ send_external_response(#httpd{mochi_req=MochiReq}, Response) ->
headers = Headers
} = parse_external_response(Response),
Resp = MochiReq:respond({Code,
- default_or_content_type(CType, Headers), Data}),
+ default_or_content_type(CType, Headers ++ couch_httpd:server_header()), Data}),
{ok, Resp}.
parse_external_response({Response}) ->