summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2012-12-29 00:51:57 +0100
committerJan Lehnardt <jan@apache.org>2012-12-29 00:51:57 +0100
commitfc972453652cd12fc7687f561761215a81bc6be0 (patch)
tree695cb32f4587edf8323b0713b5a10e4b9430ebca
parent941626c8f7953f525d8f482e0b00ef6da44bd65d (diff)
downloadcouchdb-fc972453652cd12fc7687f561761215a81bc6be0.tar.gz
Fix typo in CORS header.
Thanks to Anthony Ramine for the heads up at https://github.com/apache/couchdb/commit/b90e40212663474e873fde6cab343c31c1e635e7#commitcomment-2355206
-rw-r--r--src/couchdb/couch_httpd_cors.erl4
-rw-r--r--test/etap/231-cors.t4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/couchdb/couch_httpd_cors.erl b/src/couchdb/couch_httpd_cors.erl
index 2581a887f..1ce890e93 100644
--- a/src/couchdb/couch_httpd_cors.erl
+++ b/src/couchdb/couch_httpd_cors.erl
@@ -206,7 +206,7 @@ maybe_apply_cors_headers([], RequestHeaders) ->
maybe_apply_cors_headers(CorsHeaders, RequestHeaders0) ->
% for each RequestHeader that isn't in SimpleHeaders,
% (or Content-Type with SIMPLE_CONTENT_TYPE_VALUES)
- % append to Access-Control-Exposed-Headers
+ % append to Access-Control-Expose-Headers
% return: RequestHeaders ++ CorsHeaders ++ ACEH
RequestHeaders = [K || {K,_V} <- RequestHeaders0],
@@ -228,7 +228,7 @@ maybe_apply_cors_headers(CorsHeaders, RequestHeaders0) ->
end,
CorsHeaders
++ RequestHeaders0
- ++ [{"Access-Control-Exposed-Headers",
+ ++ [{"Access-Control-Expose-Headers",
string:join(ExposedHeaders, ", ")}].
diff --git a/test/etap/231-cors.t b/test/etap/231-cors.t
index 7fd724f20..ad92ae9a6 100644
--- a/test/etap/231-cors.t
+++ b/test/etap/231-cors.t
@@ -216,9 +216,9 @@ test_db_request(VHost) ->
etap:is(proplists:get_value("Access-Control-Allow-Origin", RespHeaders),
"http://example.com",
"db Access-Control-Allow-Origin ok"),
- etap:is(proplists:get_value("Access-Control-Exposed-Headers", RespHeaders),
+ etap:is(proplists:get_value("Access-Control-Expose-Headers", RespHeaders),
"Content-Type, Server",
- "db Access-Control-Exposed-Headers ok");
+ "db Access-Control-Expose-Headers ok");
_ ->
etap:is(false, true, "ibrowse failed")
end.