You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2015/06/02 21:33:31 UTC
[2/2] chttpd commit: updated refs/heads/master to e2c2bd7
Disable couch_httpd_cors when chttpd_cors is active
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/e2c2bd7b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/e2c2bd7b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/e2c2bd7b
Branch: refs/heads/master
Commit: e2c2bd7ba4ef3124c1f4fae6d30748764fd4271c
Parents: 3cf2b46
Author: Russell Branca <ch...@apache.org>
Authored: Thu Nov 6 14:48:51 2014 -0800
Committer: Russell Branca <ch...@apache.org>
Committed: Tue Jun 2 19:30:33 2015 +0000
----------------------------------------------------------------------
src/chttpd_cors.erl | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/e2c2bd7b/src/chttpd_cors.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_cors.erl b/src/chttpd_cors.erl
index e0e8fd0..b109b45 100644
--- a/src/chttpd_cors.erl
+++ b/src/chttpd_cors.erl
@@ -288,6 +288,12 @@ get_cors_config(_Req) ->
is_cors_enabled(Config) ->
+ case get(disable_couch_httpd_cors) of
+ undefined ->
+ put(disable_couch_httpd_cors, true);
+ _ ->
+ ok
+ end,
couch_util:get_value(<<"enable_cors">>, Config, false).