couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject documentation commit: updated refs/heads/master to d5f3abb
Date Sat, 08 Aug 2015 19:07:23 GMT
Repository: couchdb-documentation
Updated Branches:
  refs/heads/master 13e98327e -> d5f3abb4c


Fix accidental split of CORS configuration


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

Branch: refs/heads/master
Commit: d5f3abb4cadb5fd463084f12fdd943a583ed3a67
Parents: 13e9832
Author: Alexander Shorin <kxepal@apache.org>
Authored: Sat Aug 8 22:06:44 2015 +0300
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Sat Aug 8 22:06:44 2015 +0300

----------------------------------------------------------------------
 src/config/http.rst | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d5f3abb4/src/config/http.rst
----------------------------------------------------------------------
diff --git a/src/config/http.rst b/src/config/http.rst
index dabc267..5bcb0c3 100644
--- a/src/config/http.rst
+++ b/src/config/http.rst
@@ -507,6 +507,22 @@ Cross-Origin Resource Sharing
         - `COS tutorial <http://www.html5rocks.com/en/tutorials/cors/>`_
         - `XHR with CORS <http://hacks.mozilla.org/2009/07/cross-site-xmlhttprequest-with-cors/>`_
 
+Per Virtual Host Configuration
+------------------------------
+
+To set the options for a :section:`vhosts`, you will need to create a section
+with the vhost name prefixed by ``cors:``. Example case for the vhost
+`example.com`::
+
+    [cors:example.com]
+    credentials = false
+    ; List of origins separated by a comma
+    origins = *
+    ; List of accepted headers separated by a comma
+    headers = X-CouchDB-Header
+    ; List of accepted methods
+    methods = HEAD, GET
+
 Cross-site Request Forgery protection
 =====================================
 
@@ -586,22 +602,6 @@ Cross-site Request Forgery protection
             [csrf]
             timeout = 3600
 
-Per Virtual Host Configuration
-------------------------------
-
-To set the options for a :section:`vhosts`, you will need to create a section
-with the vhost name prefixed by ``cors:``. Example case for the vhost
-`example.com`::
-
-    [cors:example.com]
-    credentials = false
-    ; List of origins separated by a comma
-    origins = *
-    ; List of accepted headers separated by a comma
-    headers = X-CouchDB-Header
-    ; List of accepted methods
-    methods = HEAD, GET
-
 .. _config/vhosts:
 
 Virtual Hosts


Mime
View raw message