| commit | e2c2bd7ba4ef3124c1f4fae6d30748764fd4271c | [log] [tgz] |
|---|---|---|
| author | Russell Branca <chewbranca@apache.org> | Thu Nov 06 14:48:51 2014 -0800 |
| committer | Russell Branca <chewbranca@apache.org> | Tue Jun 02 19:30:33 2015 +0000 |
| tree | 5bac636a0f863d081cde581a1de0f3c313b60fff | |
| parent | 3cf2b469fa590fac77d95bc1805f249b89e97df3 [diff] |
Disable couch_httpd_cors when chttpd_cors is active
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 @@ 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).