You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/07/10 11:47:00 UTC
[01/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Repository: couchdb-documentation
Updated Branches:
refs/heads/import-master 0efce9185 -> fe7f7bf2a (forced update)
added documentation fixes
made the deletion of a document clearer and
fixed some wording in the JSON structure tables
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/efce3c25
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/efce3c25
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/efce3c25
Branch: refs/heads/import-master
Commit: efce3c25765a374f1753e82d447c1bd9e2848e06
Parents: 36b3946
Author: Andy Wenk <an...@apache.org>
Authored: Fri Jan 24 00:20:41 2014 +0100
Committer: Andy Wenk <an...@nms.de>
Committed: Mon Feb 3 13:05:36 2014 +0100
----------------------------------------------------------------------
src/api/document/common.rst | 19 +++++----
src/json-structure.rst | 84 ++++++++++++++++++++--------------------
2 files changed, 54 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/efce3c25/src/api/document/common.rst
----------------------------------------------------------------------
diff --git a/src/api/document/common.rst b/src/api/document/common.rst
index f21c8df..bdd6702 100644
--- a/src/api/document/common.rst
+++ b/src/api/document/common.rst
@@ -238,18 +238,22 @@
"rev": "1-917fa2381192822767f010b95b45325b"
}
-
.. http:delete:: /{db}/{docid}
:synopsis: Deletes the document
- Deletes the specified document from the database. You must supply the
- current (latest) revision, either by using the ``rev`` parameter to
- specify the revision.
+ Marks the specified document as deleted by adding a field ``_deleted`` with
+ the value ``true``. Documents with this field will not be returned within
+ requests anymore, but stay in the database. You must supply the current
+ (latest) revision, either by using the ``rev`` parameter or by using the
+ :header:`If-Match` header to specify the revision.
+
+ .. seealso::
+ :ref:`Retrieving Deleted Documents <api/doc/retrieving-deleted-documents>`
.. note::
- Note that deletion of a record increments the revision number.
- The use of a revision for deletion of the record allows replication of
- the database to correctly track the deletion in synchronized copies.
+ CouchDB doesn't actually delete documents. The reason is the need to track
+ them correctly during the replication process between databases to prevent
+ accidental document recovery for any previous state.
:param db: Database name
:param docid: Document ID
@@ -489,6 +493,7 @@ Basic Attachments Info
"name": "Spaghetti with meatballs"
}
+.. _api/doc/retrieving-deleted-documents:
Retrieving Attachments Content
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/efce3c25/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 7d22f1e..4ab2f65 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -119,30 +119,30 @@ CouchDB database information object
+================================+=============================================+
| db_name | The name of the database. |
+--------------------------------+---------------------------------------------+
-| committed_update_seq | The number of committed update. |
+| committed_update_seq | The number of committed updates. |
+--------------------------------+---------------------------------------------+
-| doc_count | A count of the documents in the specified |
-| | database. |
+| doc_count | The number of documents in the database. |
+--------------------------------+---------------------------------------------+
-| doc_del_count | Number of deleted documents |
+| doc_del_count | The number of deleted documents. |
+--------------------------------+---------------------------------------------+
| compact_running | Set to true if the database compaction |
| | routine is operating on this database. |
+--------------------------------+---------------------------------------------+
| disk_format_version | The version of the physical format used for |
-| | the data when it is stored on disk. |
+| | the data when it is stored on hard disk. |
+--------------------------------+---------------------------------------------+
-| disk_size | Size in bytes of the data as stored on the |
-| | disk. Views indexes are not included in the |
+| disk_size | Size in bytes of the data as stored on disk.|
+| | View indexes are not included in the |
| | calculation. |
+--------------------------------+---------------------------------------------+
-| instance_start_time | Timestamp of when the database was opened, |
-| | expressed in microseconds since the epoch. |
+| instance_start_time | Timestamp indicating when the database was |
+| | opened, expressed in microseconds since the |
+| | epoch. |
+--------------------------------+---------------------------------------------+
| purge_seq | The number of purge operations on the |
| | database. |
+--------------------------------+---------------------------------------------+
-| update_seq | The current number of updates to the |
+| update_seq | The current number of updates made in the |
| | database. |
+--------------------------------+---------------------------------------------+
@@ -227,7 +227,7 @@ List of Active Tasks
+--------------------------------+---------------------------------------------+
| Field | Description |
+================================+=============================================+
-| tasks [array] | Active Task |
+| tasks [array] | Active Tasks |
+--------------------------------+---------------------------------------------+
| pid | Process ID |
+--------------------------------+---------------------------------------------+
@@ -265,16 +265,16 @@ Replication Settings
| | start |
+--------------------------------+---------------------------------------------+
| filter (optional) | name of the filter function in the form of |
-| | ddoc/myfilter |
+| | ``ddoc/myfilter`` |
+--------------------------------+---------------------------------------------+
-| query_params (optional) | query parameter that are passed to the |
-| | filter function; value should be a document |
-| | containing parameters as members |
+| query_params (optional) | Query parameter that are passed to the |
+| | filter function; the value should be a |
+| | document containing parameters as members |
+--------------------------------+---------------------------------------------+
| use_checkpoints (optional) | Whether to use replication checkpoints |
| | or not |
+--------------------------------+---------------------------------------------+
-| checkpoint_interval (optional) | Specifies checkpoint interval in ms. |
+| checkpoint_interval (optional) | Specifies the checkpoint interval in ms. |
+--------------------------------+---------------------------------------------+
.. _replication-status:
@@ -289,7 +289,7 @@ Replication Status
+--------------------------------+---------------------------------------------+
| session_id | Unique session ID |
+--------------------------------+---------------------------------------------+
-| source_last_seq | Last sequence number read from source |
+| source_last_seq | Last sequence number read from the source |
| | database |
+--------------------------------+---------------------------------------------+
| history [array] | Replication History |
@@ -326,16 +326,16 @@ Request object
| Field | Description |
+================================+=============================================+
| body | Request body data as `string`. |
-| | If request method is `GET` method contains |
-| | this field contains ``"undefined"`` value, |
-| | while if `DELETE` or `HEAD` value is ``""`` |
-| | (empty string) |
+| | If the request method is `GET` this field |
+| | contains the value ``"undefined"``. If the |
+| | method is `DELETE` or `HEAD` the value is |
+| | ``""`` (empty string). |
+--------------------------------+---------------------------------------------+
| cookie | Cookies `object`. |
+--------------------------------+---------------------------------------------+
| form | Form data `object`. |
-| | Contains decoded body as key-value pairs if |
-| | `Content-Type` header was |
+| | Contains the decoded body as key-value |
+| | pairs if the `Content-Type` header was |
| | ``application/x-www-form-urlencoded``. |
+--------------------------------+---------------------------------------------+
| headers | Request headers `object`. |
@@ -346,18 +346,18 @@ Request object
| info | :ref:`Database information <dbinfo_object>` |
+--------------------------------+---------------------------------------------+
| method | Request method as `string` or `array`. |
-| | String value is method is one of: `HEAD`, |
+| | String value is a method as one of: `HEAD`, |
| | `GET`, `POST`, `PUT`, `DELETE`, `OPTIONS`, |
-| | and `TRACE`, otherwise it will be |
-| | represented as array of char codes. |
+| | and `TRACE`. Otherwise it will be |
+| | represented as an array of char codes. |
+--------------------------------+---------------------------------------------+
| path | List of requested path sections. |
+--------------------------------+---------------------------------------------+
| peer | Request source IP address. |
+--------------------------------+---------------------------------------------+
| query | URL query parameters `object`. |
-| | Note that multiple keys not supported and |
-| | last key value suppress others. |
+| | Note that multiple keys are not supported |
+| | and teh last key value suppresses others. |
+--------------------------------+---------------------------------------------+
| requested_path | List of actual requested path section. |
+--------------------------------+---------------------------------------------+
@@ -367,8 +367,8 @@ Request object
+--------------------------------+---------------------------------------------+
| userCtx | :ref:`userctx_object`. |
+--------------------------------+---------------------------------------------+
-| uuid | Generated UUID by specified algorithm in |
-| | config file. |
+| uuid | Generated UUID by a specified algorithm in |
+| | the config file. |
+--------------------------------+---------------------------------------------+
.. code-block:: javascript
@@ -481,15 +481,15 @@ Response object
+--------------------------------+---------------------------------------------+
.. warning::
- ``body``, ``base64`` and ``json`` object keys are overlaps each other and
- the last wins. Since most realizations of key-value objects doesn't preserve
- key order mixing them may create confusing situation. Try to use only one of
- them.
+ The ``body``, ``base64`` and ``json`` object keys are overlapping each other
+ where the last one wins. Since most realizations of key-value objects do
+ not preserve the key order or if they are mixed, confusing situations can
+ occure. Try to use only one of them.
.. note::
- Any custom property makes CouchDB raise internal exception.
- Also `Response object` could be a simple string value which would be
- implicitly wrapped into ``{"body": ...}`` object.
+ Any custom property makes CouchDB raise an internal exception.
+ Furthermore, the `Response object` could be a simple string value which would
+ be implicitly wrapped into a ``{"body": ...}`` object.
Returned CouchDB Document with Detailed Revision Info
@@ -503,7 +503,7 @@ Returned CouchDB Document with Detailed Revision Info
| _rev (optional) | Revision ID (when updating an existing |
| | document) |
+--------------------------------+---------------------------------------------+
-| _revs_info [array] | CouchDB Document Extended Revision Info |
+| _revs_info [array] | CouchDB document extended revision info |
+--------------------------------+---------------------------------------------+
| rev | Full revision string |
+--------------------------------+---------------------------------------------+
@@ -521,7 +521,7 @@ Returned CouchDB Document with Revision Info
| _rev (optional) | Revision ID (when updating an existing |
| | document) |
+--------------------------------+---------------------------------------------+
-| _revisions | CouchDB Document Revisions |
+| _revisions | CouchDB document revisions |
+--------------------------------+---------------------------------------------+
| ids [array] | Array of valid revision IDs, in reverse |
| | order (latest first) |
@@ -540,7 +540,7 @@ Returned Document with Attachments
| _rev (optional) | Revision ID (when updating an existing |
| | document) |
+--------------------------------+---------------------------------------------+
-| _attachments (optional) | Document Attachment |
+| _attachments (optional) | Document attachment |
+--------------------------------+---------------------------------------------+
| filename | Attachment |
+--------------------------------+---------------------------------------------+
@@ -601,8 +601,8 @@ User Context Object
+--------------------------------+---------------------------------------------+
| Field | Description |
+================================+=============================================+
-| db | Database name in context of provided |
-| | operation. |
+| db | Database name in the context of the |
+| | provided operation. |
+--------------------------------+---------------------------------------------+
| name | User name. |
+--------------------------------+---------------------------------------------+
[28/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Add CVE-214-2668 documentation to build system
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/70ead191
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/70ead191
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/70ead191
Branch: refs/heads/import-master
Commit: 70ead19187a1057e8c5e13495e8555475fee1e66
Parents: 249718c
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Tue Apr 15 09:35:21 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:30:29 2014 +0200
----------------------------------------------------------------------
build/Makefile.am | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/70ead191/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index f332e5c..86351f4 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -390,6 +390,7 @@ src_files = \
../src/cve/2012-5641.rst \
../src/cve/2012-5649.rst \
../src/cve/2012-5650.rst \
+ ../src/cve/2014-2668.rst \
../src/cve/index.rst \
../src/fauxton/addons.rst \
../src/fauxton/index.rst \
[48/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Docs: fix typo in Accept header value
This closes #250
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/e400e6fa
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/e400e6fa
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/e400e6fa
Branch: refs/heads/import-master
Commit: e400e6fa94da68ea9acf1b82a7ac8b7ef95778ca
Parents: c89106e
Author: Christoph <xr...@yahoo.com>
Authored: Wed Jun 18 17:57:40 2014 +0200
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jun 30 02:40:20 2014 +0400
----------------------------------------------------------------------
src/intro/api.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/e400e6fa/src/intro/api.rst
----------------------------------------------------------------------
diff --git a/src/intro/api.rst b/src/intro/api.rst
index 9525bee..d68f6e6 100644
--- a/src/intro/api.rst
+++ b/src/intro/api.rst
@@ -281,7 +281,7 @@ browsers will display the JSON as text.
.. _JSONView: http://jsonview.com/
Do you remember the :header:`Accept` request header and how it is set to
-``\*/\* -> */*`` to express interest in any MIME type? If you send ``Accept:
+``*/*`` to express interest in any MIME type? If you send ``Accept:
application/json`` in your request, CouchDB knows that you can deal with a pure
JSON response with the proper :header:`Content-Type` header and will
use it instead of :mimetype:`text/plain`.
[37/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
minor documentation fixes
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/61a24600
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/61a24600
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/61a24600
Branch: refs/heads/import-master
Commit: 61a24600e15edb39fc25e3e2ea67cea95bceefea
Parents: 8577708
Author: Andy Wenk <an...@apache.org>
Authored: Fri Apr 25 15:41:39 2014 +0200
Committer: Andy Wenk <an...@apache.org>
Committed: Fri Apr 25 15:41:39 2014 +0200
----------------------------------------------------------------------
src/replication/intro.rst | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/61a24600/src/replication/intro.rst
----------------------------------------------------------------------
diff --git a/src/replication/intro.rst b/src/replication/intro.rst
index 68690bf..2d09617 100644
--- a/src/replication/intro.rst
+++ b/src/replication/intro.rst
@@ -67,10 +67,10 @@ Master - Master replication
---------------------------
One replication task will only transfer changes in one direction. To achieve
-master-master replication it is possible to set up two replication tasks in
-different directions. When a change is replication from database A to B by the
-first task, the second will discover that the new change on B already exists in
-A and will wait for further changes.
+master-master replication, it is possible to set up two replication tasks in
+opposite direction. When a change is replicated from database A to B by the
+first task, the second task from B to A will discover that the new change on
+B already exists in A and will wait for further changes.
Controlling which Documents to Replicate
@@ -79,7 +79,7 @@ Controlling which Documents to Replicate
There are two ways for controlling which documents are replicated, and which
are skipped. *Local* documents are never replicated (see :ref:`api/local`).
-Additionally, :ref:`filterfun` can be used in a replication documents (see
+Additionally, :ref:`filterfun` can be used in a replication (see
:ref:`replication-settings`). The replication task will then evaluate
the filter function for each document in the changes feed. The document will
only be replicated if the filter returns `true`.
[34/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Support for user configurable SSL ciphers
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/f5e1140f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/f5e1140f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/f5e1140f
Branch: refs/heads/import-master
Commit: f5e1140f6026bbe44c270ca2c11354ceaf2c0066
Parents: 2f5f7dc
Author: Terin Stock <te...@gmail.com>
Authored: Sun Apr 20 11:40:25 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Apr 20 12:07:10 2014 +0100
----------------------------------------------------------------------
src/config/http.rst | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f5e1140f/src/config/http.rst
----------------------------------------------------------------------
diff --git a/src/config/http.rst b/src/config/http.rst
index 1ae3abe..dfe8d5a 100644
--- a/src/config/http.rst
+++ b/src/config/http.rst
@@ -387,6 +387,30 @@ Secure Socket Level Options
[ssl]
verify_ssl_certificates = false
+ .. config:option:: secure_renegotiate :: Enable secure renegotiation
+
+ Set to `true` to reject renegotiation attempt that does not live up to RFC 5746::
+
+ [ssl]
+ secure_renegotiate = true
+
+ .. config:option:: ciphers :: Specify permitted server cipher list
+
+ Set to the cipher suites that should be supported which can be
+ specified in erlang format "{ecdhe_ecdsa,aes_128_cbc,sha256}" or
+ in OpenSSL format "ECDHE-ECDSA-AES128-SHA256".
+
+ [ssl]
+ ciphers = ["ECDHE-ECDSA-AES128-SHA256", "ECDHE-ECDSA-AES128-SHA"]
+
+ .. config:option:: tls_versions :: Specify permitted server SSL/TLS
+ protocol versions
+
+ Set to a list of permitted SSL/TLS protocol versions::
+
+ [ssl]
+ tls_versions = [sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2']
+
.. _cors:
.. _config/cors:
[32/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Add documentation for CVE-2014-2668
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/86ae5c82
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/86ae5c82
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/86ae5c82
Branch: refs/heads/import-master
Commit: 86ae5c82edf59031455d6982fd7a8f8c7ef3b0ad
Parents: d0ccbb5
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Apr 15 09:11:00 2014 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Apr 16 16:43:10 2014 +0200
----------------------------------------------------------------------
src/cve/2014-2668.rst | 54 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/86ae5c82/src/cve/2014-2668.rst
----------------------------------------------------------------------
diff --git a/src/cve/2014-2668.rst b/src/cve/2014-2668.rst
new file mode 100644
index 0000000..5ccd2a4
--- /dev/null
+++ b/src/cve/2014-2668.rst
@@ -0,0 +1,54 @@
+.. Licensed under the Apache License, Version 2.0 (the "License"); you may not
+.. use this file except in compliance with the License. You may obtain a copy of
+.. the License at
+..
+.. http://www.apache.org/licenses/LICENSE-2.0
+..
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+.. License for the specific language governing permissions and limitations under
+.. the License.
+
+
+.. _cve/2014-2668:
+
+==================================================================================
+CVE-2014-2668: DoS (CPU and memory consumption) via the count parameter to /_uuids
+==================================================================================
+
+:Date: 26.03.2014
+
+:Affected: Apache CouchDB releases up to and including 1.3.1, 1.4.0,
+ and 1.5.0 are vulnerable.
+
+:Severity: Moderate
+
+:Vendor: The Apache Software Foundation
+
+Description
+===========
+
+The :ref:`api/server/uuids` resource's `count` query parameter is able to take
+unreasonable huge numeric value which leads to exhaustion of server resources
+(CPU and memory) and to DoS as the result.
+
+Mitigation
+==========
+
+Upgrade to a supported CouchDB release that includes this fix, such as:
+
+- :ref:`1.5.1 <release/1.5.1>`
+- :ref:`1.6.0 <release/1.6.0>`
+
+All listed releases have included a specific fix to
+
+Work-Around
+===========
+
+Disable the :ref:`api/server/uuids` handler completely, by adapting
+`local.ini` and restarting CouchDB::
+
+ [httpd_global_handlers]
+ _uuids =
+
[02/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Fix documentation wording
The warning regarding the Response Object was unclear.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/2023ccbc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/2023ccbc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/2023ccbc
Branch: refs/heads/import-master
Commit: 2023ccbc867eef816802ba9c54a16245cf991832
Parents: efce3c2
Author: Andy Wenk <an...@apache.org>
Authored: Thu Feb 20 20:57:11 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Feb 20 20:57:11 2014 +0100
----------------------------------------------------------------------
src/json-structure.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/2023ccbc/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 4ab2f65..8eae7df 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -481,10 +481,10 @@ Response object
+--------------------------------+---------------------------------------------+
.. warning::
- The ``body``, ``base64`` and ``json`` object keys are overlapping each other
- where the last one wins. Since most realizations of key-value objects do
- not preserve the key order or if they are mixed, confusing situations can
- occure. Try to use only one of them.
+ The ``body``, ``base64`` and ``json`` object keys overlapp each other
+ where in the last one wins. Since most implementations of key-value objects do
+ not preserve the key order, confusing situations can emerge. The same applies,
+ when they are mixed. Try to use only one of them.
.. note::
Any custom property makes CouchDB raise an internal exception.
[27/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Update 1.6.0 notes with proper CVE-2014-2668 note
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/249718c6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/249718c6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/249718c6
Branch: refs/heads/import-master
Commit: 249718c6cca0cadfab47aec5ea2b96c63a9e863b
Parents: d20f569
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Tue Apr 15 09:13:19 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:29:17 2014 +0200
----------------------------------------------------------------------
src/whatsnew/1.6.rst | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/249718c6/src/whatsnew/1.6.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.6.rst b/src/whatsnew/1.6.rst
index 7d93ff6..b1d9bc0 100644
--- a/src/whatsnew/1.6.rst
+++ b/src/whatsnew/1.6.rst
@@ -46,6 +46,16 @@ Version 1.6.0
* Fauxton: many improvements in our experimental new user interface, including
switching the code editor from CodeMirror to Ace as well as better support
for various browsers.
+* Add the ``max_count`` option (:ref:`config/uuids`) to allow rate-limiting
+ the amount of UUIDs that can be requested from the :ref:`api/server/uuids`
+ handler in a single request (:ref:`CVE 2014-2668 <cve/2014-2668>`).
+* :issue:`1986`: increase socket buffer size to improve replication speed
+ for large documents and attachments, and fix tests on BSD-like systems.
+ :commit:`9a0e561b`
+* :issue:`1953`: improve performance of multipart/related requests.
+ :commit:`ce3e89dc`
+* :issue:`2221`: verify that authentication-related configuration settings
+ are well-formed. :commit:`dbe769c6`
* :issue:`1922`: fix CORS exposed headers. :commit:`4f619833`
* Rename ``proxy_authentification_handler`` to ``proxy_authentication_handler``.
:commit:`c66ac4a8`
[15/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
fixed _update function example
It was only checking for req.id existance (it should
always be included in the request) and not its truthiness.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/cc40d180
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/cc40d180
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/cc40d180
Branch: refs/heads/import-master
Commit: cc40d1808f83ebcf9d6eb893f04cee13a6f65f47
Parents: 2531f04
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Wed Mar 26 09:38:57 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Wed Mar 26 09:38:57 2014 -0400
----------------------------------------------------------------------
src/couchapp/ddocs.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/cc40d180/src/couchapp/ddocs.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/ddocs.rst b/src/couchapp/ddocs.rst
index 754b9b7..4f4664a 100644
--- a/src/couchapp/ddocs.rst
+++ b/src/couchapp/ddocs.rst
@@ -419,7 +419,7 @@ The basic example that demonstrates all use-cases of update handlers below:
function(doc, req){
if (!doc){
- if ('id' in req){
+ if ('id' in req && req['id']){
// create new document
return [{'_id': req['id']}, 'New World']
}
[17/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
docs: clarify that .d and multiple .ini files only apply to unix
- closes COUCHDB-2104
Thanks Ole Johan for reporting this
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/72eaf489
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/72eaf489
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/72eaf489
Branch: refs/heads/import-master
Commit: 72eaf489680e7153a12046c03e091606fb03fe02
Parents: 62df84e
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Wed Mar 26 21:12:19 2014 +0100
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Wed Mar 26 21:12:19 2014 +0100
----------------------------------------------------------------------
src/config/intro.rst | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/72eaf489/src/config/intro.rst
----------------------------------------------------------------------
diff --git a/src/config/intro.rst b/src/config/intro.rst
index c528f74..835643a 100644
--- a/src/config/intro.rst
+++ b/src/config/intro.rst
@@ -23,6 +23,14 @@ Introduction Into Configuring
Configuration files
-------------------
+.. warning::
+ The following section covering load order of config files
+ applies only to UNIX-ish systems.
+ For Windows, only the provided ``default.ini`` and ``local.ini``
+ files are relevant. These can of course have content
+ appended, which achieves the same type of functionality
+ as outlined for UNIX-ish systems below.
+
By default, CouchDB reads configuration files from the following locations,
in the following order:
@@ -148,7 +156,7 @@ Setting parameters via the HTTP API
Alternatively, configuration parameters could be set via the
:ref:`HTTP API <api/config>`. This API allows to change CouchDB configuration
-on-fly without need for server restart::
+on-the-fly without requiring a server restart::
curl -X PUT http://localhost:5984/_config/uuids/algorithm -d '"random"'
@@ -157,16 +165,17 @@ In the response the old parameter's value returns::
"sequential"
You should be careful with changing configuration via the HTTP API since it's
-easy to make CouchDB unavailable. For instance, you'd like to change the
-:option:`httpd/bind_address` for new one::
+easy to make CouchDB unavailable. For instance, if you'd like to change the
+:option:`httpd/bind_address` for a new one::
curl -X PUT http://localhost:5984/_config/httpd/bind_address -d '"10.10.0.128"'
-However, if you would made a typo or the specified IP address is not available
-from your network, you'll make CouchDB unavailable for you in both cases and
-you will have the only way to fix the problem by edit the configuration file
-and restart the server. To protect yourself against such accidents you may
-setup the :option:`httpd/config_whitelist` of configuration parameters that
-are allowed to edit via the HTTP API. For others you'll need to directly edit
-the configuration file so you may quick fix any problems that had occurred due
-to misconfiguring.
+However, if you make a typo, or the specified IP address is not available
+from your network, CouchDB will be unavailable for you in both cases and
+the only way to resolve this will be by remoting into the server, correcting
+the errant file, and restarting CouchDB. To protect yourself against such
+accidents you may set the :option:`httpd/config_whitelist` of permitted
+configuration parameters for updates via the HTTP API. Once this option is set,
+further changes to non-whitelisted parameters must take place via the
+configuration file, and in most cases, also requires a server restart before
+hand-edited options take effect.
[31/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
[build] add missing Makefile.am entries. Actual file still missing.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/d0ccbb5c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/d0ccbb5c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/d0ccbb5c
Branch: refs/heads/import-master
Commit: d0ccbb5ca865fe3063c12f4f682cf75b0b3b9851
Parents: d43b202
Author: Jan Lehnardt <ja...@apache.org>
Authored: Wed Apr 16 16:42:00 2014 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Wed Apr 16 16:42:00 2014 +0200
----------------------------------------------------------------------
build/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d0ccbb5c/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index 7b95d0d..b3fba13 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -120,6 +120,7 @@ html_files = \
html/_sources/cve/2012-5641.txt \
html/_sources/cve/2012-5649.txt \
html/_sources/cve/2012-5650.txt \
+ html/_sources/cve/2014-2668.txt \
html/_sources/cve/index.txt \
html/_sources/fauxton/addons.txt \
html/_sources/fauxton/index.txt \
@@ -242,6 +243,7 @@ html_files = \
html/cve/2012-5641.html \
html/cve/2012-5649.html \
html/cve/2012-5650.html \
+ html/cve/2014-2668.html \
html/cve/index.html \
html/fauxton/addons.html \
html/fauxton/index.html \
[45/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Rephrase part of the replicator documentation
This tries to make the replicator documentation's "Delegations" section
more clear and easier to read.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/c0f6b011
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/c0f6b011
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/c0f6b011
Branch: refs/heads/import-master
Commit: c0f6b011625dc60fb5143faee9b83145c33ac94d
Parents: eb3b599
Author: Klaus Trainer <kl...@apache.org>
Authored: Mon May 12 00:08:25 2014 +0200
Committer: Klaus Trainer <kl...@apache.org>
Committed: Wed May 14 16:34:06 2014 +0200
----------------------------------------------------------------------
src/replication/replicator.rst | 46 ++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c0f6b011/src/replication/replicator.rst
----------------------------------------------------------------------
diff --git a/src/replication/replicator.rst b/src/replication/replicator.rst
index 5117752..347b5a5 100644
--- a/src/replication/replicator.rst
+++ b/src/replication/replicator.rst
@@ -354,29 +354,27 @@ Delegations
Replication documents can have a custom ``user_ctx`` property. This
property defines the user context under which a replication runs. For
-the old way of triggering replications (POSTing to ``/_replicate/``),
-this property was not needed (it didn't exist in fact) - this is because
-at the moment of triggering the replication it has information about the
-authenticated user. With the replicator database, since it's a regular
-database, the information about the authenticated user is only present
-at the moment the replication document is written to the database - the
-replicator database implementation is like a ``_changes`` feed consumer
-(with ``?include_docs=true``) that reacts to what was written to the
-replicator database - in fact this feature could be implemented with an
-external script/program. This implementation detail implies that for non
-admin users, a ``user_ctx`` property, containing the user's name and a
-subset of their roles, must be defined in the replication document.
-This is ensured by the document update validation function present in
-the default design document of the replicator database. This validation
-function also ensure that a non admin user can set a user name property
-in the ``user_ctx`` property that doesn't match their own name (same
-principle applies for the roles).
+the old way of triggering a replication (POSTing to ``/_replicate/``),
+this property is not needed. That's because information about the
+authenticated user is readily available during the replication, which is
+not persistent in that case. Now, with the replicator database, the
+problem is that information about which user is starting a particular
+replication is only present when the replication document is written.
+The information in the replication document and the replication itself
+are persistent, however. This implementation detail implies that in the
+case of a non-admin user, a ``user_ctx`` property containing the user's
+name and a subset of their roles must be defined in the replication
+document. This is enforced by the document update validation function
+present in the default design document of the replicator database. The
+validation function also ensures that non-admin users are unable to set
+the value of the user context's ``name`` property to anything other than
+their own user name. The same principle applies for roles.
For admins, the ``user_ctx`` property is optional, and if it's missing
-it defaults to a user context with name null and an empty list of roles
-- this mean design documents will not be written to local targets. If
-writing design documents to local targets is desired, the a user context
-with the roles ``_admin`` must be set explicitly.
+it defaults to a user context with name ``null`` and an empty list of
+roles, which means design documents won't be written to local targets.
+If writing design documents to local targets is desired, the role
+``_admin`` must be present in the user context's list of roles.
Also, for admins the ``user_ctx`` property can be used to trigger a
replication on behalf of another user. This is the user context that
@@ -400,6 +398,6 @@ Example delegated replication document:
}
}
-As stated before, for admins the ``user_ctx`` property is optional, while
-for regular (non admin) users it's mandatory. When the roles property of
-``user_ctx`` is missing, it defaults to the empty list ``[ ]``.
+As stated before, the ``user_ctx`` property is optional for admins, while
+being mandatory for regular (non-admin) users. When the roles property
+of ``user_ctx`` is missing, it defaults to the empty list ``[]``.
[14/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
clarified what a complex key is in view collation
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/2531f042
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/2531f042
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/2531f042
Branch: refs/heads/import-master
Commit: 2531f04217d10e1ed979df1fc3074629c3642048
Parents: f1ef013
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Tue Mar 25 16:45:50 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Tue Mar 25 16:45:54 2014 -0400
----------------------------------------------------------------------
src/couchapp/views/collation.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/2531f042/src/couchapp/views/collation.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/collation.rst b/src/couchapp/views/collation.rst
index 9c2f5c7..9b11b15 100644
--- a/src/couchapp/views/collation.rst
+++ b/src/couchapp/views/collation.rst
@@ -32,8 +32,8 @@ property serves as the key, thus the result will be sorted by ``LastName``:
}
}
-CouchDB allows arbitrary JSON structures to be used as keys. You can use complex
-keys for fine-grained control over sorting and grouping.
+CouchDB allows arbitrary JSON structures to be used as keys. You can use JSON
+arrays as keys for fine-grained control over sorting and grouping.
Examples
========
[04/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Fix formatting
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/eece8df2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/eece8df2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/eece8df2
Branch: refs/heads/import-master
Commit: eece8df23ea356cb459b98722bf4b8f7fe3963c0
Parents: da348c9
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Feb 25 20:27:33 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Feb 25 20:27:33 2014 +0400
----------------------------------------------------------------------
src/json-structure.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/eece8df2/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 8eae7df..ab3ae45 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -227,7 +227,7 @@ List of Active Tasks
+--------------------------------+---------------------------------------------+
| Field | Description |
+================================+=============================================+
-| tasks [array] | Active Tasks |
+| tasks [array] | Active Tasks |
+--------------------------------+---------------------------------------------+
| pid | Process ID |
+--------------------------------+---------------------------------------------+
[05/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Update pagination docs - COUCHDB-1076 is old now
As far as I'm aware, skip is equivalently fast to a startkey search
because whole subtrees are skipped when their document count does
not exceed the remaining skip.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/858a09b2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/858a09b2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/858a09b2
Branch: refs/heads/import-master
Commit: 858a09b2cde29122f712fb321765b2e67f46d7f1
Parents: eece8df
Author: Randall Leeds <ra...@apache.org>
Authored: Sun Mar 9 20:40:55 2014 -0700
Committer: Randall Leeds <ra...@apache.org>
Committed: Sun Mar 9 20:43:37 2014 -0700
----------------------------------------------------------------------
src/couchapp/views/pagination.rst | 48 +++++++++++-----------------------
1 file changed, 15 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/858a09b2/src/couchapp/views/pagination.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/pagination.rst b/src/couchapp/views/pagination.rst
index b40f988..6f3b34e 100644
--- a/src/couchapp/views/pagination.rst
+++ b/src/couchapp/views/pagination.rst
@@ -125,12 +125,11 @@ Or in a pseudo-JavaScript snippet:
page.display_link('next');
}
-Slow Paging (Do Not Use)
-========================
+Paging
+======
-**Don’t use this method!** We just show it because it might seem natural to use,
-and you need to know why it is a bad idea. To get the first five rows from
-the view result, you use the ``?limit=5`` query parameter::
+To get the first five rows from the view result, you use the ``?limit=5``
+query parameter::
curl -X GET http://127.0.0.1:5984/artists/_design/artists/_view/by-name?limit=5
@@ -194,34 +193,17 @@ straightforward:
return page != last_page;
}
-The dealbreaker
----------------
-
-This all looks easy and straightforward, but it has one fatal flaw. Remember
-how view results are generated from the underlying B-tree index: CouchDB
-jumps to the first row (or the first row that matches ``startkey``,
-if provided) and reads one row after the other from the index until there are
-no more rows (or ``limit`` or ``endkey`` match, if provided).
-
-The ``skip`` argument works like this: in addition to going to the first row and
-starting to read, skip will skip as many rows as specified, but CouchDB will
-still read from the first row; it just won’t return any values for the skipped
-rows. If you specify ``skip=100``, CouchDB will read 100 rows and not create
-output for them. This doesn’t sound too bad, but it is very bad, when you use
-1000 or even 10000 as skip values. CouchDB will have to look at a lot of rows
-unnecessarily.
-
-As a rule of thumb, skip should be used only with single digit values. While
-it’s possible that there are legitimate use cases where you specify a larger
-value, they are a good indicator for potential problems with your solution.
-Finally, for the calculations to work, you need to add a reduce function and
-make two calls to the view per page to get all the numbering right,
-and there’s still a potential for error.
-
-Fast Paging (Do Use)
-====================
-
-The correct solution is not much harder. Instead of slicing the result set
+Paging (Alternate Method)
+=========================
+
+The method described above performed poorly with large skip values until
+CouchDB 1.2. Additionally, some use cases may call for the following
+alternate method even with newer versions of CouchDB. One such case is when
+duplicate results should be prevented. Using skip alone it is possible for
+new documents to be inserted during pagination which could change the offset
+of the start of the subsequent page.
+
+A correct solution is not much harder. Instead of slicing the result set
into equally sized pages, we look at 10 rows at a time and use ``startkey`` to
jump to the next 10 rows. We even use skip, but only with the value 1.
[12/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Improving misleading example. Do not emit(foo, doc)!
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/d3071895
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/d3071895
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/d3071895
Branch: refs/heads/import-master
Commit: d3071895def27162e8d6e04c171b7fed47a649b2
Parents: 793d70a
Author: Joan Touzet <wo...@apache.org>
Authored: Fri Mar 21 19:44:58 2014 -0400
Committer: Joan Touzet <wo...@apache.org>
Committed: Fri Mar 21 19:44:58 2014 -0400
----------------------------------------------------------------------
src/couchapp/views/collation.rst | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d3071895/src/couchapp/views/collation.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/collation.rst b/src/couchapp/views/collation.rst
index 9fa8513..06c4c6d 100644
--- a/src/couchapp/views/collation.rst
+++ b/src/couchapp/views/collation.rst
@@ -28,7 +28,7 @@ property serves as the key, thus the result will be sorted by ``LastName``:
function(doc) {
if (doc.Type == "customer") {
- emit(doc.LastName, {FirstName: doc.FirstName, Address: doc.Address});
+ emit(doc.LastName, null);
}
}
@@ -49,12 +49,17 @@ associated orders. The values 0 and 1 for the sorting token are arbitrary.
function(doc) {
if (doc.Type == "customer") {
- emit([doc._id, 0], doc);
+ emit([doc._id, 0], null);
} else if (doc.Type == "order") {
- emit([doc.customer_id, 1], doc);
+ emit([doc.customer_id, 1], null);
}
}
+To list a specific customer with ``_id`` XYZ, and all of that customer's orders, limit the startkey and endkey ranges to cover only documents for that customer's ``_id``::
+
+ startkey=["XYZ"]&endkey=["XYZ", {}]
+
+It is not recommended to emit the document itself in the view. Instead, to include the bodies of the documents when requesting the view, request the view with ``?include_docs=true``.
Sorting by Dates
================
@@ -67,14 +72,14 @@ the following emit function would sort by date:
.. code-block:: javascript
- emit(Date.parse(doc.created_at).getTime(), doc);
+ emit(Date.parse(doc.created_at).getTime(), null);
Alternatively, if you use a date format which sorts lexicographically,
such as ``"2013/06/09 13:52:11 +0000"`` you can just
.. code-block:: javascript
- emit(doc.created_at, doc);
+ emit(doc.created_at, null);
and avoid the conversion. As a bonus, this date format is compatible with the
JavaScript date parser, so you can use ``new Date(doc.created_at)`` in your
[16/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
s/teh/the in json-structure
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/62df84ec
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/62df84ec
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/62df84ec
Branch: refs/heads/import-master
Commit: 62df84ecb675f533b67080915342a0b5e68c6adf
Parents: cc40d18
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Wed Mar 26 09:46:00 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Wed Mar 26 09:46:00 2014 -0400
----------------------------------------------------------------------
src/json-structure.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/62df84ec/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index 68137d2..addc5ac 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -357,7 +357,7 @@ Request object
+--------------------------------+---------------------------------------------+
| query | URL query parameters `object`. |
| | Note that multiple keys are not supported |
-| | and teh last key value suppresses others. |
+| | and the last key value suppresses others. |
+--------------------------------+---------------------------------------------+
| requested_path | List of actual requested path section. |
+--------------------------------+---------------------------------------------+
[11/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
fix documentation
explain why the HTTP status code 400 will be returned when ?rev=
is included in the request URL
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/793d70a2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/793d70a2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/793d70a2
Branch: refs/heads/import-master
Commit: 793d70a2ccb0efece834febe9ad2fa5733a5fecb
Parents: 5a4a2ef
Author: Andy Wenk <an...@nms.de>
Authored: Fri Mar 21 22:57:04 2014 +0100
Committer: Andy Wenk <an...@nms.de>
Committed: Fri Mar 21 22:57:04 2014 +0100
----------------------------------------------------------------------
src/api/database/common.rst | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/793d70a2/src/api/database/common.rst
----------------------------------------------------------------------
diff --git a/src/api/database/common.rst b/src/api/database/common.rst
index f715c70..a1483d9 100644
--- a/src/api/database/common.rst
+++ b/src/api/database/common.rst
@@ -223,6 +223,12 @@
Deletes the specified database, and all the documents and attachments
contained within it.
+ .. note::
+
+ To avoid deleting a database, CouchDB will respond with the HTTP status code 400
+ when the request URL includes a ?rev= parameter. This suggests that one wants to delete
+ a document but forgot to add the document id to the URL.
+
:param db: Database name
:<header Accept: - :mimetype:`application/json`
- :mimetype:`text/plain`
@@ -230,7 +236,7 @@
- :mimetype:`text/plain; charset=utf-8`
:>json boolean ok: Operation status
:code 200: Database removed successfully
- :code 400: Invalid database name
+ :code 400: Invalid database name or forgotten document id by accident
:code 401: CouchDB Server Administrator privileges required
:code 404: Database doesn't exist
[40/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Added missing build requirements for Centos/RHEL environments.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/1dbcd577
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/1dbcd577
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/1dbcd577
Branch: refs/heads/import-master
Commit: 1dbcd5779619c10238e1a6a7a16ac89d861e3d5e
Parents: 9d8ed08
Author: Wendall Cada <we...@83864.com>
Authored: Tue Apr 29 14:35:38 2014 -0700
Committer: Wendall Cada <we...@83864.com>
Committed: Tue Apr 29 14:35:38 2014 -0700
----------------------------------------------------------------------
src/install/unix.rst | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/1dbcd577/src/install/unix.rst
----------------------------------------------------------------------
diff --git a/src/install/unix.rst b/src/install/unix.rst
index 05e0459..9c1084c 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -102,19 +102,20 @@ RedHat-based (Fedora, Centos, RHEL) Systems
You can install the dependencies by running::
- sudo yum groupinstall "Development Tools"
sudo yum install autoconf
sudo yum install autoconf-archive
sudo yum install automake
- sudo yum install libtool
- sudo yum install perl-Test-Harness
- sudo yum install erlang-etap
+ sudo yum install curl-devel
+ sudo yum install erlang-asn1
sudo yum install erlang-erts
- sudo yum install erlang-os_mon
sudo yum install erlang-eunit
- sudo yum install libicu-devel
+ sudo yum install erlang-os_mon
+ sudo yum install erlang-xmerl
+ sudo yum install help2man
sudo yum install js-devel
- sudo yum install curl-devel
+ sudo yum install libicu-devel
+ sudo yum install libtool
+ sudo yum install perl-Test-Harness
While CouchDB builds against the default js-devel-1.7.0 included in some
distributions, it's recommended to use a more recent js-devel-1.8.5.
[41/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
docs: update supported Erlang/OTP and SpiderMonkey versions
- matches what the code can support after last Mochiweb update
- update .travis.yml file to match 17.0 release
- update docs
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/fc9d1bb0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/fc9d1bb0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/fc9d1bb0
Branch: refs/heads/import-master
Commit: fc9d1bb0fa3b8109571b04ec48d3fb74c9c56110
Parents: 1dbcd57
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Mon Apr 28 13:47:59 2014 +0200
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Thu May 1 15:05:38 2014 +0200
----------------------------------------------------------------------
build/Makefile.am | 3 +++
src/install/unix.rst | 4 ++--
src/whatsnew/1.7.rst | 42 ++++++++++++++++++++++++++++++++++++++++++
src/whatsnew/index.rst | 1 +
4 files changed, 48 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/fc9d1bb0/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index b3fba13..58efee1 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -162,6 +162,7 @@ html_files = \
html/_sources/whatsnew/1.4.txt \
html/_sources/whatsnew/1.5.txt \
html/_sources/whatsnew/1.6.txt \
+ html/_sources/whatsnew/1.7.txt \
html/_sources/whatsnew/index.txt \
html/_sources/about.txt \
html/_sources/contents.txt \
@@ -285,6 +286,7 @@ html_files = \
html/whatsnew/1.4.html \
html/whatsnew/1.5.html \
html/whatsnew/1.6.html \
+ html/whatsnew/1.7.html \
html/whatsnew/index.html \
html/about.html \
html/config-ref.html \
@@ -434,6 +436,7 @@ src_files = \
../src/whatsnew/1.4.rst \
../src/whatsnew/1.5.rst \
../src/whatsnew/1.6.rst \
+ ../src/whatsnew/1.7.rst \
../src/whatsnew/index.rst \
../src/about.rst \
../src/contents.rst \
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/fc9d1bb0/src/install/unix.rst
----------------------------------------------------------------------
diff --git a/src/install/unix.rst b/src/install/unix.rst
index 9c1084c..76fe922 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -52,10 +52,10 @@ Dependencies
You should have the following installed:
-* `Erlang OTP (>=R13B04, <R17) <http://erlang.org/>`_
+* `Erlang OTP (>=R14B01, =<R17) <http://erlang.org/>`_
* `ICU <http://icu-project.org/>`_
* `OpenSSL <http://www.openssl.org/>`_
-* `Mozilla SpiderMonkey (1.7) <http://www.mozilla.org/js/spidermonkey/>`_
+* `Mozilla SpiderMonkey (1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_
* `GNU Make <http://www.gnu.org/software/make/>`_
* `GNU Compiler Collection <http://gcc.gnu.org/>`_
* `libcurl <http://curl.haxx.se/libcurl/>`_
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/fc9d1bb0/src/whatsnew/1.7.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.7.rst b/src/whatsnew/1.7.rst
new file mode 100644
index 0000000..69be11b
--- /dev/null
+++ b/src/whatsnew/1.7.rst
@@ -0,0 +1,42 @@
+.. Licensed under the Apache License, Version 2.0 (the "License"); you may not
+.. use this file except in compliance with the License. You may obtain a copy of
+.. the License at
+..
+.. http://www.apache.org/licenses/LICENSE-2.0
+..
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+.. License for the specific language governing permissions and limitations under
+.. the License.
+
+
+.. _release/1.7.x:
+
+============
+1.7.x Branch
+============
+
+.. contents::
+ :depth: 1
+ :local:
+
+.. _release/1.7.x/upgrade:
+
+Upgrade Notes
+=============
+
+None.
+
+.. _release/1.7.0:
+
+Version 1.7.0
+=============
+
+.. warning::
+
+ This version is not released yet.
+
+* Build System: :issue:`2200`: support Erlang/OTP 17.0
+ :commit:`78603ad`
+
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/fc9d1bb0/src/whatsnew/index.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/index.rst b/src/whatsnew/index.rst
index 800b9ee..52c9317 100644
--- a/src/whatsnew/index.rst
+++ b/src/whatsnew/index.rst
@@ -19,6 +19,7 @@ Release History
.. toctree::
:glob:
+ 1.7
1.6
1.5
1.4
[07/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
s/MVC/MVCC in replication protocol docs
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/091983c8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/091983c8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/091983c8
Branch: refs/heads/import-master
Commit: 091983c8dbb30a92d60d1629adbe8c0a0dee03c8
Parents: 7592a71
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Mon Oct 21 10:02:11 2013 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Thu Mar 13 09:38:24 2014 -0400
----------------------------------------------------------------------
src/replication/protocol.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/091983c8/src/replication/protocol.rst
----------------------------------------------------------------------
diff --git a/src/replication/protocol.rst b/src/replication/protocol.rst
index c5a8181..0f6fdfd 100644
--- a/src/replication/protocol.rst
+++ b/src/replication/protocol.rst
@@ -40,7 +40,7 @@ provided by the couch_replicator_ module available in Apache CouchDB.
The CouchDB_ replication protocol is using the `CouchDB REST API
<http://wiki.apache.org/couchdb/Reference>`_ and so is based on HTTP and
-the Apache CouchDB MVC Data model. The primary goal of this
+the Apache CouchDB MVCC Data model. The primary goal of this
specification is to describe the CouchDB replication algorithm.
[29/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Add some more files to the build system
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/e352fab4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/e352fab4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/e352fab4
Branch: refs/heads/import-master
Commit: e352fab48e57ba5b941eb8f9971a2156dc226da1
Parents: 70ead19
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Tue Apr 15 10:20:31 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:30:40 2014 +0200
----------------------------------------------------------------------
build/Makefile.am | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/e352fab4/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index 86351f4..92ec2ff 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -450,6 +450,7 @@ src_files_html = \
../templates/layout.html \
../templates/help.html \
../templates/searchbox.html \
+ ../templates/tracing.html \
../templates/utilities.html
sphinx_extensions = \
[19/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
change the documentation for unix
the testsuite in Futon is not linked anymore (/_utils/couch_tests.html)
but there is the verify installation page. Changed the docs accordingly.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/4f4b906b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/4f4b906b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/4f4b906b
Branch: refs/heads/import-master
Commit: 4f4b906bd1ce3af13207748a7ab8f479bc075547
Parents: e7073ec
Author: Andy Wenk <an...@apache.org>
Authored: Thu Mar 27 21:17:05 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Mar 27 21:17:05 2014 +0100
----------------------------------------------------------------------
src/install/unix.rst | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/4f4b906b/src/install/unix.rst
----------------------------------------------------------------------
diff --git a/src/install/unix.rst b/src/install/unix.rst
index da4e5bd..05e0459 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -175,7 +175,9 @@ To check that everything has worked, point your web browser to::
http://127.0.0.1:5984/_utils/index.html
-From here you should run the test suite in Firefox.
+From here you should verify your installation by pointing your web browser to::
+
+ http://localhost:5984/_utils/verify_install.html
Security Considerations
-----------------------
[49/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Documentation formatting typo
fixed a formatting typo as reported by
Blake Gideon
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/f28ab4a6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/f28ab4a6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/f28ab4a6
Branch: refs/heads/import-master
Commit: f28ab4a6469b107637df117130e53efba3890bfe
Parents: e400e6f
Author: Andy Wenk <an...@apache.org>
Authored: Tue Jul 8 21:30:01 2014 +0200
Committer: Andy Wenk <an...@apache.org>
Committed: Tue Jul 8 21:30:01 2014 +0200
----------------------------------------------------------------------
src/couchapp/views/intro.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f28ab4a6/src/couchapp/views/intro.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/intro.rst b/src/couchapp/views/intro.rst
index 5e1dab4..f7d0738 100644
--- a/src/couchapp/views/intro.rst
+++ b/src/couchapp/views/intro.rst
@@ -378,7 +378,7 @@ B-trees are structured, we can cache the intermediate reduce results in the
non-leaf nodes of the tree, so reduce queries can be computed along arbitrary
key ranges in logarithmic time. See Figure 1, “Comments map function”.
-In the blog app, we use ``group_leve``l reduce queries to compute the count of
+In the blog app, we use ``group_leve`` reduce queries to compute the count of
comments both on a per-post and total basis, achieved by querying the same view
index with different methods. With some array keys, and assuming each key has
the value ``1``:
[36/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
fix documentation for replicator intro
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/85777084
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/85777084
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/85777084
Branch: refs/heads/import-master
Commit: 85777084ad0fc578676842fc7a49a31ea5e35adb
Parents: c5a4c7f
Author: Andy Wenk <an...@apache.org>
Authored: Thu Apr 24 22:25:22 2014 +0200
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Apr 24 22:25:22 2014 +0200
----------------------------------------------------------------------
src/replication/intro.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/85777084/src/replication/intro.rst
----------------------------------------------------------------------
diff --git a/src/replication/intro.rst b/src/replication/intro.rst
index ff002db..68690bf 100644
--- a/src/replication/intro.rst
+++ b/src/replication/intro.rst
@@ -29,8 +29,8 @@ databases are also deleted on the destination database (if they even existed).
Triggering Replication
----------------------
-Replication is controlled through documents in the :ref:`replicator`, where
-each document describes one replication process (see
+Replication is controlled through documents in the :ref:`_replicator <replicator>`
+database, where each document describes one replication process (see
:ref:`replication-settings`).
A replication is triggered by storing a replication document in the replicator
[24/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Add GA tracking to docs, only when not local
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/5db4eed2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/5db4eed2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/5db4eed2
Branch: refs/heads/import-master
Commit: 5db4eed2af58e04fc76cb2f373a800cf9beca2ba
Parents: 9d61faf
Author: Noah Slater <ns...@tumbolia.org>
Authored: Thu Apr 10 12:45:40 2014 +0200
Committer: Noah Slater <ns...@tumbolia.org>
Committed: Thu Apr 10 12:45:40 2014 +0200
----------------------------------------------------------------------
src/conf.py | 5 ++++-
templates/help.html | 4 ++--
templates/tracking.html | 15 +++++++++++++++
3 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/5db4eed2/src/conf.py
----------------------------------------------------------------------
diff --git a/src/conf.py b/src/conf.py
index 14a93f5..03c5dd6 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -106,7 +106,9 @@ html_additional_pages = {
'index': 'pages/index.html'
}
-html_context = {}
+html_context = {
+ "ga_code": "UA-658988-6"
+}
html_sidebars = {
"**": [
@@ -115,6 +117,7 @@ html_sidebars = {
"relations.html",
"utilities.html",
"help.html",
+ "tracking.html",
]
}
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/5db4eed2/templates/help.html
----------------------------------------------------------------------
diff --git a/templates/help.html b/templates/help.html
index be0cb91..a6b7859 100644
--- a/templates/help.html
+++ b/templates/help.html
@@ -16,9 +16,9 @@ specific language governing permissions and limitations under the License.
<h3>More Help</h3>
<ul>
-<li><a href="https://couchdb.apache.org/">Homepage</a></li>
+<li><a href="https://couchdb.apache.org/"{% if not local %} onclick="_gaq.push(['_link', 'https://couchdb.apache.org/']); return false;"{% endif %}>Homepage</a></li>
<li><a href="http://wiki.apache.org/couchdb/">Wiki</a></li>
-<li><a href="https://couchdb.apache.org/#mailing-list">Mailing Lists</a></li>
+<li><a href="https://couchdb.apache.org/#mailing-list"{% if not local %} onclick="_gaq.push(['_link', 'https://couchdb.apache.org/#mailing-list']); return false;"{% endif %}>Mailing Lists</a></li>
<li><a href="http://webchat.freenode.net/?channels=couchdb">IRC</a></li>
<li><a href="https://issues.apache.org/jira/browse/CouchDB">Issues</a></li>
<li><a href="{{ pathto('download') }}">Download</a></li>
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/5db4eed2/templates/tracking.html
----------------------------------------------------------------------
diff --git a/templates/tracking.html b/templates/tracking.html
new file mode 100644
index 0000000..e6d4037
--- /dev/null
+++ b/templates/tracking.html
@@ -0,0 +1,15 @@
+{% if not local %}
+<script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', '{{ ga_code }}']);
+ _gaq.push(['_setDomainName', 'couchdb.org']);
+ _gaq.push(['_setAllowLinker', true]);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+</script>
+{% endif %}
[22/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Describe HTTP 403 response reasons for /_uuids resource
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/1d31c3a4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/1d31c3a4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/1d31c3a4
Branch: refs/heads/import-master
Commit: 1d31c3a4654d531141ee0265c4c54b29e43bd1ec
Parents: 3a9ac52
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Mar 27 17:19:06 2014 +0400
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 1 19:35:44 2014 +0200
----------------------------------------------------------------------
src/api/server/common.rst | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/1d31c3a4/src/api/server/common.rst
----------------------------------------------------------------------
diff --git a/src/api/server/common.rst b/src/api/server/common.rst
index 4e5614c..6327dc0 100644
--- a/src/api/server/common.rst
+++ b/src/api/server/common.rst
@@ -916,6 +916,8 @@ structure is as follows:
``/_uuids``
===========
+.. versionchanged:: 1.5.1
+
.. http:get:: /_uuids
:synopsis: Generates a list of UUIDs from the server
@@ -930,6 +932,8 @@ structure is as follows:
- :mimetype:`text/plain; charset=utf-8`
:>header ETag: Response hash
:code 200: Request completed successfully
+ :code 403: Requested more UUIDs than is :config:option:`allowed
+ <uuids/max_count>` to retrieve
**Request**:
[43/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Send a real EventSource event for heartbeat
The EventSource connection can get stuck (in TCP half-open state*) and there's no way
for the client to detect that. This commit changes the way heartbeat is sent, instead of
sending a newline character, it sends an empty event of type heartbeat:
event: heartbeat
data:
This event doesn't have an id: field, so the client will retain its latest Last-Event-ID state.
This doesn't change the expectations of clients that used EventSource till now, because they
subscribe to the 'message' event type. To get the 'heartbeat' events a client will need to
explicitly subscribe to it:
source.addEventListener('heartbeat', function () { /* cancel a timer that would otherwise reconnect the source */ });
* this can happen when you suspend your laptop, on flaky internet connection, ADSL reconnect,
bad wifi signals, bad routers etc. Pretty often in a typical internet usage nowadays.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/867bd1a0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/867bd1a0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/867bd1a0
Branch: refs/heads/import-master
Commit: 867bd1a08de51976da5ec3a8e19b8a6f7b9348e0
Parents: 9035fbe
Author: Damjan Georgievski <gd...@gmail.com>
Authored: Fri May 2 17:04:41 2014 +0200
Committer: Klaus Trainer <kl...@apache.org>
Committed: Tue May 13 14:53:42 2014 +0200
----------------------------------------------------------------------
src/api/database/changes.rst | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/867bd1a0/src/api/database/changes.rst
----------------------------------------------------------------------
diff --git a/src/api/database/changes.rst b/src/api/database/changes.rst
index fc46412..6e48f9b 100644
--- a/src/api/database/changes.rst
+++ b/src/api/database/changes.rst
@@ -398,6 +398,16 @@ parameter.
}
+If you set a heartbeat interval (using the ``heartbeat`` query argument), CouchDB will
+send a ``hearbeat`` event that you can subscribe to with:
+
+.. code-block:: javascript
+
+ source.addEventListener('heartbeat', function () {}, false);
+
+This can be monitored by the client application to restart the EventSource connection if
+needed (i.e. if the TCP connection gets stuck in a half-open state).
+
.. note::
EventSource connections are subject to cross-origin resource sharing
[20/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Add documentation for new uuids.max_count option
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/10c14981
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/10c14981
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/10c14981
Branch: refs/heads/import-master
Commit: 10c14981e56c4bd9b551fa16cffb4e23a8dd7bec
Parents: 4f4b906
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Thu Mar 27 13:51:19 2014 +0100
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 1 19:35:11 2014 +0200
----------------------------------------------------------------------
src/config/misc.rst | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/10c14981/src/config/misc.rst
----------------------------------------------------------------------
diff --git a/src/config/misc.rst b/src/config/misc.rst
index 753d0e2..58d079c 100644
--- a/src/config/misc.rst
+++ b/src/config/misc.rst
@@ -202,6 +202,17 @@ UUIDs Configuration
[uuid]
utc_id_suffix = my-awesome-suffix
+ .. config:option:: max_count :: Per-Request UUID Limit
+
+ .. versionadded:: 1.5.1
+
+ No more than this number of UUIDs will be sent in a single request. If
+ more UUIDs are requested, an HTTP error response will be thrown.
+
+ ::
+
+ [uuid]
+ max_count = 1000
.. _config/vendor:
[46/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Use "single-master" technical term which inspired by RFC 3384
COUCHDB-2248
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/679af60c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/679af60c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/679af60c
Branch: refs/heads/import-master
Commit: 679af60c7abbac03fd223738407e485611cb2275
Parents: c0f6b01
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu May 29 01:28:18 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu May 29 01:28:18 2014 +0400
----------------------------------------------------------------------
src/intro/consistency.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/679af60c/src/intro/consistency.rst
----------------------------------------------------------------------
diff --git a/src/intro/consistency.rst b/src/intro/consistency.rst
index 96519c3..c104ded 100644
--- a/src/intro/consistency.rst
+++ b/src/intro/consistency.rst
@@ -280,7 +280,7 @@ consistency between multiple database servers. If a client makes a write
operation on server `A`, how do we make sure that this is consistent with
server `B`, or `C`, or `D`? For relational databases, this is a very complex
problem with entire books devoted to its solution. You could use
-multi-master, master/slave, partitioning, sharding, write-through caches,
+multi-master, single-master, partitioning, sharding, write-through caches,
and all sorts of other complex techniques.
[13/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
put back JSON return value in collation example
Originally removed in 0f7be287d6a9358d960beb17b16ad7b5e20bd360
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/f1ef0137
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/f1ef0137
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/f1ef0137
Branch: refs/heads/import-master
Commit: f1ef01370e57c9c49caca8ed7131497e0dfc3743
Parents: d307189
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Tue Mar 25 16:45:28 2014 -0400
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Tue Mar 25 16:45:28 2014 -0400
----------------------------------------------------------------------
src/couchapp/views/collation.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/f1ef0137/src/couchapp/views/collation.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/collation.rst b/src/couchapp/views/collation.rst
index 06c4c6d..9c2f5c7 100644
--- a/src/couchapp/views/collation.rst
+++ b/src/couchapp/views/collation.rst
@@ -28,7 +28,7 @@ property serves as the key, thus the result will be sorted by ``LastName``:
function(doc) {
if (doc.Type == "customer") {
- emit(doc.LastName, null);
+ emit(doc.LastName, {FirstName: doc.FirstName, Address: doc.Address});
}
}
[38/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Remove "details" query parameter from show functions API
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/c064abc3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/c064abc3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/c064abc3
Branch: refs/heads/import-master
Commit: c064abc36108a41e562ede6861c5cbe78b0a7705
Parents: 61a2460
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Apr 27 14:24:32 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Apr 27 14:24:32 2014 +0400
----------------------------------------------------------------------
src/api/ddoc/render.rst | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c064abc3/src/api/ddoc/render.rst
----------------------------------------------------------------------
diff --git a/src/api/ddoc/render.rst b/src/api/ddoc/render.rst
index 887cda9..76d3896 100644
--- a/src/api/ddoc/render.rst
+++ b/src/api/ddoc/render.rst
@@ -90,7 +90,6 @@
:param func: Show function name
:param docid: Document ID
:>header ETag: Response signature
- :query boolean details: Indicates whether details should be included
:query string format: Format of the returned response.
Used by :js:func:`provides` function
:code 200: Request completed successfully
[35/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
minor spelling fixes in docs
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/c5a4c7fc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/c5a4c7fc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/c5a4c7fc
Branch: refs/heads/import-master
Commit: c5a4c7fc611ab62415f10f5a66142d7a2642db31
Parents: f5e1140
Author: Andy Wenk <an...@apache.org>
Authored: Thu Apr 24 20:37:16 2014 +0200
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Apr 24 21:03:34 2014 +0200
----------------------------------------------------------------------
src/replication/intro.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c5a4c7fc/src/replication/intro.rst
----------------------------------------------------------------------
diff --git a/src/replication/intro.rst b/src/replication/intro.rst
index ea4892d..ff002db 100644
--- a/src/replication/intro.rst
+++ b/src/replication/intro.rst
@@ -12,14 +12,14 @@
.. _replication/intro:
-Introduction Into Replications
-==============================
+Introduction to Replication
+===========================
One of CouchDB's strengths is the ability to synchronize two copies of the same
database. This enables users to distribute data across several nodes or
datacenters, but also to move data more closely to clients.
-Replication involves a source and a destination database, which can be one the
+Replication involves a source and a destination database, which can be on the
same or on different CouchDB instances. The aim of the replication is that at
the end of the process, all active documents on the source database are also in
the destination database and all documents that were deleted in the source
[09/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
some minor documentatiom fixes
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/32ff4aaf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/32ff4aaf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/32ff4aaf
Branch: refs/heads/import-master
Commit: 32ff4aaf340f2b95243f24b3614d6e5084ffbbae
Parents: 7ed3674
Author: Andy Wenk <an...@apache.org>
Authored: Fri Mar 21 00:22:06 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Fri Mar 21 00:22:06 2014 +0100
----------------------------------------------------------------------
src/intro/overview.rst | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/32ff4aaf/src/intro/overview.rst
----------------------------------------------------------------------
diff --git a/src/intro/overview.rst b/src/intro/overview.rst
index 4e3b72c..7804cf9 100644
--- a/src/intro/overview.rst
+++ b/src/intro/overview.rst
@@ -261,9 +261,9 @@ updates, ensuring security and data validation in a shared, distributed system.
Distributed Updates and Replication
===================================
-CouchDB is a peer-based distributed database system, it allows for users and
-servers to access and update the same shared data while disconnected and then
-bi-directionally replicate those changes later.
+CouchDB is a peer-based distributed database system. It allows users and servers
+to access and update the same shared data while disconnected. Those changes can
+then be replicated bi-directionally later.
The CouchDB document storage, view and security models are designed to work
together to make true bi-directional replication efficient and reliable.
[18/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
minor documentation fix
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/e7073ec1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/e7073ec1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/e7073ec1
Branch: refs/heads/import-master
Commit: e7073ec1a4aa9880577d1f5463668fa87da2c911
Parents: 72eaf48
Author: Andy Wenk <an...@apache.org>
Authored: Thu Mar 27 21:07:03 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Mar 27 21:07:03 2014 +0100
----------------------------------------------------------------------
src/install/freebsd.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/e7073ec1/src/install/freebsd.rst
----------------------------------------------------------------------
diff --git a/src/install/freebsd.rst b/src/install/freebsd.rst
index b82edd1..85b74b5 100644
--- a/src/install/freebsd.rst
+++ b/src/install/freebsd.rst
@@ -37,7 +37,7 @@ supported by the start script (defaults shown)::
couchdb_enablelogs="YES"
couchdb_user="couchdb"
-After enabling couchdb rc service use the following to start CouchDB::
+After enabling the couchdb rc service use the following command to start CouchDB::
/usr/local/etc/rc.d/couchdb start
[23/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Verify that auth-related properties are well-formed
Passing unexpected values to auth fields can result in server
issues. Notably, setting "iterations" to a string will cause an
infinite loop as the comparison 'when Iteration > Iterations' will
never evaluate to true.
The latest validate_doc_update prevents user docs with this problem
and administrators can deploy that check themselves (and only
administrators can edit design documents).
A server administrator can also insist on lower and upper bounds for
iteration count to reject weakly protected passwords and
resource-hungry passwords respectively.
COUCHDB-2221
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/9d61faff
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/9d61faff
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/9d61faff
Branch: refs/heads/import-master
Commit: 9d61faff2a31bcc39bb9009a6126ece300fff23e
Parents: 1d31c3a
Author: Robert Newson <rn...@apache.org>
Authored: Sun Apr 6 18:31:15 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Apr 6 22:09:54 2014 +0100
----------------------------------------------------------------------
src/config/auth.rst | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9d61faff/src/config/auth.rst
----------------------------------------------------------------------
diff --git a/src/config/auth.rst b/src/config/auth.rst
index 4127288..8311140 100644
--- a/src/config/auth.rst
+++ b/src/config/auth.rst
@@ -166,6 +166,30 @@ Authentication Configuration
[couch_httpd_auth]
iterations = 10000
+ .. config:option:: min_iterations :: Minimum PBKDF2 iterations count
+
+ .. versionadded:: 1.6
+
+ The minimum number of iterations allowed for passwords hashed by
+ the PBKDF2 algorithm. Any user with fewer iterations is forbidden.
+
+ ::
+
+ [couch_httpd_auth]
+ min_iterations = 100
+
+ .. config:option:: max_iterations :: Maximum PBKDF2 iterations count
+
+ .. versionadded:: 1.6
+
+ The maximum number of iterations allowed for passwords hashed by
+ the PBKDF2 algorithm. Any user with greater iterations is forbidden.
+
+ ::
+
+ [couch_httpd_auth]
+ max_iterations = 100000
+
.. config:option:: proxy_use_secret :: Force proxy auth use secret token
[03/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
```validate_doc_update``` moved from views to root
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/da348c90
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/da348c90
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/da348c90
Branch: refs/heads/import-master
Commit: da348c905c869aff1557209ac6986d989840223e
Parents: 2023ccb
Author: Anthony Ananich <an...@inpun.com>
Authored: Tue Feb 25 18:17:44 2014 +0200
Committer: Alexander Shorin <kx...@apache.org>
Committed: Tue Feb 25 20:22:20 2014 +0400
----------------------------------------------------------------------
src/query-server/javascript.rst | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/da348c90/src/query-server/javascript.rst
----------------------------------------------------------------------
diff --git a/src/query-server/javascript.rst b/src/query-server/javascript.rst
index 16590d6..386f9c5 100644
--- a/src/query-server/javascript.rst
+++ b/src/query-server/javascript.rst
@@ -273,12 +273,12 @@ The CommonJS module can be added to a design document, like so:
"views": {
"lib": {
"security": "function user_context(userctx, secobj) { ... }"
- },
- "validate_doc_update": "function(newdoc, olddoc, userctx, secobj) {
- user = require('lib/security').user(userctx, secobj);
- return user.is_admin();
- }"
+ }
},
+ "validate_doc_update": "function(newdoc, olddoc, userctx, secobj) {
+ user = require('lib/security').user(userctx, secobj);
+ return user.is_admin();
+ }"
"_id": "_design/test"
}
[10/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
fix wording in json-structure
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/5a4a2efc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/5a4a2efc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/5a4a2efc
Branch: refs/heads/import-master
Commit: 5a4a2efc4912ec6f4708918458746587fd3e33c0
Parents: 32ff4aa
Author: Andy Wenk <an...@nms.de>
Authored: Thu Jan 30 22:00:28 2014 +0100
Committer: Andy Wenk <an...@nms.de>
Committed: Fri Mar 21 22:54:29 2014 +0100
----------------------------------------------------------------------
src/json-structure.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/5a4a2efc/src/json-structure.rst
----------------------------------------------------------------------
diff --git a/src/json-structure.rst b/src/json-structure.rst
index ab3ae45..68137d2 100644
--- a/src/json-structure.rst
+++ b/src/json-structure.rst
@@ -481,10 +481,10 @@ Response object
+--------------------------------+---------------------------------------------+
.. warning::
- The ``body``, ``base64`` and ``json`` object keys overlapp each other
- where in the last one wins. Since most implementations of key-value objects do
- not preserve the key order, confusing situations can emerge. The same applies,
- when they are mixed. Try to use only one of them.
+ The ``body``, ``base64`` and ``json`` object keys are overlapping each other
+ where the last one wins. Since most realizations of key-value objects do
+ not preserve the key order or if they are mixed, confusing situations can
+ occure. Try to use only one of them.
.. note::
Any custom property makes CouchDB raise an internal exception.
[21/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Add What's New item about uuids.max_count option
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/3a9ac528
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/3a9ac528
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/3a9ac528
Branch: refs/heads/import-master
Commit: 3a9ac5289bf8877eb00f52c19e3cd7c3bd58c7e7
Parents: 10c1498
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Thu Mar 27 13:51:40 2014 +0100
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 1 19:35:20 2014 +0200
----------------------------------------------------------------------
src/whatsnew/1.5.rst | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/3a9ac528/src/whatsnew/1.5.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.5.rst b/src/whatsnew/1.5.rst
index 0672bc8..7f2d750 100644
--- a/src/whatsnew/1.5.rst
+++ b/src/whatsnew/1.5.rst
@@ -21,6 +21,15 @@
:depth: 1
:local:
+.. _release/1.5.1:
+
+Version 1.5.1
+=============
+
+* Add the ``max_count`` option (:ref:`config/uuids`) to allow rate-limiting
+ the amount of UUIDs that can be requested from the :ref:`api/server/uuids`
+ handler in a single request.
+
.. _release/1.5.0:
Version 1.5.0
[42/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Move Erlang 17 support to 1.6.0 release
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/9035fbec
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/9035fbec
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/9035fbec
Branch: refs/heads/import-master
Commit: 9035fbec50804b0186b2deaa7734612f623c814f
Parents: fc9d1bb
Author: Alexander Shorin <kx...@apache.org>
Authored: Mon May 5 20:23:48 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon May 5 22:02:09 2014 +0400
----------------------------------------------------------------------
build/Makefile.am | 3 ---
src/whatsnew/1.6.rst | 5 +----
src/whatsnew/1.7.rst | 42 ------------------------------------------
src/whatsnew/index.rst | 1 -
4 files changed, 1 insertion(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9035fbec/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index 58efee1..b3fba13 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -162,7 +162,6 @@ html_files = \
html/_sources/whatsnew/1.4.txt \
html/_sources/whatsnew/1.5.txt \
html/_sources/whatsnew/1.6.txt \
- html/_sources/whatsnew/1.7.txt \
html/_sources/whatsnew/index.txt \
html/_sources/about.txt \
html/_sources/contents.txt \
@@ -286,7 +285,6 @@ html_files = \
html/whatsnew/1.4.html \
html/whatsnew/1.5.html \
html/whatsnew/1.6.html \
- html/whatsnew/1.7.html \
html/whatsnew/index.html \
html/about.html \
html/config-ref.html \
@@ -436,7 +434,6 @@ src_files = \
../src/whatsnew/1.4.rst \
../src/whatsnew/1.5.rst \
../src/whatsnew/1.6.rst \
- ../src/whatsnew/1.7.rst \
../src/whatsnew/index.rst \
../src/about.rst \
../src/contents.rst \
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9035fbec/src/whatsnew/1.6.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.6.rst b/src/whatsnew/1.6.rst
index b1d9bc0..7c65af2 100644
--- a/src/whatsnew/1.6.rst
+++ b/src/whatsnew/1.6.rst
@@ -39,10 +39,7 @@ in case if you had used such handler.
Version 1.6.0
=============
-.. warning::
-
- This version is not released yet.
-
+* :issue:`2200`: support Erlang/OTP 17.0 :commit:`35e16032`
* Fauxton: many improvements in our experimental new user interface, including
switching the code editor from CodeMirror to Ace as well as better support
for various browsers.
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9035fbec/src/whatsnew/1.7.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.7.rst b/src/whatsnew/1.7.rst
deleted file mode 100644
index 69be11b..0000000
--- a/src/whatsnew/1.7.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-.. Licensed under the Apache License, Version 2.0 (the "License"); you may not
-.. use this file except in compliance with the License. You may obtain a copy of
-.. the License at
-..
-.. http://www.apache.org/licenses/LICENSE-2.0
-..
-.. Unless required by applicable law or agreed to in writing, software
-.. distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-.. WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-.. License for the specific language governing permissions and limitations under
-.. the License.
-
-
-.. _release/1.7.x:
-
-============
-1.7.x Branch
-============
-
-.. contents::
- :depth: 1
- :local:
-
-.. _release/1.7.x/upgrade:
-
-Upgrade Notes
-=============
-
-None.
-
-.. _release/1.7.0:
-
-Version 1.7.0
-=============
-
-.. warning::
-
- This version is not released yet.
-
-* Build System: :issue:`2200`: support Erlang/OTP 17.0
- :commit:`78603ad`
-
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9035fbec/src/whatsnew/index.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/index.rst b/src/whatsnew/index.rst
index 52c9317..800b9ee 100644
--- a/src/whatsnew/index.rst
+++ b/src/whatsnew/index.rst
@@ -19,7 +19,6 @@ Release History
.. toctree::
:glob:
- 1.7
1.6
1.5
1.4
[50/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
really fix typo
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/fe7f7bf2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/fe7f7bf2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/fe7f7bf2
Branch: refs/heads/import-master
Commit: fe7f7bf2ad400c417b3b64b03e438cfb96beefa1
Parents: f28ab4a
Author: Robert Newson <rn...@apache.org>
Authored: Thu Jul 10 09:15:52 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Jul 10 09:15:52 2014 +0100
----------------------------------------------------------------------
src/couchapp/views/intro.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/fe7f7bf2/src/couchapp/views/intro.rst
----------------------------------------------------------------------
diff --git a/src/couchapp/views/intro.rst b/src/couchapp/views/intro.rst
index f7d0738..5d588ed 100644
--- a/src/couchapp/views/intro.rst
+++ b/src/couchapp/views/intro.rst
@@ -378,7 +378,7 @@ B-trees are structured, we can cache the intermediate reduce results in the
non-leaf nodes of the tree, so reduce queries can be computed along arbitrary
key ranges in logarithmic time. See Figure 1, “Comments map function”.
-In the blog app, we use ``group_leve`` reduce queries to compute the count of
+In the blog app, we use ``group_level`` reduce queries to compute the count of
comments both on a per-post and total basis, achieved by querying the same view
index with different methods. With some array keys, and assuming each key has
the value ``1``:
[25/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Add license header for tracking.html
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/0f8038ed
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/0f8038ed
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/0f8038ed
Branch: refs/heads/import-master
Commit: 0f8038ed20430fb1bc62ae5709ac8d655c16a0c4
Parents: 5db4eed
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Apr 13 05:39:00 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Apr 13 05:39:00 2014 +0400
----------------------------------------------------------------------
templates/tracking.html | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/0f8038ed/templates/tracking.html
----------------------------------------------------------------------
diff --git a/templates/tracking.html b/templates/tracking.html
index e6d4037..b80e3c2 100644
--- a/templates/tracking.html
+++ b/templates/tracking.html
@@ -1,3 +1,18 @@
+<!--
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License. You may obtain a copy of the
+License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.
+
+-->
+
{% if not local %}
<script type="text/javascript">
var _gaq = _gaq || [];
[33/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
added a section on authorization to the security intro document
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/2f5f7dc3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/2f5f7dc3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/2f5f7dc3
Branch: refs/heads/import-master
Commit: 2f5f7dc38ea4b2c4471d88ae123d0fe06abf7f2e
Parents: 86ae5c8
Author: Paul Mietz Egli <pa...@obscure.com>
Authored: Wed Apr 16 13:17:24 2014 -0700
Committer: Paul Mietz Egli <pa...@obscure.com>
Committed: Wed Apr 16 13:17:24 2014 -0700
----------------------------------------------------------------------
src/intro/security.rst | 78 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/2f5f7dc3/src/intro/security.rst
----------------------------------------------------------------------
diff --git a/src/intro/security.rst b/src/intro/security.rst
index a57b1b7..77c95cb 100644
--- a/src/intro/security.rst
+++ b/src/intro/security.rst
@@ -523,3 +523,81 @@ Good news! Now we may read field ``name`` from *every user's document without
need to be an administrator*. That's important note: don't publish sensitive
information, especially without user's acknowledge - they may not like such
actions from your side.
+
+
+==============
+Authorization
+==============
+
+Now that you have a few users who can log in, you probably want to set up some
+restrictions on what actions they can perform based on their identity and their
+roles. Each database on a CouchDB server can contain its own set of
+authorization rules that specify which users are allowed to read and write
+documents, create design documents, and change certain database configuration
+parameters. The authorization rules are set up by a server admin and can be
+modified at any time.
+
+Database authorization rules assign a user into one of two classes:
+
+- `members`, who are allowed to read all documents and create and modify any
+ document except for design documents.
+- `admins`, who can read and write all types of documents, modify which users
+ are members or admins, and set certain per-database configuration options.
+
+Note that a database admin is not the same as a server admin -- the actions
+of a database admin are restricted to a specific database.
+
+When a database is first created, there are no members or admins. HTTP
+requests that have no authentication credentials or have credentials for a
+normal user are treated as members, and those with server admin credentials
+are treated as database admins. To change the default permissions, you must
+create a :ref:`_security <api/db/security>` document in the database::
+
+ > curl -X PUT http://localhost:5984/mydatabase/_security \
+ -u anna:secret \
+ -H "Content-Type: application/json" \
+ -d '{"admins": { "names": [], "roles": [] }, "members": { "names": ["jan"], "roles": [] } }'
+
+The HTTP request to create the `_security` document must contain the
+credentials of a server admin. CouchDB will respond with:
+
+.. code-block:: javascript
+
+ {"ok":true}
+
+The database is now secured against anonymous reads and writes::
+
+ > curl http://localhost:5984/mydatabase/
+
+.. code-block:: javascript
+
+ {"error":"unauthorized","reason":"You are not authorized to access this db."}
+
+You declared user "jan" as a member in this database, so he is able to read and
+write normal documents::
+
+ > curl -u jan:apple http://localhost:5984/mydatabase/
+
+.. code-block:: javascript
+
+ {"db_name":"mydatabase","doc_count":1,"doc_del_count":0,"update_seq":3,"purge_seq":0,
+ "compact_running":false,"disk_size":12376,"data_size":272,"instance_start_time":"1397672867731570",
+ "disk_format_version":6,"committed_update_seq":3}
+
+If Jan attempted to create a design doc, however, CouchDB would return a
+401 Unauthorized error because the username "jan" is not in the list of
+admin names and the `/_users/org.couchdb.user:jan` document doesn't contain
+a role that matches any of the declared admin roles. If you want to promote
+Jan to an admin, you can update the security document to add `"jan"` to
+the `names` array under `admin`. Keeping track of individual database
+admin usernames is tedious, though, so you would likely prefer to create a
+database admin role and assign that role to the `org.couchdb.user:jan` user
+document::
+
+ > curl -X PUT http://localhost:5984/mydatabase/_security \
+ -u anna:secret \
+ -H "Content-Type: application/json" \
+ -d '{"admins": { "names": [], "roles": ["mydatabase_admin"] }, "members": { "names": [], "roles": [] } }'
+
+See the :ref:`_security document reference page <api/db/security>` for
+additional details about specifying database members and admins.
[26/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Add CVE-2014-2668 warning to old release branches
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/d20f569d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/d20f569d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/d20f569d
Branch: refs/heads/import-master
Commit: d20f569d5738f00a66771d3bc4d2420b4df62b47
Parents: 0f8038e
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Apr 15 09:12:34 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:28:18 2014 +0200
----------------------------------------------------------------------
src/whatsnew/1.3.rst | 4 ++++
src/whatsnew/1.4.rst | 4 ++++
src/whatsnew/1.5.rst | 7 ++++++-
3 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d20f569d/src/whatsnew/1.3.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.3.rst b/src/whatsnew/1.3.rst
index 7e69785..3f19f56 100644
--- a/src/whatsnew/1.3.rst
+++ b/src/whatsnew/1.3.rst
@@ -21,6 +21,10 @@
:depth: 1
:local:
+.. warning::
+
+ :ref:`release/1.3.x` is affected by the issue described in :ref:`cve/2014-2668`.
+ Upgrading to a more recent release is strongly recommended.
.. _release/1.3.x/upgrade:
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d20f569d/src/whatsnew/1.4.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.4.rst b/src/whatsnew/1.4.rst
index cf10bef..65925e1 100644
--- a/src/whatsnew/1.4.rst
+++ b/src/whatsnew/1.4.rst
@@ -21,6 +21,10 @@
:depth: 1
:local:
+.. warning::
+
+ :ref:`release/1.4.x` is affected by the issue described in :ref:`cve/2014-2668`.
+ Upgrading to a more recent release is strongly recommended.
.. _release/1.4.x/upgrade:
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d20f569d/src/whatsnew/1.5.rst
----------------------------------------------------------------------
diff --git a/src/whatsnew/1.5.rst b/src/whatsnew/1.5.rst
index 7f2d750..1b7539a 100644
--- a/src/whatsnew/1.5.rst
+++ b/src/whatsnew/1.5.rst
@@ -21,6 +21,11 @@
:depth: 1
:local:
+.. warning::
+
+ :ref:`release/1.5.1` contains important security fixes. Previous `1.5.x`
+ releases are not recommended for regular usage.
+
.. _release/1.5.1:
Version 1.5.1
@@ -28,7 +33,7 @@ Version 1.5.1
* Add the ``max_count`` option (:ref:`config/uuids`) to allow rate-limiting
the amount of UUIDs that can be requested from the :ref:`api/server/uuids`
- handler in a single request.
+ handler in a single request (:ref:`CVE 2014-2668 <cve/2014-2668>`).
.. _release/1.5.0:
[39/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Remove "details" query parameter from show functions API. One more time
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/9d8ed08b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/9d8ed08b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/9d8ed08b
Branch: refs/heads/import-master
Commit: 9d8ed08ba682dc5db9ae7eb72fbb3db7d1a23f0f
Parents: c064abc
Author: Alexander Shorin <kx...@apache.org>
Authored: Sun Apr 27 14:28:41 2014 +0400
Committer: Alexander Shorin <kx...@apache.org>
Committed: Sun Apr 27 14:28:41 2014 +0400
----------------------------------------------------------------------
src/api/ddoc/render.rst | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/9d8ed08b/src/api/ddoc/render.rst
----------------------------------------------------------------------
diff --git a/src/api/ddoc/render.rst b/src/api/ddoc/render.rst
index 76d3896..84c25c2 100644
--- a/src/api/ddoc/render.rst
+++ b/src/api/ddoc/render.rst
@@ -30,7 +30,6 @@
:param ddoc: Design document name
:param func: Show function name
:>header ETag: Response signature
- :query boolean details: Indicates whether details should be included
:query string format: Format of the returned response.
Used by :js:func:`provides` function
:code 200: Request completed successfully
[08/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
update documentation
explain better what happens with the view index when documents
in a view are being processed
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/7ed3674d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/7ed3674d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/7ed3674d
Branch: refs/heads/import-master
Commit: 7ed3674d5a2f41084c2b36f7372073c4f194be78
Parents: 091983c
Author: Andy Wenk <an...@apache.org>
Authored: Thu Mar 20 23:52:26 2014 +0100
Committer: Andy Wenk <an...@apache.org>
Committed: Thu Mar 20 23:52:26 2014 +0100
----------------------------------------------------------------------
src/intro/overview.rst | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/7ed3674d/src/intro/overview.rst
----------------------------------------------------------------------
diff --git a/src/intro/overview.rst b/src/intro/overview.rst
index f94d656..4e3b72c 100644
--- a/src/intro/overview.rst
+++ b/src/intro/overview.rst
@@ -198,9 +198,10 @@ simultaneous client readers, who can read and query the view while the index
is concurrently being refreshed for other clients without causing problems
for the readers.
-As documents are examined, their previous row values are removed from the
-view indexes, if they exist. If the document is selected by a view function,
-the function results are inserted into the view as a new row.
+As documents are processed by the view engine through your 'map' and 'reduce'
+functions, their previous row values are removed from the view indexes, if
+they exist. If the document is selected by a view function, the function results
+are inserted into the view as a new row.
When view index changes are written to disk, the updates are always appended
at the end of the file, serving to both reduce disk head seek times during
[30/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Sometimes one extra character makes all the difference
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/d43b2020
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/d43b2020
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/d43b2020
Branch: refs/heads/import-master
Commit: d43b2020b2e6ede5ba65c04299441c2f91d6aad2
Parents: e352fab
Author: Dirkjan Ochtman <di...@ochtman.nl>
Authored: Tue Apr 15 11:04:38 2014 +0200
Committer: Dirkjan Ochtman <di...@ochtman.nl>
Committed: Tue Apr 15 22:30:49 2014 +0200
----------------------------------------------------------------------
build/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/d43b2020/build/Makefile.am
----------------------------------------------------------------------
diff --git a/build/Makefile.am b/build/Makefile.am
index 92ec2ff..7b95d0d 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -450,7 +450,7 @@ src_files_html = \
../templates/layout.html \
../templates/help.html \
../templates/searchbox.html \
- ../templates/tracing.html \
+ ../templates/tracking.html \
../templates/utilities.html
sphinx_extensions = \
[06/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Quick doc edit for clarity.
This closes #170
Signed-off-by: Alexander Shorin <kx...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/7592a710
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/7592a710
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/7592a710
Branch: refs/heads/import-master
Commit: 7592a71084a9a5040d76a922b53e1e9a3a204417
Parents: 858a09b
Author: Michael Wheeler <mp...@gmail.com>
Authored: Fri Mar 7 11:26:54 2014 -0500
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Mar 10 22:51:07 2014 +0400
----------------------------------------------------------------------
src/api/ddoc/common.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/7592a710/src/api/ddoc/common.rst
----------------------------------------------------------------------
diff --git a/src/api/ddoc/common.rst b/src/api/ddoc/common.rst
index 8ff571b..9f76e3a 100644
--- a/src/api/ddoc/common.rst
+++ b/src/api/ddoc/common.rst
@@ -46,7 +46,7 @@
a new revision of the existing design document.
The design documents have some agreement upon their fields and structure.
- Currently it is the next:
+ Currently it is the following:
* **language** (*string*): Defines :ref:`Query Server <query-server>`
:config:section:`key <query_servers>` to process design document functions
[47/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Add Experimental Content-Security-Policy-Support (CSP) for Fauxton
Like every web application, Fauxton is vulnerable against XSS and
CSP is a technology that tries to help against that.
The patch makes it possible to enable CSP for the /_utils path and
allows configuration of the sent header.
The default setting for the value of the header breaks the old
Futon, when CSP is enabled there. The old Futon has alot of
inline-JavaScript which is not allowed in the setting I have
chosen as default.
For development, the header is also sent from the Node server
which launches Fauxton in dev-mode.
People can enable the feature by setting enable = true in the
section [csp] of their configs
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/c89106ed
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/c89106ed
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/c89106ed
Branch: refs/heads/import-master
Commit: c89106edf7cd358e0779ac216b7d1318a8a6b914
Parents: 679af60
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sat May 17 18:37:30 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Mon Jun 9 19:09:06 2014 +0200
----------------------------------------------------------------------
src/config/misc.rst | 24 ++++++++++++++++++++++++
src/experimental.rst | 15 +++++++++++++++
2 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c89106ed/src/config/misc.rst
----------------------------------------------------------------------
diff --git a/src/config/misc.rst b/src/config/misc.rst
index 58d079c..e97575a 100644
--- a/src/config/misc.rst
+++ b/src/config/misc.rst
@@ -232,3 +232,27 @@ Vendor information
[vendor]
name = The Apache Software Foundation
version = 1.5.0
+
+.. _config/csp:
+
+Content-Security-Policy
+=======================
+
+.. config:section:: csp :: Content-Security-Policy
+
+ Experimental support of CSP Headers for ``/_utils`` (Fauxton).
+
+ .. config:option:: enable
+
+ Enable the sending of the Header ``Content-Security-Policy``::
+
+ [csp]
+ enable = true
+
+
+ .. config:option:: header_value
+
+ You can change the default value for the Header which is sent::
+
+ [csp]
+ header_value = default-src 'self'; img-src *; font-src *;
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/c89106ed/src/experimental.rst
----------------------------------------------------------------------
diff --git a/src/experimental.rst b/src/experimental.rst
index 3157f53..fae925c 100644
--- a/src/experimental.rst
+++ b/src/experimental.rst
@@ -81,3 +81,18 @@ Plugins
See `src/couch_plugins/README.md`.
+Content-Security-Policy (CSP) Header Support for /_utils (Fauxton)
+==================================================================
+
+This will just work with Fauxton, and not Futon. You can enable it
+in your config: you can enable the feature in general and change
+the default header that is sent for everything in /_utils.
+
+ .. code-block:: ini
+
+ [csp]
+ enable = true
+
+Then restart CouchDB.
+
+Have fun!
[44/50] documentation commit: updated refs/heads/import-master to
fe7f7bf
Posted by rn...@apache.org.
Support `fail_if_no_peer_cert` ssl option
Project: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/commit/eb3b599b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/tree/eb3b599b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-documentation/diff/eb3b599b
Branch: refs/heads/import-master
Commit: eb3b599b16478416c01bd36be15b6e6eb1e5c318
Parents: 867bd1a
Author: Klaus Trainer <kl...@apache.org>
Authored: Mon May 12 01:43:05 2014 +0200
Committer: Klaus Trainer <kl...@apache.org>
Committed: Wed May 14 16:32:59 2014 +0200
----------------------------------------------------------------------
src/config/http.rst | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-documentation/blob/eb3b599b/src/config/http.rst
----------------------------------------------------------------------
diff --git a/src/config/http.rst b/src/config/http.rst
index dfe8d5a..f4fade1 100644
--- a/src/config/http.rst
+++ b/src/config/http.rst
@@ -387,6 +387,17 @@ Secure Socket Level Options
[ssl]
verify_ssl_certificates = false
+ .. config:option:: fail_if_no_peer_cert :: Require presence of client certificate if certificate verification is enabled
+
+ Set to `true` to terminate the TLS/SSL handshake with a
+ `handshake_failure` alert message if the client does not send a
+ certificate. Only used if `verify_ssl_certificates` is `true`. If
+ set to `false` it will only fail if the client sends an invalid
+ certificate (an empty certificate is considered valid)::
+
+ [ssl]
+ fail_if_no_peer_cert = false
+
.. config:option:: secure_renegotiate :: Enable secure renegotiation
Set to `true` to reject renegotiation attempt that does not live up to RFC 5746::