You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2012/12/29 00:52:43 UTC
[2/2] git commit: Fix typo in CORS header.
Updated Branches:
refs/heads/1.3.x eb66066d8 -> d317eac18
refs/heads/master 941626c8f -> fc9724536
Fix typo in CORS header.
Thanks to Anthony Ramine for the heads up at
https://github.com/apache/couchdb/commit/b90e40212663474e873fde6cab343c31c1e635e7#commitcomment-2355206
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d317eac1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d317eac1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d317eac1
Branch: refs/heads/1.3.x
Commit: d317eac1827e6eaf420b30ec39811a2bf3aba9c0
Parents: eb66066
Author: Jan Lehnardt <ja...@apache.org>
Authored: Sat Dec 29 00:51:57 2012 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Sat Dec 29 00:52:32 2012 +0100
----------------------------------------------------------------------
src/couchdb/couch_httpd_cors.erl | 4 ++--
test/etap/231-cors.t | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d317eac1/src/couchdb/couch_httpd_cors.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_httpd_cors.erl b/src/couchdb/couch_httpd_cors.erl
index 2581a88..1ce890e 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, ", ")}].
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d317eac1/test/etap/231-cors.t
----------------------------------------------------------------------
diff --git a/test/etap/231-cors.t b/test/etap/231-cors.t
index 7fd724f..ad92ae9 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.