couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject [1/2] git commit: updated refs/heads/1922-cors-reduce-headers to a9486d2
Date Thu, 07 Nov 2013 19:35:03 GMT
Updated Branches:
  refs/heads/1922-cors-reduce-headers [created] a9486d266


COUCHDB-1922: Demonstration of bug


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0a6dead3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0a6dead3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0a6dead3

Branch: refs/heads/1922-cors-reduce-headers
Commit: 0a6dead37b6ced514ba0a7e258435b0bcc992f68
Parents: 6ee2e72
Author: Russell Branca <chewbranca@gmail.com>
Authored: Thu Nov 7 10:50:41 2013 -0800
Committer: Russell Branca <chewbranca@gmail.com>
Committed: Thu Nov 7 10:50:41 2013 -0800

----------------------------------------------------------------------
 src/couchdb/couch_httpd_cors.erl | 2 ++
 test/etap/231-cors.t             | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/0a6dead3/src/couchdb/couch_httpd_cors.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_httpd_cors.erl b/src/couchdb/couch_httpd_cors.erl
index 91fe1ae..dde2cfd 100644
--- a/src/couchdb/couch_httpd_cors.erl
+++ b/src/couchdb/couch_httpd_cors.erl
@@ -24,6 +24,8 @@
 
 -export([is_preflight_request/1, cors_headers/2]).
 
+-compile(export_all).
+
 -define(SUPPORTED_HEADERS, "Accept, Accept-Language, Content-Type," ++
         "Expires, Last-Modified, Pragma, Origin, Content-Length," ++
         "If-Match, Destination, X-Requested-With, " ++

http://git-wip-us.apache.org/repos/asf/couchdb/blob/0a6dead3/test/etap/231-cors.t
----------------------------------------------------------------------
diff --git a/test/etap/231-cors.t b/test/etap/231-cors.t
index ce52747..fb84585 100644
--- a/test/etap/231-cors.t
+++ b/test/etap/231-cors.t
@@ -32,7 +32,7 @@ server() ->
 main(_) ->
     test_util:init_code_path(),
 
-    etap:plan(30),
+    etap:plan(31),
     case (catch test()) of
         ok ->
             etap:end_tests();
@@ -75,6 +75,9 @@ test() ->
     test_no_headers_server(),
     test_no_headers_db(),
 
+    % Reduce headers test
+    test_reduce_headers(),
+
     % Now enable CORS
     ok = couch_config:set("httpd", "enable_cors", "true", false),
     ok = couch_config:set("cors", "origins", "http://example.com", false),
@@ -447,3 +450,7 @@ maybe_append_vhost(true) ->
     [{"Host", "http://example.com"}];
 maybe_append_vhost(Else) ->
     [].
+
+test_reduce_headers() ->
+    etap:is([], couch_httpd_cors:reduce_headers(["foo"],["bar"]),
+        "Reduce headers only allows the second list of fields").


Mime
View raw message