Updated Branches: refs/heads/431-feature_cors cf0512e75 -> 87cac9804 if nothing is acecepted event "*" no headers will be returned. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/87cac980 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/87cac980 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/87cac980 Branch: refs/heads/431-feature_cors Commit: 87cac9804bd4a1af5025a9fab3c4684ad7ffa29e Parents: cf0512e Author: benoitc Authored: Mon Nov 5 11:16:40 2012 +0100 Committer: benoitc Committed: Mon Nov 5 11:16:40 2012 +0100 ---------------------------------------------------------------------- src/couchdb/couch_httpd_cors.erl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/87cac980/src/couchdb/couch_httpd_cors.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_httpd_cors.erl b/src/couchdb/couch_httpd_cors.erl index 879fee0..ef01ef4 100644 --- a/src/couchdb/couch_httpd_cors.erl +++ b/src/couchdb/couch_httpd_cors.erl @@ -64,8 +64,8 @@ cors_headers(#httpd{mochi_req=MochiReq}) -> [] end. -handle_cors_headers(Origin, Host, []) -> - make_cors_header(Origin, Host); +handle_cors_headers(_Origin, _Host, []) -> + []; handle_cors_headers(Origin, Host, AcceptedOrigins) -> AcceptAll = lists:member("*", AcceptedOrigins), case {AcceptAll, lists:member(Origin, AcceptedOrigins)} of