[couchdb] annotated tag show deleted (was 46048dc)

[randall]

This is an automated email from the ASF dual-hosted git repository.

randall pushed a change to annotated tag show
in repository https://gitbox.apache.org/repos/asf/couchdb.git.

*** WARNING: tag show was deleted! ***

   tag was  46048dc

The revisions that were on this annotated tag are still contained in
other references; therefore, this change does not discard any commits
from the repository.

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <commits@couchdb.apache.org>'].

[couchdb] branch master updated: Re-enable js eval view sandbox test

[randall]

This is an automated email from the ASF dual-hosted git repository.

randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git

The following commit(s) were added to refs/heads/master by this push:
   new  153f40f   Re-enable js eval view sandbox test
153f40f is described below

commit 153f40fb6ad4c33aa5cbdf12b12944929a4cf1ab
Author: Randall Leeds <rand...@apache.org>
AuthorDate: Mon May 15 13:33:33 2017 -0700

Re-enable js eval view sandbox test
---
 test/javascript/tests/view_sandboxing.js | 39 ++--
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/test/javascript/tests/view_sandboxing.js 
b/test/javascript/tests/view_sandboxing.js
index 171777b..9e7fa86 100644
--- a/test/javascript/tests/view_sandboxing.js
+++ b/test/javascript/tests/view_sandboxing.js
@@ -145,10 +145,12 @@ couchTests.view_sandboxing = function(debug) {
   }
 */
 
+  // cleanup
+  db.deleteDb();
+
   // test that runtime code evaluation can be prevented
-  console.log('TODO: config port not available on cluster');
-  /*var couchjs_command_xhr = CouchDB.request(
-"GET", "/_config/query_servers/javascript");
+  var couchjs_command_xhr = CouchDB.request(
+"GET", "_node/node1@127.0.0.1/_config/query_servers/javascript");
 
   var couchjs_command = JSON.parse(couchjs_command_xhr.responseText);
   var couchjs_command_args = couchjs_command.match(/\S+|"(?:\\"|[^"])+"/g);
@@ -161,31 +163,24 @@ couchTests.view_sandboxing = function(debug) {
   key: "javascript",
   value: new_couchjs_command}],
 function () {
-  var ddoc = {
-_id: "_design/foobar",
-language: "javascript",
-views: {
-  view: {
-map:
-(function(doc) {
-  var glob = emit.constructor('return this')();
-  emit(doc._id, null);
-}).toString()
-  }
-}
-  };
-
-  db.deleteDb();
+  CouchDB.request("POST", "_reload_query_servers");
+
+  db_name = get_random_db_name();
+  db = new CouchDB(db_name, {"X-Couch-Full-Commit":"false"});
   db.createDb();
-  T(db.save(ddoc).ok);
 
+  var doc = {integer: 1, string: "1", array: [1, 2, 3]};
   T(db.save(doc).ok);
-  var results = db.view(
-"foobar/view", {bypass_cache: Math.round(Math.random() * 1000)});
+
+  var results = db.query(function(doc) {
+  var glob = emit.constructor('return this')();
+  emit(doc._id, null);
+  });
 
   TEquals(0, results.rows.length);
-});*/
+});
 
   // cleanup
+  CouchDB.request("POST", "_reload_query_servers");
   db.deleteDb();
 };

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <commits@couchdb.apache.org>'].

[couchdb] annotated tag show updated (9428661 -> 46048dc)

[randall]

This is an automated email from the ASF dual-hosted git repository.

randall pushed a change to annotated tag show
in repository https://gitbox.apache.org/repos/asf/couchdb.git.

*** WARNING: tag show was modified! ***

  from  9428661   (commit)
to  46048dc   (tag)
   tagging  94286611038e661487382ed834103853e88fdf69 (commit)
 tagged by  Paul Joseph Davis
on  Thu Jan 20 01:19:24 2011 +

- Log -
1.0.2
---


No new revisions were added by this update.

Summary of changes:

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <commits@couchdb.apache.org>'].

couchdb commit: updated refs/heads/master to 8d37ee3

[randall]

Repository: couchdb
Updated Branches:
  refs/heads/master adf9ae25c - 8d37ee36f


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/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8d37ee36
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8d37ee36
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8d37ee36

Branch: refs/heads/master
Commit: 8d37ee36f23e5aea09f1fd17fd783b74a45d2e7e
Parents: adf9ae2
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 9 20:40:55 2014 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Sun Mar 9 20:43:37 2014 -0700

--
 share/doc/src/couchapp/views/pagination.rst | 48 
 1 file changed, 15 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/8d37ee36/share/doc/src/couchapp/views/pagination.rst
--
diff --git a/share/doc/src/couchapp/views/pagination.rst 
b/share/doc/src/couchapp/views/pagination.rst
index b40f988..6f3b34e 100644
--- a/share/doc/src/couchapp/views/pagination.rst
+++ b/share/doc/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 1 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.
 

[1/4] git commit: updated refs/heads/1.3.x to 1421a22

[randall]

Updated Branches:
  refs/heads/1.3.x 7720cecb2 - 1421a2246
  refs/heads/master b1c87da66 - 3357462ad


[couchjs] make stack size option effective

The previous way this was coded changes the chunk size that is used
whenever the stack grows but does not change the maximum memory
allowed by the runtime.

Closes COUCHDB-1792


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

Branch: refs/heads/1.3.x
Commit: cfaa66cd6f5590bc317cf063112bb27e23ee06d8
Parents: 7720cec
Author: Randall Leeds rand...@apache.org
Authored: Tue May 14 17:34:40 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Tue May 28 00:41:13 2013 -0700

--
 src/couchdb/priv/couch_js/help.h  |4 ++--
 src/couchdb/priv/couch_js/sm170.c |6 +++---
 src/couchdb/priv/couch_js/sm180.c |6 +++---
 src/couchdb/priv/couch_js/sm185.c |4 ++--
 src/couchdb/priv/couch_js/util.c  |2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/help.h
--
diff --git a/src/couchdb/priv/couch_js/help.h b/src/couchdb/priv/couch_js/help.h
index b31bb8c..f4ddb24 100644
--- a/src/couchdb/priv/couch_js/help.h
+++ b/src/couchdb/priv/couch_js/help.h
@@ -48,8 +48,8 @@ static const char USAGE_TEMPLATE[] =
   -V  display version information and exit\n
   -H  enable %s cURL bindings (only avaiable\n
   if package was built with cURL available)\n
-  -S SIZE specify that the interpreter should set the\n
-  stack quota for JS contexts to SIZE bytes\n
+  -S SIZE specify that the runtime should allow at\n
+  most SIZE bytes of memory to be allocated\n
   -u FILE path to a .uri file containing the address\n
   (or addresses) of one or more servers\n
 \n

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/sm170.c
--
diff --git a/src/couchdb/priv/couch_js/sm170.c 
b/src/couchdb/priv/couch_js/sm170.c
index 4a18d8f..51e4f4d 100644
--- a/src/couchdb/priv/couch_js/sm170.c
+++ b/src/couchdb/priv/couch_js/sm170.c
@@ -313,12 +313,12 @@ main(int argc, const char* argv[])
 int i;
 
 couch_args* args = couch_parse_args(argc, argv);
-
-rt = JS_NewRuntime(64L * 1024L * 1024L);
+
+rt = JS_NewRuntime(args-stack_size);
 if(rt == NULL)
 return 1;
 
-cx = JS_NewContext(rt, args-stack_size);
+cx = JS_NewContext(rt, 8L * 1024L);
 if(cx == NULL)
 return 1;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/sm180.c
--
diff --git a/src/couchdb/priv/couch_js/sm180.c 
b/src/couchdb/priv/couch_js/sm180.c
index 9ffd1df..5fb8ce0 100644
--- a/src/couchdb/priv/couch_js/sm180.c
+++ b/src/couchdb/priv/couch_js/sm180.c
@@ -322,12 +322,12 @@ main(int argc, const char* argv[])
 int i;
 
 couch_args* args = couch_parse_args(argc, argv);
-
-rt = JS_NewRuntime(64L * 1024L * 1024L);
+
+rt = JS_NewRuntime(args-stack_size);
 if(rt == NULL)
 return 1;
 
-cx = JS_NewContext(rt, args-stack_size);
+cx = JS_NewContext(rt, 8L * 1024L);
 if(cx == NULL)
 return 1;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/sm185.c
--
diff --git a/src/couchdb/priv/couch_js/sm185.c 
b/src/couchdb/priv/couch_js/sm185.c
index bfee023..c378d4a 100644
--- a/src/couchdb/priv/couch_js/sm185.c
+++ b/src/couchdb/priv/couch_js/sm185.c
@@ -335,11 +335,11 @@ main(int argc, const char* argv[])
 
 couch_args* args = couch_parse_args(argc, argv);
 
-rt = JS_NewRuntime(64L * 1024L * 1024L);
+rt = JS_NewRuntime(args-stack_size);
 if(rt == NULL)
 return 1;
 
-cx = JS_NewContext(rt, args-stack_size);
+cx = JS_NewContext(rt, 8L * 1024L);
 if(cx == NULL)
 return 1;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/util.c
--
diff --git a/src/couchdb/priv/couch_js/util.c b/src/couchdb/priv/couch_js/util.c
index 5c88402..b4700de 100644
--- a/src/couchdb/priv/couch_js/util.c
+++ b/src/couchdb/priv/couch_js/util.c
@@ -77,7 +77,7 @@ couch_parse_args(int argc, const char* argv[])
 return NULL;
 
 memset(args, '\0', sizeof(couch_args));
-args

[4/4] git commit: updated refs/heads/master to 3357462

[randall]

Update NEWS and CHANGES w 1.3.1 entries


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

Branch: refs/heads/master
Commit: 3357462ad3841afbd0df90f606f9bc915439fd30
Parents: b1c87da
Author: Randall Leeds rand...@apache.org
Authored: Tue May 28 00:46:56 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Tue May 28 00:53:18 2013 -0700

--
 CHANGES |   19 +++
 NEWS|6 ++
 2 files changed, 25 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/3357462a/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 5d5e52b..578efaa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,25 @@ Apache CouchDB CHANGES
 #
 # This version has not been released yet.
 
+# Replicator:
+
+#  * Tolerate missing source and target fields in _replicator docs
+  (COUCHDB-1788).
+
+# Log System:
+
+#  * Don't log about missing .compact files.
+#  * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+
+# View Server:
+
+#  * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
+
+# Misc:
+
+#  * Improve documentation: better structure, improve language, less 
duplication.
+#  * Improvements to test suite.
+
 Version 1.3.0
 -
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/3357462a/NEWS
--
diff --git a/NEWS b/NEWS
index 6ed3f20..efa79aa 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,12 @@ Each release section notes when backwards incompatible 
changes have been made.
 #
 # This version has not been released yet.
 
+#  * Tolerate missing source and target fields in _replicator docs.
+#  * Don't log about missing .compact files.
+#  * Fix bug in WARN level logging from 1.3.0.
+#  * Improve documentation: better structure, improve language, less 
duplication.
+#  * Improvements to test suite.
+
 Version 1.3.0
 -
 

[2/4] git commit: updated refs/heads/1.3.x to 1421a22

[randall]

Update CHANGES with bug numbers and add 1792


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

Branch: refs/heads/1.3.x
Commit: 62cc707e5121a947643f262f8103cc01c6119430
Parents: cfaa66c
Author: Randall Leeds rand...@apache.org
Authored: Tue May 28 00:46:56 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Tue May 28 00:46:56 2013 -0700

--
 CHANGES |9 +++--
 1 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/62cc707e/CHANGES
--
diff --git a/CHANGES b/CHANGES
index f422f89..3ecd19c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,12 +8,17 @@ This version has not been released yet.
 
 Replicator:
 
-* Tolerate missing source and target fields in _replicator docs.
+* Tolerate missing source and target fields in _replicator docs
+ (COUCHDB-1788).
 
 Log System:
 
 * Don't log about missing .compact files.
-* Fix bug in WARN level logging from 1.3.0.
+* Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+
+View Server:
+
+* Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
 
 Misc:
 

[3/4] git commit: updated refs/heads/1.3.x to 1421a22

[randall]

match indent in NEWS/CHANGES with older releases


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

Branch: refs/heads/1.3.x
Commit: 1421a224672d59c2eee1780c8cba11693e6b3abb
Parents: 62cc707
Author: Randall Leeds rand...@apache.org
Authored: Tue May 28 00:47:54 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Tue May 28 00:48:22 2013 -0700

--
 CHANGES |   14 +++---
 NEWS|   10 +-
 2 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1421a224/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 3ecd19c..8057814 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,22 +8,22 @@ This version has not been released yet.
 
 Replicator:
 
-* Tolerate missing source and target fields in _replicator docs
- (COUCHDB-1788).
+ * Tolerate missing source and target fields in _replicator docs
+  (COUCHDB-1788).
 
 Log System:
 
-* Don't log about missing .compact files.
-* Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
 
 View Server:
 
-* Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
+ * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
 
 Misc:
 
-* Improve documentation: better structure, improve language, less duplication.
-* Improvements to test suite.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite.
 
 Version 1.3.0
 -

http://git-wip-us.apache.org/repos/asf/couchdb/blob/1421a224/NEWS
--
diff --git a/NEWS b/NEWS
index 4a05320..486daf0 100644
--- a/NEWS
+++ b/NEWS
@@ -10,11 +10,11 @@ Each release section notes when backwards incompatible 
changes have been made.
 Version 1.3.1
 -
 
-* Tolerate missing source and target fields in _replicator docs.
-* Don't log about missing .compact files.
-* Fix bug in WARN level logging from 1.3.0.
-* Improve documentation: better structure, improve language, less duplication.
-* Improvements to test suite.
+ * Tolerate missing source and target fields in _replicator docs.
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite.
 
 Version 1.3.0
 -

git commit: updated refs/heads/master to 501459c

[randall]

Updated Branches:
  refs/heads/master a71fc206d - 501459c8b


[couchjs] make stack size option effective

The previous way this was coded changes the chunk size that is used
whenever the stack grows but does not change the maximum memory
allowed by the runtime.

Closes COUCHDB-1792


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

Branch: refs/heads/master
Commit: 501459c8b70efb814f5eef131201f7954781af1d
Parents: a71fc20
Author: Randall Leeds rand...@apache.org
Authored: Tue May 14 17:34:40 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Wed May 15 15:16:39 2013 -0700

--
 src/couchdb/priv/couch_js/help.h  |4 ++--
 src/couchdb/priv/couch_js/sm170.c |6 +++---
 src/couchdb/priv/couch_js/sm180.c |6 +++---
 src/couchdb/priv/couch_js/sm185.c |4 ++--
 src/couchdb/priv/couch_js/util.c  |2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/501459c8/src/couchdb/priv/couch_js/help.h
--
diff --git a/src/couchdb/priv/couch_js/help.h b/src/couchdb/priv/couch_js/help.h
index b31bb8c..f4ddb24 100644
--- a/src/couchdb/priv/couch_js/help.h
+++ b/src/couchdb/priv/couch_js/help.h
@@ -48,8 +48,8 @@ static const char USAGE_TEMPLATE[] =
   -V  display version information and exit\n
   -H  enable %s cURL bindings (only avaiable\n
   if package was built with cURL available)\n
-  -S SIZE specify that the interpreter should set the\n
-  stack quota for JS contexts to SIZE bytes\n
+  -S SIZE specify that the runtime should allow at\n
+  most SIZE bytes of memory to be allocated\n
   -u FILE path to a .uri file containing the address\n
   (or addresses) of one or more servers\n
 \n

http://git-wip-us.apache.org/repos/asf/couchdb/blob/501459c8/src/couchdb/priv/couch_js/sm170.c
--
diff --git a/src/couchdb/priv/couch_js/sm170.c 
b/src/couchdb/priv/couch_js/sm170.c
index 4a18d8f..51e4f4d 100644
--- a/src/couchdb/priv/couch_js/sm170.c
+++ b/src/couchdb/priv/couch_js/sm170.c
@@ -313,12 +313,12 @@ main(int argc, const char* argv[])
 int i;
 
 couch_args* args = couch_parse_args(argc, argv);
-
-rt = JS_NewRuntime(64L * 1024L * 1024L);
+
+rt = JS_NewRuntime(args-stack_size);
 if(rt == NULL)
 return 1;
 
-cx = JS_NewContext(rt, args-stack_size);
+cx = JS_NewContext(rt, 8L * 1024L);
 if(cx == NULL)
 return 1;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/501459c8/src/couchdb/priv/couch_js/sm180.c
--
diff --git a/src/couchdb/priv/couch_js/sm180.c 
b/src/couchdb/priv/couch_js/sm180.c
index 9ffd1df..5fb8ce0 100644
--- a/src/couchdb/priv/couch_js/sm180.c
+++ b/src/couchdb/priv/couch_js/sm180.c
@@ -322,12 +322,12 @@ main(int argc, const char* argv[])
 int i;
 
 couch_args* args = couch_parse_args(argc, argv);
-
-rt = JS_NewRuntime(64L * 1024L * 1024L);
+
+rt = JS_NewRuntime(args-stack_size);
 if(rt == NULL)
 return 1;
 
-cx = JS_NewContext(rt, args-stack_size);
+cx = JS_NewContext(rt, 8L * 1024L);
 if(cx == NULL)
 return 1;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/501459c8/src/couchdb/priv/couch_js/sm185.c
--
diff --git a/src/couchdb/priv/couch_js/sm185.c 
b/src/couchdb/priv/couch_js/sm185.c
index bfee023..c378d4a 100644
--- a/src/couchdb/priv/couch_js/sm185.c
+++ b/src/couchdb/priv/couch_js/sm185.c
@@ -335,11 +335,11 @@ main(int argc, const char* argv[])
 
 couch_args* args = couch_parse_args(argc, argv);
 
-rt = JS_NewRuntime(64L * 1024L * 1024L);
+rt = JS_NewRuntime(args-stack_size);
 if(rt == NULL)
 return 1;
 
-cx = JS_NewContext(rt, args-stack_size);
+cx = JS_NewContext(rt, 8L * 1024L);
 if(cx == NULL)
 return 1;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/501459c8/src/couchdb/priv/couch_js/util.c
--
diff --git a/src/couchdb/priv/couch_js/util.c b/src/couchdb/priv/couch_js/util.c
index 5c88402..b4700de 100644
--- a/src/couchdb/priv/couch_js/util.c
+++ b/src/couchdb/priv/couch_js/util.c
@@ -77,7 +77,7 @@ couch_parse_args(int argc, const char* argv[])
 return NULL;
 
 memset(args, '\0', sizeof(couch_args));
-args-stack_size = 8L * 1024L;
+args

[3/3] git commit: updated refs/heads/master to 94b402d

[randall]

remove bogus NEWS entry


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

Branch: refs/heads/master
Commit: 94b402d94f39fae64580c061386c744a57f45c16
Parents: cc7482e
Author: Randall Leeds rand...@apache.org
Authored: Mon May 13 16:33:49 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Mon May 13 16:35:04 2013 -0700

--
 NEWS |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/94b402d9/NEWS
--
diff --git a/NEWS b/NEWS
index b5a006d..6ed3f20 100644
--- a/NEWS
+++ b/NEWS
@@ -37,7 +37,6 @@ Version 1.3.0
  * Added utc_id UUID algorithm.
  * Encode database name during URL rewriting.
  * Include user name in show/list ETags.
- * Per module log levels.
  * Server-wide UUID in some replication ids.
  * E4X support in views is now deprecated and will be removed in a future
version.

[2/3] git commit: updated refs/heads/1.3.x to 7308432

[randall]

remove bogus NEWS entry


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

Branch: refs/heads/1.3.x
Commit: 7308432ab4bc189b2bc44e63f6383ff80c47d17d
Parents: a1a98c0
Author: Randall Leeds rand...@apache.org
Authored: Mon May 13 16:33:49 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Mon May 13 16:34:24 2013 -0700

--
 NEWS |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7308432a/NEWS
--
diff --git a/NEWS b/NEWS
index 4057da8..9fbdd54 100644
--- a/NEWS
+++ b/NEWS
@@ -28,7 +28,6 @@ Version 1.3.0
  * Added utc_id UUID algorithm.
  * Encode database name during URL rewriting.
  * Include user name in show/list ETags.
- * Per module log levels.
  * Server-wide UUID in some replication ids.
  * E4X support in views is now deprecated and will be removed in a future
version.

[1/3] git commit: updated refs/heads/1.3.x to 7308432

[randall]

Updated Branches:
  refs/heads/1.3.x 869f42e2d - 7308432ab
  refs/heads/master cc7482ec9 - 94b402d94


Fix bad merge of WARN level logging

Patch provided by Christopher Bonhage

Fixes COUCHDB-1794


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

Branch: refs/heads/1.3.x
Commit: a1a98c0346ebb1780be02eeea7981d9851cf68d5
Parents: 869f42e
Author: Randall Leeds rand...@apache.org
Authored: Mon May 13 16:32:48 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Mon May 13 16:34:10 2013 -0700

--
 src/couchdb/couch_db.hrl |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1a98c03/src/couchdb/couch_db.hrl
--
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl
index 863301b..95f617d 100644
--- a/src/couchdb/couch_db.hrl
+++ b/src/couchdb/couch_db.hrl
@@ -53,7 +53,7 @@
 end).
 
 -define(LOG_WARN(Format, Args),
-case couch_log:warn_on(?MODULE) of
+case couch_log:warn_on() of
 true -
 couch_log:warn(Format, Args);
 false - ok

git commit: add pbkdf2 iterations config to docs

[randall]

Updated Branches:
  refs/heads/master 2cc063040 - 7c0beca00


add pbkdf2 iterations config to docs


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

Branch: refs/heads/master
Commit: 7c0beca002a9c2fce33d187065a24073921ea997
Parents: 2cc0630
Author: Randall Leeds rand...@apache.org
Authored: Wed Mar 13 13:57:27 2013 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Wed Mar 13 13:57:27 2013 -0700

--
 share/doc/src/config_reference.rst |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7c0beca0/share/doc/src/config_reference.rst
--
diff --git a/share/doc/src/config_reference.rst 
b/share/doc/src/config_reference.rst
index 7ae761a..d73d14b 100644
--- a/share/doc/src/config_reference.rst
+++ b/share/doc/src/config_reference.rst
@@ -149,6 +149,8 @@ couch_httpd_auth Configuration Options
 
+--+---+
 | timeout  | timeout   
|
 
+--+---+
+| iterations   | Password key derivation iterations
|
++--+---+
 
 httpd Configuration Options
 ---

git commit: (COUCHDB-1305) isolate db process crashes

[randall]

Updated Branches:
  refs/heads/1.3.x 19c82720d - 9e8782fa1


(COUCHDB-1305) isolate db process crashes

Merge of 1305-fix-isolate-db-crashes

[@davisp: I'll keep doing this nonsense until we allow merge commits!]

Note that there was previously a small error where couch_sys_dbs ETS
table was being searched for a #db record rather than the db name.

That's fixed here because I saw it. Sorry for not making it a
separate commit.

Squashed commit of the following:

commit f9e4e8a6e426d1569fac4cd707bbd393b102147d
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 06:28:20 2013 -0800

don't handle case clause when death happens anyway

Presumably the reason for the process exit is already logged by
the exiting process (unlike an unexpected message of another sort
which may not have been logged already).

commit 10a052a3eddbd7e89b553966895ee38a9ce439d4
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 06:25:23 2013 -0800

consolidate two similar handle_info clauses

commit 6f3feb09e347dfe0c6812fd71e3f40d15d8d1ced
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 04:35:35 2013 -0800

isolate db process crashes in couch_server

closes COUCHDB-1305


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

Branch: refs/heads/1.3.x
Commit: 9e8782fa1d5a0074272ea2d319ee658828e5da90
Parents: 19c8272
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 26 12:39:58 2013 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 26 12:51:57 2013 -0800

--
 src/couchdb/couch_server.erl |   51 ++---
 1 files changed, 36 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e8782fa/src/couchdb/couch_server.erl
--
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index 6e25235..8189761 100644
--- a/src/couchdb/couch_server.erl
+++ b/src/couchdb/couch_server.erl
@@ -426,27 +426,48 @@ code_change(_OldVsn, State, _Extra) -
 
 handle_info({'EXIT', _Pid, config_change}, Server) -
 {noreply, shutdown, Server};
-handle_info({'EXIT', Pid, snappy_nif_not_loaded}, Server) -
+handle_info({'EXIT', Pid, Reason}, Server) -
 Server2 = case ets:lookup(couch_dbs_by_pid, Pid) of
 [{Pid, Db}] -
-[{Db, {opening, Pid, Froms}}] = ets:lookup(couch_dbs_by_name, Db),
-Msg = io_lib:format(To open the database `~s`, Apache CouchDB 
-must be built with Erlang OTP R13B04 or higher., [Db]),
-?LOG_ERROR(Msg, []),
-lists:foreach(
-fun(F) - gen_server:reply(F, {bad_otp_release, Msg}) end,
-Froms),
-true = ets:delete(couch_dbs_by_name, Db),
-true = ets:delete(couch_dbs_by_pid, Pid),
-case ets:lookup(couch_sys_dbs, Db) of
+DbName = Db#db.name,
+
+% If the Pid is known, the name should be as well.
+% If not, that's an error, which is why there is no [] clause.
+case ets:lookup(couch_dbs_by_name, DbName) of
+[{_, {opening, Pid, Froms}}] -
+Msg = case Reason of
+snappy_nif_not_loaded -
+io_lib:format(
+To open the database `~s`, Apache CouchDB 
+must be built with Erlang OTP R13B04 or higher.,
+[Db]
+);
+true -
+io_lib:format(Error opening database ~p: ~p, [DbName, 
Reason])
+end,
+?LOG_ERROR(Msg, []),
+lists:foreach(
+  fun(F) - gen_server:reply(F, {bad_otp_release, Msg}) end,
+  Froms
+);
+[{_, {opened, Pid, LruTime}}] -
+?LOG_ERROR(
+Unexpected exit of database process ~p [~p]: ~p,
+[Pid, DbName, Reason]
+),
+true = ets:delete(couch_dbs_by_lru, LruTime)
+end,
+
+true = ets:delete(couch_dbs_by_pid, DbName),
+true = ets:delete(couch_dbs_by_name, DbName),
+
+case ets:lookup(couch_sys_dbs, DbName) of
 [{Db, _}] -
-true = ets:delete(couch_sys_dbs, Db),
+true = ets:delete(couch_sys_dbs, DbName),
 Server;
 [] -
 Server#server{dbs_open = Server#server.dbs_open - 1}
-end;
-_ -
-Server
+end
 end,
 {noreply, Server2};
 handle_info(Error, _Server) -

git commit: enable JaegerMonkey features on mozjs185

[randall]

Updated Branches:
  refs/heads/1.3.x 8be3ec021 - b20473602


enable JaegerMonkey features on mozjs185

closes COUCHDB-1376


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

Branch: refs/heads/1.3.x
Commit: b20473602f201432591d30a453cc0741e0418f24
Parents: 8be3ec0
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 26 03:15:46 2013 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 26 03:16:50 2013 -0800

--
 src/couchdb/priv/couch_js/sm185.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/b2047360/src/couchdb/priv/couch_js/sm185.c
--
diff --git a/src/couchdb/priv/couch_js/sm185.c 
b/src/couchdb/priv/couch_js/sm185.c
index c11e885..bfee023 100644
--- a/src/couchdb/priv/couch_js/sm185.c
+++ b/src/couchdb/priv/couch_js/sm185.c
@@ -345,6 +345,10 @@ main(int argc, const char* argv[])
 
 JS_SetErrorReporter(cx, couch_error);
 JS_ToggleOptions(cx, JSOPTION_XML);
+JS_SetOptions(cx, JSOPTION_METHODJIT);
+#ifdef JSOPTION_TYPE_INFERENCE
+JS_SetOptions(cx, JSOPTION_TYPE_INFERENCE);
+#endif
 JS_SetContextPrivate(cx, args);
 
 SETUP_REQUEST(cx);

git commit: isolate db process crashes in couch_server

[randall]

Updated Branches:
  refs/heads/1305-fix-isolate-db-crashes [created] 6f3feb09e


isolate db process crashes in couch_server

closes COUCHDB-1305


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

Branch: refs/heads/1305-fix-isolate-db-crashes
Commit: 6f3feb09e347dfe0c6812fd71e3f40d15d8d1ced
Parents: 67e75c2
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 26 04:35:35 2013 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 26 04:35:35 2013 -0800

--
 src/couchdb/couch_server.erl |   22 ++
 1 files changed, 22 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6f3feb09/src/couchdb/couch_server.erl
--
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index 6e25235..c9ffeab 100644
--- a/src/couchdb/couch_server.erl
+++ b/src/couchdb/couch_server.erl
@@ -449,6 +449,28 @@ handle_info({'EXIT', Pid, snappy_nif_not_loaded}, Server) 
-
 Server
 end,
 {noreply, Server2};
+handle_info({'EXIT', Pid, Reason}=Error, Server) -
+case ets:lookup(couch_dbs_by_pid, Pid) of
+[{Pid, Db}] -
+DbName = Db#db.name,
+?LOG_ERROR(
+   Unexpected exit of database process ~p [~p], restarting: ~p,
+   [Pid, DbName, Reason]
+),
+% If the Pid is known, the name should be as well.
+% If not, that's an error we'll let crash out on this case statement.
+case ets:lookup(couch_dbs_by_name, DbName) of
+[{_, {opening, Pid, _Froms}}] -
+ok;
+[{_, {opened, Pid, LruTime}}] -
+true = ets:delete(couch_dbs_by_lru, LruTime)
+end,
+true = ets:delete(couch_dbs_by_name, DbName),
+true = ets:delete(couch_dbs_by_pid, DbName);
+true -
+?LOG_ERROR(Unexpected message, restarting couch_server: ~p, [Error])
+end,
+{noreply, Server};
 handle_info(Error, _Server) -
 ?LOG_ERROR(Unexpected message, restarting couch_server: ~p, [Error]),
 exit(kill).

[2/2] git commit: export the new warn log funs

[randall]

Updated Branches:
  refs/heads/1569-feature-low-disk-space-warn 5abc82b79 - de7688454


export the new warn log funs


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

Branch: refs/heads/1569-feature-low-disk-space-warn
Commit: de76884544f95fdaf3492a2f88899d7e1fd41326
Parents: e71cf04
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 26 10:34:04 2013 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 26 10:34:04 2013 -0800

--
 src/couchdb/couch_log.erl |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/de768845/src/couchdb/couch_log.erl
--
diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
index 7faa68d..cd4 100644
--- a/src/couchdb/couch_log.erl
+++ b/src/couchdb/couch_log.erl
@@ -15,9 +15,9 @@
 
 % public API
 -export([start_link/0, stop/0]).
--export([debug/2, info/2, error/2]).
--export([debug_on/0, info_on/0, get_level/0, get_level_integer/0, 
set_level/1]).
--export([debug_on/1, info_on/1, get_level/1, get_level_integer/1, 
set_level/2]).
+-export([debug/2, info/2, warn/2, error/2]).
+-export([debug_on/0, info_on/0, warn_on/0, get_level/0, get_level_integer/0, 
set_level/1]).
+-export([debug_on/1, info_on/1, warn_on/1, get_level/1, get_level_integer/1, 
set_level/2]).
 -export([read/2]).
 
 % gen_event callbacks

[1/2] git commit: fix mistake in ?LOG_WARN

[randall]

fix mistake in ?LOG_WARN


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

Branch: refs/heads/1569-feature-low-disk-space-warn
Commit: e71cf0499788553f457275558aaf3658fd74fe81
Parents: 5abc82b
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 26 10:33:15 2013 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 26 10:33:15 2013 -0800

--
 src/couchdb/couch_db.hrl |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e71cf049/src/couchdb/couch_db.hrl
--
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl
index eb34ed5..42f10ac 100644
--- a/src/couchdb/couch_db.hrl
+++ b/src/couchdb/couch_db.hrl
@@ -53,7 +53,7 @@
 -define(LOG_WARN(Format, Args),
 case couch_log:warn_on(?MODULE) of
 true -
-couch_log:info(Format, Args);
+couch_log:warn(Format, Args);
 false - ok
 end).
 

[2/2] git commit: Squashed merge of 1569-feature-low-disk-space-warn:

[randall]

Updated Branches:
  refs/heads/1.3.x 9a5de8d51 - 19c82720d
  refs/heads/master 2a7816eef - acd5f6876


Squashed merge of 1569-feature-low-disk-space-warn:

commit de76884544f95fdaf3492a2f88899d7e1fd41326
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 10:34:04 2013 -0800

export the new warn log funs

commit e71cf0499788553f457275558aaf3658fd74fe81
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 10:33:15 2013 -0800

fix mistake in ?LOG_WARN

commit 5abc82b79e93a089b942dfabefb57e57fc243207
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 10:12:58 2013 -0800

change low disk space message to warn level

closes COUCHDB-1569

commit a1461a2b92f8cbd89f0aebe7339e754836d14202
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 09:59:03 2013 -0800

add a ?LOG_WARN and warning level for couch_log


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

Branch: refs/heads/master
Commit: acd5f68764b09bd7752ae4924324b11f5c30cfd8
Parents: 2a7816e
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 26 10:34:58 2013 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 26 10:40:25 2013 -0800

--
 src/couchdb/couch_compaction_daemon.erl |4 ++--
 src/couchdb/couch_db.hrl|7 +++
 src/couchdb/couch_log.erl   |   24 
 3 files changed, 29 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/acd5f687/src/couchdb/couch_compaction_daemon.erl
--
diff --git a/src/couchdb/couch_compaction_daemon.erl 
b/src/couchdb/couch_compaction_daemon.erl
index bc8cfea..18a51a4 100644
--- a/src/couchdb/couch_compaction_daemon.erl
+++ b/src/couchdb/couch_compaction_daemon.erl
@@ -302,7 +302,7 @@ can_db_compact(#config{db_frag = Threshold} = Config, Db) -
 true -
 true;
 false -
-?LOG_INFO(Compaction daemon - skipping database `~s` 
+?LOG_WARN(Compaction daemon - skipping database `~s` 
 compaction: the estimated necessary disk space is about 
~p
  bytes but the currently available disk space is ~p 
bytes.,
[Db#db.name, SpaceRequired, Free]),
@@ -333,7 +333,7 @@ can_view_compact(Config, DbName, GroupId, GroupInfo) -
 true -
 true;
 false -
-?LOG_INFO(Compaction daemon - skipping view group `~s` 
+?LOG_WARN(Compaction daemon - skipping view group `~s` 
 compaction (database `~s`): the estimated necessary 
 disk space is about ~p bytes but the currently 
available
  disk space is ~p bytes.,

http://git-wip-us.apache.org/repos/asf/couchdb/blob/acd5f687/src/couchdb/couch_db.hrl
--
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl
index 325fb98..42f10ac 100644
--- a/src/couchdb/couch_db.hrl
+++ b/src/couchdb/couch_db.hrl
@@ -50,6 +50,13 @@
 false - ok
 end).
 
+-define(LOG_WARN(Format, Args),
+case couch_log:warn_on(?MODULE) of
+true -
+couch_log:warn(Format, Args);
+false - ok
+end).
+
 -define(LOG_ERROR(Format, Args), couch_log:error(Format, Args)).
 
 % Tree::term() is really a tree(), but we don't want to require R13B04 yet

http://git-wip-us.apache.org/repos/asf/couchdb/blob/acd5f687/src/couchdb/couch_log.erl
--
diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
index 906a8be..cd4 100644
--- a/src/couchdb/couch_log.erl
+++ b/src/couchdb/couch_log.erl
@@ -15,16 +15,17 @@
 
 % public API
 -export([start_link/0, stop/0]).
--export([debug/2, info/2, error/2]).
--export([debug_on/0, info_on/0, get_level/0, get_level_integer/0, 
set_level/1]).
--export([debug_on/1, info_on/1, get_level/1, get_level_integer/1, 
set_level/2]).
+-export([debug/2, info/2, warn/2, error/2]).
+-export([debug_on/0, info_on/0, warn_on/0, get_level/0, get_level_integer/0, 
set_level/1]).
+-export([debug_on/1, info_on/1, warn_on/1, get_level/1, get_level_integer/1, 
set_level/2]).
 -export([read/2]).
 
 % gen_event callbacks
 -export([init/1, handle_event/2, terminate/2, code_change/3]).
 -export([handle_info/2, handle_call/2]).
 
--define(LEVEL_ERROR, 3).
+-define(LEVEL_ERROR, 4).
+-define(LEVEL_WARN, 3).
 -define(LEVEL_INFO, 2).
 -define(LEVEL_DEBUG, 1).
 
@@ -42,17 +43,23 @@ info

[1/2] git commit: Squashed merge of 1569-feature-low-disk-space-warn:

[randall]

Squashed merge of 1569-feature-low-disk-space-warn:

Backported from master

commit de76884544f95fdaf3492a2f88899d7e1fd41326
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 10:34:04 2013 -0800

export the new warn log funs

commit e71cf0499788553f457275558aaf3658fd74fe81
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 10:33:15 2013 -0800

fix mistake in ?LOG_WARN

commit 5abc82b79e93a089b942dfabefb57e57fc243207
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 10:12:58 2013 -0800

change low disk space message to warn level

closes COUCHDB-1569

commit a1461a2b92f8cbd89f0aebe7339e754836d14202
Author: Randall Leeds rand...@apache.org
Date:   Sat Jan 26 09:59:03 2013 -0800

add a ?LOG_WARN and warning level for couch_log


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

Branch: refs/heads/1.3.x
Commit: 19c82720d339e2e91614096fa066f190d53ae426
Parents: 9a5de8d
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 26 10:34:58 2013 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 26 10:40:15 2013 -0800

--
 src/couchdb/couch_compaction_daemon.erl |4 ++--
 src/couchdb/couch_db.hrl|7 +++
 src/couchdb/couch_log.erl   |   20 +---
 3 files changed, 26 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/19c82720/src/couchdb/couch_compaction_daemon.erl
--
diff --git a/src/couchdb/couch_compaction_daemon.erl 
b/src/couchdb/couch_compaction_daemon.erl
index bc8cfea..18a51a4 100644
--- a/src/couchdb/couch_compaction_daemon.erl
+++ b/src/couchdb/couch_compaction_daemon.erl
@@ -302,7 +302,7 @@ can_db_compact(#config{db_frag = Threshold} = Config, Db) -
 true -
 true;
 false -
-?LOG_INFO(Compaction daemon - skipping database `~s` 
+?LOG_WARN(Compaction daemon - skipping database `~s` 
 compaction: the estimated necessary disk space is about 
~p
  bytes but the currently available disk space is ~p 
bytes.,
[Db#db.name, SpaceRequired, Free]),
@@ -333,7 +333,7 @@ can_view_compact(Config, DbName, GroupId, GroupInfo) -
 true -
 true;
 false -
-?LOG_INFO(Compaction daemon - skipping view group `~s` 
+?LOG_WARN(Compaction daemon - skipping view group `~s` 
 compaction (database `~s`): the estimated necessary 
 disk space is about ~p bytes but the currently 
available
  disk space is ~p bytes.,

http://git-wip-us.apache.org/repos/asf/couchdb/blob/19c82720/src/couchdb/couch_db.hrl
--
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl
index 65eb7f0..3b08de8 100644
--- a/src/couchdb/couch_db.hrl
+++ b/src/couchdb/couch_db.hrl
@@ -50,6 +50,13 @@
 false - ok
 end).
 
+-define(LOG_WARN(Format, Args),
+case couch_log:warn_on(?MODULE) of
+true -
+couch_log:warn(Format, Args);
+false - ok
+end).
+
 -define(LOG_ERROR(Format, Args), couch_log:error(Format, Args)).
 
 % Tree::term() is really a tree(), but we don't want to require R13B04 yet

http://git-wip-us.apache.org/repos/asf/couchdb/blob/19c82720/src/couchdb/couch_log.erl
--
diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
index fc7b393..21f02f7 100644
--- a/src/couchdb/couch_log.erl
+++ b/src/couchdb/couch_log.erl
@@ -15,15 +15,16 @@
 
 % public API
 -export([start_link/0, stop/0]).
--export([debug/2, info/2, error/2]).
--export([debug_on/0, info_on/0, get_level/0, get_level_integer/0, 
set_level/1]).
+-export([debug/2, info/2, warn/2, error/2]).
+-export([debug_on/0, info_on/0, warn_on/0, get_level/0, get_level_integer/0, 
set_level/1]).
 -export([read/2]).
 
 % gen_event callbacks
 -export([init/1, handle_event/2, terminate/2, code_change/3]).
 -export([handle_info/2, handle_call/2]).
 
--define(LEVEL_ERROR, 3).
+-define(LEVEL_ERROR, 4).
+-define(LEVEL_WARN, 3).
 -define(LEVEL_INFO, 2).
 -define(LEVEL_DEBUG, 1).
 
@@ -41,17 +42,23 @@ info(Format, Args) -
 {ConsoleMsg, FileMsg} = get_log_messages(self(), info, Format, Args),
 gen_event:sync_notify(error_logger, {couch_info, ConsoleMsg, FileMsg}).
 
+warn(Format, Args) -
+{ConsoleMsg, FileMsg} = get_log_messages(self(), warn, Format, Args

git commit: minor NEWS CHANGES (capitalization)

[randall]

Updated Branches:
  refs/heads/1.3.x 660c956da - 4e1bf759a


minor NEWS  CHANGES (capitalization)


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

Branch: refs/heads/1.3.x
Commit: 4e1bf759a30afb510b45b99daa032ee863a38904
Parents: 660c956
Author: Randall Leeds rand...@apache.org
Authored: Wed Nov 21 12:15:12 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Thu Dec 20 11:21:13 2012 -0800

--
 CHANGES |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/4e1bf759/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 81e97e4..0521c18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -62,7 +62,7 @@ UUID Algorithms:
 
 URL Rewriter  Vhosts:
 
-  * database name is encoded during rewriting (allowing embedded /'s, etc)
+  * Database name is encoded during rewriting (allowing embedded /'s, etc)
 
 Version 1.2.1
 -

[1/4] git commit: Update NEWS CHANGES

[randall]

Updated Branches:
  refs/heads/master b99ec7921 - 88c52b232


Update NEWS  CHANGES


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

Branch: refs/heads/master
Commit: 88c52b23282ee37b1cc3720feee596fe1b938ea4
Parents: 10202bf
Author: Randall Leeds rand...@apache.org
Authored: Wed Mar 21 13:38:58 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Thu Oct 25 09:41:53 2012 -0700

--
 CHANGES |7 +++
 NEWS|1 +
 2 files changed, 8 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/88c52b23/CHANGES
--
diff --git a/CHANGES b/CHANGES
index f2b5ca9..82f26d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -145,6 +145,8 @@ View Server:
configuration is matched.
  * Fixed incorrect reduce query results when using pagination parameters.
  * Made icu_driver work with Erlang R15B and later.
+ * Avoid invalidating view indexes when running out of file descriptors
+   (COUCHDB-1445).
 
 OAuth:
 
@@ -157,6 +159,11 @@ Futon:
  * Futon remembers view code every time it is saved, allowing to save an
edit that amounts to a revert.
 
+Log System:
+
+  * Log correct stacktrace in all cases.
+  * Improvements to log messages for file-related errors.
+
 Version 1.1.2
 -
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/88c52b23/NEWS
--
diff --git a/NEWS b/NEWS
index 2abf0d5..62db51f 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,7 @@ This release contains backwards incompatible changes.
  * Fixed incorrect reduce query results when using pagination parameters.
  * Made icu_driver work with Erlang R15B and later.
  * Improvements to the build system and etap test suite.
+ * Improvements to log messages for file-related errors.
 
 Version 1.1.2
 -

[2/4] git commit: don't delete view groups that fail to open

[randall]

don't delete view groups that fail to open

...but log a message instead. Fixes COUCHDB-1445.


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

Branch: refs/heads/master
Commit: 10202bfe2b5e573598b7aa1a0cd7e02de13cf2a7
Parents: e896b0b
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 16:00:24 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Thu Oct 25 09:41:53 2012 -0700

--
 src/couch_mrview/src/couch_mrview_index.erl |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/10202bfe/src/couch_mrview/src/couch_mrview_index.erl
--
diff --git a/src/couch_mrview/src/couch_mrview_index.erl 
b/src/couch_mrview/src/couch_mrview_index.erl
index a604651..6bcb63f 100644
--- a/src/couch_mrview/src/couch_mrview_index.erl
+++ b/src/couch_mrview/src/couch_mrview_index.erl
@@ -18,7 +18,7 @@
 -export([start_update/3, purge/4, process_doc/3, finish_update/1, commit/1]).
 -export([compact/3, swap_compacted/2]).
 
-
+-include(couch_db.hrl).
 -include_lib(couch_mrview/include/couch_mrview.hrl).
 
 
@@ -88,8 +88,9 @@ open(Db, State) -
 {ok, RefCounter} = couch_ref_counter:start([Fd]),
 {ok, NewSt#mrst{refc=RefCounter}}
 end;
-Error -
-(catch couch_mrview_util:delete_files(DbName, Sig)),
+{error, Reason} = Error -
+?LOG_ERROR(Failed to open view file '~s': ~s,
+   [IndexFName, file:format_error(Reason)]),
 Error
 end.
 

git commit: create the system dbs straight away

[randall]

Updated Branches:
  refs/heads/1.1.x 3e2280bfd - 5e2e0bb5a


create the system dbs straight away

Fix spurious errors on startup now that couch_file logs its error
results by asking that the system dbs be opened with the create
option rather than catching a first failure opening without it.


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

Branch: refs/heads/1.1.x
Commit: 5e2e0bb5a8dfce77e74340de74790ba87195434a
Parents: 3e2280b
Author: Randall Leeds rand...@apache.org
Authored: Fri Mar 23 05:32:47 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Fri Mar 23 05:32:47 2012 -0700

--
 src/couchdb/couch_auth_cache.erl  |   22 ++
 src/couchdb/couch_replication_manager.erl |8 ++--
 2 files changed, 12 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/5e2e0bb5/src/couchdb/couch_auth_cache.erl
--
diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl
index e0715b8..d5a61ea 100644
--- a/src/couchdb/couch_auth_cache.erl
+++ b/src/couchdb/couch_auth_cache.erl
@@ -367,7 +367,7 @@ exec_if_auth_db(Fun, DefRes) -
 
 open_auth_db() -
 [{auth_db_name, DbName}] = ets:lookup(?STATE, auth_db_name),
-{ok, AuthDb} = ensure_users_db_exists(DbName, [sys_db]),
+{ok, AuthDb} = ensure_users_db_exists(DbName),
 AuthDb.
 
 
@@ -388,17 +388,15 @@ get_user_props_from_db(UserName) -
 nil
 ).
 
-ensure_users_db_exists(DbName, Options) -
-Options1 = [{user_ctx, #user_ctx{roles=[_admin]}} | Options],
-case couch_db:open(DbName, Options1) of
-{ok, Db} -
-ensure_auth_ddoc_exists(Db, _design/_auth),
-{ok, Db};
-_Error -
-{ok, Db} = couch_db:create(DbName, Options1),
-ok = ensure_auth_ddoc_exists(Db, _design/_auth),
-{ok, Db}
-end.
+ensure_users_db_exists(DbName) -
+Options1 = [
+create,
+{user_ctx, #user_ctx{roles=[_admin]}},
+sys_db
+],
+{ok, Db} = couch_db:open(DbName, Options1),
+ok = ensure_auth_ddoc_exists(Db, _design/_auth),
+{ok, Db}.
 
 ensure_auth_ddoc_exists(Db, DDocId) -
 case couch_db:open_doc(Db, DDocId) of

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5e2e0bb5/src/couchdb/couch_replication_manager.erl
--
diff --git a/src/couchdb/couch_replication_manager.erl 
b/src/couchdb/couch_replication_manager.erl
index b3c6db1..1e4f04c 100644
--- a/src/couchdb/couch_replication_manager.erl
+++ b/src/couchdb/couch_replication_manager.erl
@@ -565,15 +565,11 @@ zone(Hr, Min) -
 ensure_rep_db_exists() -
 DbName = ?l2b(couch_config:get(replicator, db, _replicator)),
 Opts = [
+create,
 {user_ctx, #user_ctx{roles=[_admin, _replicator]}},
 sys_db
 ],
-case couch_db:open(DbName, Opts) of
-{ok, Db} -
-Db;
-_Error -
-{ok, Db} = couch_db:create(DbName, Opts)
-end,
+{ok, Db} = couch_db:open(DbName, Opts),
 ok = ensure_rep_ddoc_exists(Db, _design/_replicator),
 {ok, Db}.
 

[2/2] git commit: Revert create the system dbs straight away

[randall]

Revert create the system dbs straight away

We can't do this. Turns out we actually either specify that we wish to
overwrite the file or we fail couch_file:open even when create is
specified. Seems a bit crazy to me.

This reverts commit 5e2e0bb5a8dfce77e74340de74790ba87195434a.


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

Branch: refs/heads/1.1.x
Commit: 5c8940cecd75b66d2f7357549d6ee9d49a8094bb
Parents: 5e2e0bb
Author: Randall Leeds rand...@apache.org
Authored: Fri Mar 23 06:02:06 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Fri Mar 23 06:02:06 2012 -0700

--
 src/couchdb/couch_auth_cache.erl  |   22 --
 src/couchdb/couch_replication_manager.erl |8 ++--
 2 files changed, 18 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/5c8940ce/src/couchdb/couch_auth_cache.erl
--
diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl
index d5a61ea..e0715b8 100644
--- a/src/couchdb/couch_auth_cache.erl
+++ b/src/couchdb/couch_auth_cache.erl
@@ -367,7 +367,7 @@ exec_if_auth_db(Fun, DefRes) -
 
 open_auth_db() -
 [{auth_db_name, DbName}] = ets:lookup(?STATE, auth_db_name),
-{ok, AuthDb} = ensure_users_db_exists(DbName),
+{ok, AuthDb} = ensure_users_db_exists(DbName, [sys_db]),
 AuthDb.
 
 
@@ -388,15 +388,17 @@ get_user_props_from_db(UserName) -
 nil
 ).
 
-ensure_users_db_exists(DbName) -
-Options1 = [
-create,
-{user_ctx, #user_ctx{roles=[_admin]}},
-sys_db
-],
-{ok, Db} = couch_db:open(DbName, Options1),
-ok = ensure_auth_ddoc_exists(Db, _design/_auth),
-{ok, Db}.
+ensure_users_db_exists(DbName, Options) -
+Options1 = [{user_ctx, #user_ctx{roles=[_admin]}} | Options],
+case couch_db:open(DbName, Options1) of
+{ok, Db} -
+ensure_auth_ddoc_exists(Db, _design/_auth),
+{ok, Db};
+_Error -
+{ok, Db} = couch_db:create(DbName, Options1),
+ok = ensure_auth_ddoc_exists(Db, _design/_auth),
+{ok, Db}
+end.
 
 ensure_auth_ddoc_exists(Db, DDocId) -
 case couch_db:open_doc(Db, DDocId) of

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5c8940ce/src/couchdb/couch_replication_manager.erl
--
diff --git a/src/couchdb/couch_replication_manager.erl 
b/src/couchdb/couch_replication_manager.erl
index 1e4f04c..b3c6db1 100644
--- a/src/couchdb/couch_replication_manager.erl
+++ b/src/couchdb/couch_replication_manager.erl
@@ -565,11 +565,15 @@ zone(Hr, Min) -
 ensure_rep_db_exists() -
 DbName = ?l2b(couch_config:get(replicator, db, _replicator)),
 Opts = [
-create,
 {user_ctx, #user_ctx{roles=[_admin, _replicator]}},
 sys_db
 ],
-{ok, Db} = couch_db:open(DbName, Opts),
+case couch_db:open(DbName, Opts) of
+{ok, Db} -
+Db;
+_Error -
+{ok, Db} = couch_db:create(DbName, Opts)
+end,
 ok = ensure_rep_ddoc_exists(Db, _design/_replicator),
 {ok, Db}.
 

git commit: log 500 errors before return them to the client

[randall]

Updated Branches:
  refs/heads/1.1.x 47491b7f0 - 31282b5de


log 500 errors before return them to the client

This ensures that the log will contain any nasty errors we haven't
caught elsewhere. In particular, related to the previous patch, it
ensures that couch_file errors otherwise only logged at debug will
log at error unless caught elsewhere.


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

Branch: refs/heads/1.1.x
Commit: 31282b5de0728fe1bb1f7d37f883969ea358977d
Parents: 47491b7
Author: Randall Leeds rand...@apache.org
Authored: Fri Mar 23 12:36:34 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Fri Mar 23 12:38:39 2012 -0700

--
 src/couchdb/couch_httpd.erl |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/31282b5d/src/couchdb/couch_httpd.erl
--
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 1715b81..7d9c36f 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -751,8 +751,10 @@ error_info({error, illegal_database_name}) -
 error_info({missing_stub, Reason}) -
 {412, missing_stub, Reason};
 error_info({Error, Reason}) -
+?LOG_ERROR(Uncaught server error: ~p, [{Error, Reason}]),
 {500, couch_util:to_binary(Error), couch_util:to_binary(Reason)};
 error_info(Error) -
+?LOG_ERROR(Uncaught server error: ~p, [Error]),
 {500, unknown_error, couch_util:to_binary(Error)}.
 
 error_headers(#httpd{mochi_req=MochiReq}=Req, Code, ErrorStr, ReasonStr) -

[2/2] git commit: Revert Receive the correct error message to proceed upon ignoring a file-open error

[randall]

Revert Receive the correct error message to proceed upon ignoring a file-open 
error

Most of the errors here will be of the form {error, Reason} because
they come from the file module. Instead of minting our own file_exists
atom lets use {error, eexist}.

This reverts commit 3e5ad086c59af9819f2e93d55f10d61f949002d3.


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

Branch: refs/heads/1.2.x
Commit: bb569905aa1781beaf3403c98f4079ea06339451
Parents: 3e5ad08
Author: Randall Leeds rand...@apache.org
Authored: Wed Mar 21 01:46:08 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Wed Mar 21 01:46:08 2012 -0700

--
 src/couchdb/couch_file.erl |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb569905/src/couchdb/couch_file.erl
--
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index 73edde3..7725ddc 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -53,14 +53,14 @@ open(Filepath, Options) -
 ignore -
 % get the error
 receive
-{Ref, Pid, Reason} -
+{Ref, Pid, {error, Reason} = Error} -
 case process_info(self(), trap_exit) of
 {trap_exit, true} - receive {'EXIT', Pid, _} - ok end;
 {trap_exit, false} - ok
 end,
 ?LOG_ERROR(Error opening file ~s: ~s,
 [Filepath, file:format_error(Reason)]),
-Reason
+Error
 end;
 Error -
 % We can't say much here, because it could be any kind of error.

[1/2] git commit: no really, I was mostly right

[randall]

Updated Branches:
  refs/heads/1.2.x 3e5ad086c - cd238b42d


no really, I was mostly right

The errors that come back from the file module are always of the form
{error, Reason}, and Reason is the atom that should be passed to
file:format_error/1.

In one case, couch_file was returning the atom file_exists rather than
comforming to the file module's errors I was expecting.

Returning {error, eexist} is cleaner.


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

Branch: refs/heads/1.2.x
Commit: cd238b42d1333cece5ab899c35c3b83ada8d448a
Parents: bb56990
Author: Randall Leeds rand...@apache.org
Authored: Wed Mar 21 01:42:33 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Wed Mar 21 01:46:54 2012 -0700

--
 src/couchdb/couch_file.erl |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cd238b42/src/couchdb/couch_file.erl
--
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index 7725ddc..9179933 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -274,7 +274,7 @@ init({Filepath, Options, ReturnPid, Ref}) -
 {ok, #file{fd=Fd}};
 false -
 ok = file:close(Fd),
-init_status_error(ReturnPid, Ref, file_exists)
+init_status_error(ReturnPid, Ref, {error, eexist})
 end;
 false -
 maybe_track_open_os_files(Options),

git commit: no really, I was mostly right

[randall]

Updated Branches:
  refs/heads/1.1.x d17388c60 - 9490c55e3


no really, I was mostly right

The errors that come back from the file module are always of the form
{error, Reason}, and Reason is the atom that should be passed to
file:format_error/1.

In one case, couch_file was returning the atom file_exists rather than
comforming to the file module's errors I was expecting.

Returning {error, eexist} is cleaner.


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

Branch: refs/heads/1.1.x
Commit: 9490c55e315205dd41998fe01a8cf2c86cb42407
Parents: d17388c
Author: Randall Leeds rand...@apache.org
Authored: Wed Mar 21 01:42:33 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Wed Mar 21 01:44:45 2012 -0700

--
 src/couchdb/couch_file.erl |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9490c55e/src/couchdb/couch_file.erl
--
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index ade018b..0585413 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -264,7 +264,7 @@ init({Filepath, Options, ReturnPid, Ref}) -
 {ok, #file{fd=Fd}};
 false -
 ok = file:close(Fd),
-init_status_error(ReturnPid, Ref, file_exists)
+init_status_error(ReturnPid, Ref, {error, eexist})
 end;
 false -
 maybe_track_open_os_files(Options),

git commit: Update NEWS CHANGES for file:format_error

[randall]

Updated Branches:
  refs/heads/1.2.x cd238b42d - 25e079117


Update NEWS  CHANGES for file:format_error


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

Branch: refs/heads/1.2.x
Commit: 25e079117218b52c18d51dca0810b974ec80ff8a
Parents: cd238b4
Author: Randall Leeds rand...@apache.org
Authored: Wed Mar 21 13:38:58 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Wed Mar 21 13:39:13 2012 -0700

--
 CHANGES |1 +
 NEWS|1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/25e07911/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 369c76e..aa16074 100644
--- a/CHANGES
+++ b/CHANGES
@@ -102,6 +102,7 @@ Futon:
 Log System:
 
  * Log correct stacktrace in all cases.
+ * Improvements to log messages for file-related errors.
 
 Version 1.1.1
 -

http://git-wip-us.apache.org/repos/asf/couchdb/blob/25e07911/NEWS
--
diff --git a/NEWS b/NEWS
index 631c7e1..4067744 100644
--- a/NEWS
+++ b/NEWS
@@ -52,6 +52,7 @@ This release contains backwards incompatible changes.
  * Improvements to the build system and etap test suite.
  * Avoid invalidating view indexes when running out of file descriptors.
  * Log correct stacktrace in all cases.
+ * Improvements to log messages for file-related errors.
 
 Version 1.1.1
 -

git commit: Update NEWS CHANGES for file:format_error

[randall]

Updated Branches:
  refs/heads/1.1.x 9490c55e3 - e567f110a


Update NEWS  CHANGES for file:format_error


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

Branch: refs/heads/1.1.x
Commit: e567f110a93b2abf80f77f7241374734b0a975fc
Parents: 9490c55
Author: Randall Leeds rand...@apache.org
Authored: Wed Mar 21 13:38:58 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Wed Mar 21 13:40:57 2012 -0700

--
 CHANGES |4 
 NEWS|1 +
 2 files changed, 5 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e567f110/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 3262da8..b676bc2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,10 @@ View Server:
 
 * Avoid invalidating view indexes when running out of file descriptors.
 
+Log System:
+
+* Improvements to log messages for file-related errors.
+
 Version 1.1.1
 -
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/e567f110/NEWS
--
diff --git a/NEWS b/NEWS
index fe85146..4eb39c2 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ This version has not been released yet.
 * Fix pull replication of documents with many revisions.
 * Fix replication with an HTTP source and target
 * Avoid invalidating view indexes when running out of file descriptors.
+* Improvements to log messages for file-related errors.
 
 Version 1.1.1
 -

git commit: maintain the file_exists idiom

[randall]

Updated Branches:
  refs/heads/1.2.x 25e079117 - af9e1c883


maintain the file_exists idiom

POSIX {error, eexist} from the file module needs to be kept from
bubbling all the way to couch_httpd or it will result in a 500 error
when a 412 is what we want.

This change confines all the database exists already conversion of
the {error, eexist} that now bubble out of couch_file contained within
couch_server.


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

Branch: refs/heads/1.2.x
Commit: af9e1c883ca4accb2097ac9d26efa4daf1fd
Parents: 25e0791
Author: Randall Leeds rand...@apache.org
Authored: Wed Mar 21 14:38:53 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Wed Mar 21 14:38:53 2012 -0700

--
 src/couchdb/couch_server.erl |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/af9e1c88/src/couchdb/couch_server.erl
--
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index 1185a20..440af62 100644
--- a/src/couchdb/couch_server.erl
+++ b/src/couchdb/couch_server.erl
@@ -323,6 +323,8 @@ handle_call({open_result, DbName, {ok, OpenedDbPid}, 
Options}, _From, Server) -
 ok
 end,
 {reply, ok, Server};
+handle_call({open_result, DbName, {error, eexist}, Options}, From, Server) -
+handle_call({open_result, DbName, file_exists, Options}, From, Server);
 handle_call({open_result, DbName, Error, Options}, _From, Server) -
 [{DbName, {opening,Opener,Froms}}] = ets:lookup(couch_dbs_by_name, DbName),
 lists:foreach(fun(From) -

git commit: maintain the file_exists idiom

[randall]

Updated Branches:
  refs/heads/1.1.x e567f110a - 3e2280bfd


maintain the file_exists idiom

POSIX {error, eexist} from the file module needs to be kept from
bubbling all the way to couch_httpd or it will result in a 500 error
when a 412 is what we want.

This change confines all the database exists already conversion of
the {error, eexist} that now bubble out of couch_file contained within
couch_server.


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

Branch: refs/heads/1.1.x
Commit: 3e2280bfd5e18983a1509382c4a42834b33bec45
Parents: e567f11
Author: Randall Leeds rand...@apache.org
Authored: Wed Mar 21 14:38:53 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Wed Mar 21 14:43:31 2012 -0700

--
 src/couchdb/couch_server.erl |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/3e2280bf/src/couchdb/couch_server.erl
--
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index 7870d69..957bdcb 100644
--- a/src/couchdb/couch_server.erl
+++ b/src/couchdb/couch_server.erl
@@ -284,6 +284,8 @@ handle_call({open_result, DbName, {ok, OpenedDbPid}, 
Options}, _From, Server) -
 ok
 end,
 {reply, ok, Server};
+handle_call({open_result, DbName, {error, eexist}, Options}, From, Server) -
+handle_call({open_result, DbName, file_exists, Options}, From, Server);
 handle_call({open_result, DbName, Error, Options}, _From, Server) -
 [{DbName, {opening,Opener,Froms}}] = ets:lookup(couch_dbs_by_name, DbName),
 lists:foreach(fun(From) -

[2/3] git commit: clear ETS table entry if view group fails to start

[randall]

clear ETS table entry if view group fails to start

Without this, the next process which tries to open the view group
will add itself to the wait list even though the monitor has already
fired. When that happens, the caller hangs forever.


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

Branch: refs/heads/1.1.x
Commit: d38ded520257f0db15b05f3f23f84fb0784d1adb
Parents: 311d069
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 20:49:19 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Mon Mar 19 01:23:37 2012 -0700

--
 src/couchdb/couch_view.erl |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d38ded52/src/couchdb/couch_view.erl
--
diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl
index b780bc0..3afe3b4 100644
--- a/src/couchdb/couch_view.erl
+++ b/src/couchdb/couch_view.erl
@@ -369,7 +369,9 @@ handle_info({'DOWN', _, _, _, {DbName, Sig, Reply}}, 
Server) -
 case Reply of {ok, NewPid} -
 link(NewPid),
 add_to_ets(NewPid, DbName, Sig);
- _ - ok end,
+ _ -
+ets:delete(group_servers_by_sig, {DbName, Sig})
+end,
 {noreply, Server}.
 
 add_to_ets(Pid, DbName, Sig) -

[1/3] git commit: don't delete view groups that fail to open

[randall]

Updated Branches:
  refs/heads/1.1.x 785d32f38 - 24a61fd66


don't delete view groups that fail to open

...but log a message instead. Fixes COUCHDB-1445.


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

Branch: refs/heads/1.1.x
Commit: 24a61fd66f8bdf149b032f171cba0d9d438cf464
Parents: d38ded5
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 16:00:24 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Mon Mar 19 01:23:41 2012 -0700

--
 src/couchdb/couch_util.erl |7 +-
 src/couchdb/couch_view_group.erl   |   17 +-
 test/etap/200-view-group-no-db-leaks.t |   30 +-
 3 files changed, 45 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/24a61fd6/src/couchdb/couch_util.erl
--
diff --git a/src/couchdb/couch_util.erl b/src/couchdb/couch_util.erl
index 53dfe5e..e189ae4 100644
--- a/src/couchdb/couch_util.erl
+++ b/src/couchdb/couch_util.erl
@@ -17,7 +17,7 @@
 -export([rand32/0, implode/2, collate/2, collate/3]).
 -export([abs_pathname/1,abs_pathname/2, trim/1]).
 -export([encodeBase64Url/1, decodeBase64Url/1]).
--export([validate_utf8/1, to_hex/1, parse_term/1, dict_find/3]).
+-export([validate_utf8/1, to_hex/1, from_hex/1, parse_term/1, dict_find/3]).
 -export([get_nested_json_value/2, json_user_ctx/1]).
 -export([proplist_apply_field/2, json_apply_field/2]).
 -export([to_binary/1, to_integer/1, to_list/1, url_encode/1]).
@@ -148,6 +148,11 @@ to_hex([H|T]) -
 to_digit(N) when N  10 - $0 + N;
 to_digit(N) - $a + N-10.
 
+from_hex(Hex) when is_binary(Hex) -
+mochihex:to_bin(?b2l(Hex));
+from_hex(Hex) when is_list(Hex) -
+mochihex:to_bin(Hex).
+
 
 parse_term(Bin) when is_binary(Bin) -
 parse_term(binary_to_list(Bin));

http://git-wip-us.apache.org/repos/asf/couchdb/blob/24a61fd6/src/couchdb/couch_view_group.erl
--
diff --git a/src/couchdb/couch_view_group.erl b/src/couchdb/couch_view_group.erl
index 532dd58..6e8a672 100644
--- a/src/couchdb/couch_view_group.erl
+++ b/src/couchdb/couch_view_group.erl
@@ -15,7 +15,8 @@
 
 %% API
 -export([start_link/1, request_group/2, request_group_info/1]).
--export([open_db_group/2, open_temp_group/5, 
design_doc_to_view_group/1,design_root/2]).
+-export([open_db_group/2, open_temp_group/5, design_doc_to_view_group/1]).
+-export([design_root/2, index_file_name/3]).
 
 %% Exports for the compactor
 -export([get_index_header_data/1]).
@@ -382,8 +383,11 @@ prepare_group({RootDir, DbName, #group{sig=Sig}=Group}, 
ForceReset)-
 {ok, Db, reset_file(Db, Fd, DbName, Group)}
 end
 end;
-Error -
-catch delete_index_file(RootDir, DbName, Sig),
+{error, Reason} = Error -
+?LOG_ERROR(Failed to open view file '~s': ~s, [
+index_file_name(RootDir, DbName, Sig),
+file:format_error(Reason)
+]),
 Error
 end;
 Else -
@@ -408,6 +412,10 @@ hex_sig(GroupSig) -
 design_root(RootDir, DbName) -
 RootDir ++ /. ++ ?b2l(DbName) ++ _design/.
 
+index_file_name(RootDir, DBName, Pid) when is_pid(Pid) -
+{ok, GroupInfo} = request_group_info(Pid),
+GroupSig = couch_util:from_hex(couch_util:get_value(signature, GroupInfo)),
+index_file_name(RootDir, DBName, GroupSig);
 index_file_name(RootDir, DbName, GroupSig) -
 design_root(RootDir, DbName) ++ hex_sig(GroupSig) ++.view.
 
@@ -574,9 +582,6 @@ reset_file(Db, Fd, DbName, #group{sig=Sig,name=Name} = 
Group) -
 ok = couch_file:write_header(Fd, {Sig, nil}),
 init_group(Db, Fd, reset_group(Group), nil).
 
-delete_index_file(RootDir, DbName, GroupSig) -
-couch_file:delete(RootDir, index_file_name(RootDir, DbName, GroupSig)).
-
 init_group(Db, Fd, #group{views=Views}=Group, nil) -
 init_group(Db, Fd, Group,
 #index_header{seq=0, purge_seq=couch_db:get_purge_seq(Db),

http://git-wip-us.apache.org/repos/asf/couchdb/blob/24a61fd6/test/etap/200-view-group-no-db-leaks.t
--
diff --git a/test/etap/200-view-group-no-db-leaks.t 
b/test/etap/200-view-group-no-db-leaks.t
index 6c07667..5a625b2 100755
--- a/test/etap/200-view-group-no-db-leaks.t
+++ b/test/etap/200-view-group-no-db-leaks.t
@@ -50,7 +50,7 @@ ddoc_name() - foo.
 main(_) -
 test_util:init_code_path(),
 
-etap:plan(18),
+etap:plan(23),
 case (catch test()) of
 ok -
 etap:end_tests();
@@ -105,7

[3/3] git commit: remove unnecessary eaccess special casing

[randall]

remove unnecessary eaccess special casing

It's better to let these errors bubble and/or not give them special
treatment when file:format_error/1 can do a better job of describing
the failure.


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

Branch: refs/heads/1.1.x
Commit: 311d0692b6de8d7b1d62f74f07c488233557b1ac
Parents: 785d32f
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 20:19:27 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Sun Mar 18 22:10:58 2012 -0700

--
 src/couchdb/couch_config.erl|   11 ---
 src/couchdb/couch_config_writer.erl |8 +---
 src/couchdb/couch_file.erl  |5 +
 src/couchdb/couch_log.erl   |2 --
 src/couchdb/couch_server_sup.erl|   12 ++--
 5 files changed, 20 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/311d0692/src/couchdb/couch_config.erl
--
diff --git a/src/couchdb/couch_config.erl b/src/couchdb/couch_config.erl
index f669853..44a102d 100644
--- a/src/couchdb/couch_config.erl
+++ b/src/couchdb/couch_config.erl
@@ -187,13 +187,10 @@ parse_ini_file(IniFile) -
 case file:read_file(IniFilename) of
 {ok, IniBin0} -
 IniBin0;
-{error, eacces} -
-throw({file_permission_error, IniFile});
-{error, enoent} -
-Fmt = Couldn't find server configuration file ~s.,
-Msg = ?l2b(io_lib:format(Fmt, [IniFilename])),
-?LOG_ERROR(~s~n, [Msg]),
-throw({startup_error, Msg})
+{error, Reason} = Error -
+?LOG_ERROR(Couldn't read server configuration file ~s: ~s,
+[IniFilename, file:format_error(Reason)]),
+throw(Error)
 end,
 
 Lines = re:split(IniBin, \r\n|\n|\r|\032, [{return, list}]),

http://git-wip-us.apache.org/repos/asf/couchdb/blob/311d0692/src/couchdb/couch_config_writer.erl
--
diff --git a/src/couchdb/couch_config_writer.erl 
b/src/couchdb/couch_config_writer.erl
index decd269..3a65c37 100644
--- a/src/couchdb/couch_config_writer.erl
+++ b/src/couchdb/couch_config_writer.erl
@@ -22,6 +22,8 @@
 
 -export([save_to_file/2]).
 
+-include(couch_db.hrl).
+
 %% @spec save_to_file(
 %%   Config::{{Section::string(), Option::string()}, Value::string()},
 %%   File::filename()) - ok
@@ -38,9 +40,9 @@ save_to_file({{Section, Key}, Value}, File) -
 case file:write_file(File, NewFileContents) of
 ok -
 ok;
-{error, eacces} -
-{file_permission_error, File};
-Error -
+{error, Reason} = Error -
+?LOG_ERROR(Couldn't write config file ~s: ~s,
+[File, file:format_error(Reason)]),
 Error
 end.
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/311d0692/src/couchdb/couch_file.erl
--
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index 5c5d51b..b5eed41 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -53,10 +53,7 @@ open(Filepath, Options) -
 {trap_exit, true} - receive {'EXIT', Pid, _} - ok end;
 {trap_exit, false} - ok
 end,
-case Error of
-{error, eacces} - {file_permission_error, Filepath};
-_ - Error
-end
+Error
 end;
 Error -
 Error

http://git-wip-us.apache.org/repos/asf/couchdb/blob/311d0692/src/couchdb/couch_log.erl
--
diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
index ab649ca..397acc7 100644
--- a/src/couchdb/couch_log.erl
+++ b/src/couchdb/couch_log.erl
@@ -82,8 +82,6 @@ init([]) -
 case file:open(Filename, [append]) of
 {ok, Fd} -
 {ok, {Fd, Level, Sasl}};
-{error, eacces} -
-{stop, {file_permission_error, Filename}};
 Error -
 {stop, Error}
 end.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/311d0692/src/couchdb/couch_server_sup.erl
--
diff --git a/src/couchdb/couch_server_sup.erl b/src/couchdb/couch_server_sup.erl
index dd21038..b41e56a 100644
--- a/src/couchdb/couch_server_sup.erl
+++ b/src/couchdb/couch_server_sup.erl
@@ -47,7 +47,9 @@ start_server(IniFiles) -
 {ok, [PidFile]} -
 case file:write_file(PidFile, os:getpid()) of
 ok - ok;
-Error - io:format(Failed to write PID file ~s

git commit: restore some log messages after 311d069

[randall]

Updated Branches:
  refs/heads/1.1.x 27783bd17 - d17388c60


restore some log messages after 311d069


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

Branch: refs/heads/1.1.x
Commit: d17388c608fe93570a4324711ec4086378e8f2fd
Parents: 27783bd
Author: Randall Leeds rand...@apache.org
Authored: Mon Mar 19 15:54:08 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Mon Mar 19 15:55:23 2012 -0700

--
 src/couchdb/couch_file.erl |7 ++-
 src/couchdb/couch_log.erl  |6 --
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d17388c6/src/couchdb/couch_file.erl
--
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index b5eed41..ade018b 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -48,14 +48,19 @@ open(Filepath, Options) -
 ignore -
 % get the error
 receive
-{Ref, Pid, Error} -
+{Ref, Pid, {error, Reason} = Error} -
 case process_info(self(), trap_exit) of
 {trap_exit, true} - receive {'EXIT', Pid, _} - ok end;
 {trap_exit, false} - ok
 end,
+?LOG_ERROR(Error opening file ~s: ~s,
+[Filepath, file:format_error(Reason)]),
 Error
 end;
 Error -
+% We can't say much here, because it could be any kind of error.
+% Just let it bubble and an encapsulating subcomponent can perhaps
+% be more informative. It will likely appear in the SASL log, anyway.
 Error
 end.
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d17388c6/src/couchdb/couch_log.erl
--
diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
index 397acc7..afe9d20 100644
--- a/src/couchdb/couch_log.erl
+++ b/src/couchdb/couch_log.erl
@@ -82,8 +82,10 @@ init([]) -
 case file:open(Filename, [append]) of
 {ok, Fd} -
 {ok, {Fd, Level, Sasl}};
-Error -
-{stop, Error}
+{error, Reason} -
+ReasonStr = file:format_error(Reason),
+io:format(Error opening log file ~s: ~s, [Filename, ReasonStr]),
+{stop, {error, ReasonStr, Filename}}
 end.
 
 debug_on() -

git commit: restore some log messages after 04c4a10

[randall]

Updated Branches:
  refs/heads/1.2.x eaa9c4aee - ede9482fc


restore some log messages after 04c4a10


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

Branch: refs/heads/1.2.x
Commit: ede9482fc3c9e629572ab1376d88f4499c4c8beb
Parents: eaa9c4a
Author: Randall Leeds rand...@apache.org
Authored: Mon Mar 19 15:54:08 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Mon Mar 19 15:54:08 2012 -0700

--
 src/couchdb/couch_file.erl |7 ++-
 src/couchdb/couch_log.erl  |6 --
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ede9482f/src/couchdb/couch_file.erl
--
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index 5e476af..7725ddc 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -53,14 +53,19 @@ open(Filepath, Options) -
 ignore -
 % get the error
 receive
-{Ref, Pid, Error} -
+{Ref, Pid, {error, Reason} = Error} -
 case process_info(self(), trap_exit) of
 {trap_exit, true} - receive {'EXIT', Pid, _} - ok end;
 {trap_exit, false} - ok
 end,
+?LOG_ERROR(Error opening file ~s: ~s,
+[Filepath, file:format_error(Reason)]),
 Error
 end;
 Error -
+% We can't say much here, because it could be any kind of error.
+% Just let it bubble and an encapsulating subcomponent can perhaps
+% be more informative. It will likely appear in the SASL log, anyway.
 Error
 end.
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ede9482f/src/couchdb/couch_log.erl
--
diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
index 7fb95a7..f299ba7 100644
--- a/src/couchdb/couch_log.erl
+++ b/src/couchdb/couch_log.erl
@@ -89,8 +89,10 @@ init([]) -
 case file:open(Filename, [append]) of
 {ok, Fd} -
 {ok, #state{fd = Fd, level = Level, sasl = Sasl}};
-Error -
-{stop, Error}
+{error, Reason} -
+ReasonStr = file:format_error(Reason),
+io:format(Error opening log file ~s: ~s, [Filename, ReasonStr]),
+{stop, {error, ReasonStr, Filename}}
 end.
 
 debug_on() -

[2/3] git commit: clear ETS table entry if view group fails to start

[randall]

clear ETS table entry if view group fails to start

Without this, the next process which tries to open the view group
will add itself to the wait list even though the monitor has already
fired. When that happens, the caller hangs forever.


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

Branch: refs/heads/COUCHDB-1445
Commit: c571a4b1a047d29954cb4009adad85952351388c
Parents: 4837133
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 20:49:19 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Sun Mar 18 20:51:18 2012 -0700

--
 src/couchdb/couch_view.erl |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c571a4b1/src/couchdb/couch_view.erl
--
diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl
index 29026ed..f12524d 100644
--- a/src/couchdb/couch_view.erl
+++ b/src/couchdb/couch_view.erl
@@ -384,7 +384,9 @@ handle_info({'DOWN', _, _, _, {DbName, DDocId, Sig, 
Reply}}, Server) -
 case Reply of {ok, NewPid} -
 link(NewPid),
 add_to_ets(NewPid, DbName, DDocId, Sig);
- _ - ok end,
+ _ -
+ets:delete(group_servers_by_sig, {DbName, Sig})
+end,
 {noreply, Server}.
 
 add_to_ets(Pid, DbName, DDocId, Sig) -

[3/3] git commit: remove unnecessary eaccess special casing

[randall]

remove unnecessary eaccess special casing

It's better to let these errors bubble and/or not give them special
treatment when file:format_error/1 can do a better job of describing
the failure.


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

Branch: refs/heads/COUCHDB-1445
Commit: 483713352cb397510111798c4b076afad83f6c46
Parents: 29eac04
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 20:19:27 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Sun Mar 18 20:41:42 2012 -0700

--
 src/couchdb/couch_config.erl|   11 ---
 src/couchdb/couch_config_writer.erl |8 +---
 src/couchdb/couch_file.erl  |5 +
 src/couchdb/couch_log.erl   |2 --
 src/couchdb/couch_server_sup.erl|   14 +++---
 5 files changed, 17 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/48371335/src/couchdb/couch_config.erl
--
diff --git a/src/couchdb/couch_config.erl b/src/couchdb/couch_config.erl
index f669853..44a102d 100644
--- a/src/couchdb/couch_config.erl
+++ b/src/couchdb/couch_config.erl
@@ -187,13 +187,10 @@ parse_ini_file(IniFile) -
 case file:read_file(IniFilename) of
 {ok, IniBin0} -
 IniBin0;
-{error, eacces} -
-throw({file_permission_error, IniFile});
-{error, enoent} -
-Fmt = Couldn't find server configuration file ~s.,
-Msg = ?l2b(io_lib:format(Fmt, [IniFilename])),
-?LOG_ERROR(~s~n, [Msg]),
-throw({startup_error, Msg})
+{error, Reason} = Error -
+?LOG_ERROR(Couldn't read server configuration file ~s: ~s,
+[IniFilename, file:format_error(Reason)]),
+throw(Error)
 end,
 
 Lines = re:split(IniBin, \r\n|\n|\r|\032, [{return, list}]),

http://git-wip-us.apache.org/repos/asf/couchdb/blob/48371335/src/couchdb/couch_config_writer.erl
--
diff --git a/src/couchdb/couch_config_writer.erl 
b/src/couchdb/couch_config_writer.erl
index decd269..3a65c37 100644
--- a/src/couchdb/couch_config_writer.erl
+++ b/src/couchdb/couch_config_writer.erl
@@ -22,6 +22,8 @@
 
 -export([save_to_file/2]).
 
+-include(couch_db.hrl).
+
 %% @spec save_to_file(
 %%   Config::{{Section::string(), Option::string()}, Value::string()},
 %%   File::filename()) - ok
@@ -38,9 +40,9 @@ save_to_file({{Section, Key}, Value}, File) -
 case file:write_file(File, NewFileContents) of
 ok -
 ok;
-{error, eacces} -
-{file_permission_error, File};
-Error -
+{error, Reason} = Error -
+?LOG_ERROR(Couldn't write config file ~s: ~s,
+[File, file:format_error(Reason)]),
 Error
 end.
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/48371335/src/couchdb/couch_file.erl
--
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index e195db0..5e476af 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -58,10 +58,7 @@ open(Filepath, Options) -
 {trap_exit, true} - receive {'EXIT', Pid, _} - ok end;
 {trap_exit, false} - ok
 end,
-case Error of
-{error, eacces} - {file_permission_error, Filepath};
-_ - Error
-end
+Error
 end;
 Error -
 Error

http://git-wip-us.apache.org/repos/asf/couchdb/blob/48371335/src/couchdb/couch_log.erl
--
diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
index 8e24cab..7fb95a7 100644
--- a/src/couchdb/couch_log.erl
+++ b/src/couchdb/couch_log.erl
@@ -89,8 +89,6 @@ init([]) -
 case file:open(Filename, [append]) of
 {ok, Fd} -
 {ok, #state{fd = Fd, level = Level, sasl = Sasl}};
-{error, eacces} -
-{stop, {file_permission_error, Filename}};
 Error -
 {stop, Error}
 end.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/48371335/src/couchdb/couch_server_sup.erl
--
diff --git a/src/couchdb/couch_server_sup.erl b/src/couchdb/couch_server_sup.erl
index 7baede3..be3c3a3 100644
--- a/src/couchdb/couch_server_sup.erl
+++ b/src/couchdb/couch_server_sup.erl
@@ -46,7 +46,9 @@ start_server(IniFiles) -
 {ok, [PidFile]} -
 case file:write_file(PidFile, os:getpid()) of
 ok - ok;
-Error

[1/3] git commit: don't delete view groups that fail to open

[randall]

Updated Branches:
  refs/heads/COUCHDB-1445 [created] da3ed1bf3


don't delete view groups that fail to open

...but log a message instead. Fixes COUCHDB-1445.


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

Branch: refs/heads/COUCHDB-1445
Commit: da3ed1bf3c4ddbc45b8005a514ded486cadc5ca0
Parents: c571a4b
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 16:00:24 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Sun Mar 18 20:51:25 2012 -0700

--
 src/couchdb/couch_util.erl |   10 +++-
 src/couchdb/couch_view_group.erl   |   17 
 test/etap/200-view-group-no-db-leaks.t |   35 +-
 3 files changed, 53 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/da3ed1bf/src/couchdb/couch_util.erl
--
diff --git a/src/couchdb/couch_util.erl b/src/couchdb/couch_util.erl
index 6638b47..6c5e981 100644
--- a/src/couchdb/couch_util.erl
+++ b/src/couchdb/couch_util.erl
@@ -17,7 +17,7 @@
 -export([rand32/0, implode/2, collate/2, collate/3]).
 -export([abs_pathname/1,abs_pathname/2, trim/1]).
 -export([encodeBase64Url/1, decodeBase64Url/1]).
--export([validate_utf8/1, to_hex/1, parse_term/1, dict_find/3]).
+-export([validate_utf8/1, to_hex/1, from_hex/1, parse_term/1, dict_find/3]).
 -export([get_nested_json_value/2, json_user_ctx/1]).
 -export([proplist_apply_field/2, json_apply_field/2]).
 -export([to_binary/1, to_integer/1, to_list/1, url_encode/1]).
@@ -136,6 +136,14 @@ to_hex([H|T]) -
 to_digit(N) when N  10 - $0 + N;
 to_digit(N) - $a + N-10.
 
+from_hex(Hex) when is_list(Hex) -
+from_hex(?l2b(Hex));
+from_hex() -
+[];
+from_hex(Digit:2/binary,Rest/binary) -
+{ok, [N], []} = io_lib:fread(~16u, ?b2l(Digit)),
+[N|from_hex(Rest)].
+
 
 parse_term(Bin) when is_binary(Bin) -
 parse_term(binary_to_list(Bin));

http://git-wip-us.apache.org/repos/asf/couchdb/blob/da3ed1bf/src/couchdb/couch_view_group.erl
--
diff --git a/src/couchdb/couch_view_group.erl b/src/couchdb/couch_view_group.erl
index 97fc512..52185ba 100644
--- a/src/couchdb/couch_view_group.erl
+++ b/src/couchdb/couch_view_group.erl
@@ -15,7 +15,8 @@
 
 %% API
 -export([start_link/1, request_group/2, request_group_info/1]).
--export([open_db_group/2, open_temp_group/5, 
design_doc_to_view_group/1,design_root/2]).
+-export([open_db_group/2, open_temp_group/5, design_doc_to_view_group/1]).
+-export([design_root/2, index_file_name/3]).
 
 %% Exports for the compactor
 -export([get_index_header_data/1]).
@@ -431,8 +432,11 @@ prepare_group({RootDir, DbName, #group{sig=Sig}=Group}, 
ForceReset)-
 {ok, Db, reset_file(Db, Fd, DbName, Group)}
 end
 end;
-Error -
-catch delete_index_file(RootDir, DbName, Sig),
+{error, Reason} = Error -
+?LOG_ERROR(failed openining view file '~s': ~s, [
+index_file_name(RootDir, DbName, Sig),
+file:format_error(Reason)
+]),
 Error
 end;
 Else -
@@ -457,6 +461,10 @@ hex_sig(GroupSig) -
 design_root(RootDir, DbName) -
 RootDir ++ /. ++ ?b2l(DbName) ++ _design/.
 
+index_file_name(RootDir, DBName, Pid) when is_pid(Pid) -
+{ok, GroupInfo} = request_group_info(Pid),
+GroupSig = ?l2b(couch_util:from_hex(couch_util:get_value(signature, 
GroupInfo))),
+index_file_name(RootDir, DBName, GroupSig);
 index_file_name(RootDir, DbName, GroupSig) -
 design_root(RootDir, DbName) ++ hex_sig(GroupSig) ++.view.
 
@@ -641,9 +649,6 @@ reset_file(Db, Fd, DbName, #group{sig=Sig,name=Name} = 
Group) -
 ok = couch_file:write_header(Fd, {Sig, nil}),
 init_group(Db, Fd, reset_group(Group), nil).
 
-delete_index_file(RootDir, DbName, GroupSig) -
-couch_file:delete(RootDir, index_file_name(RootDir, DbName, GroupSig)).
-
 init_group(Db, Fd, #group{views=Views}=Group, nil) -
 init_group(Db, Fd, Group,
 #index_header{seq=0, purge_seq=couch_db:get_purge_seq(Db),

http://git-wip-us.apache.org/repos/asf/couchdb/blob/da3ed1bf/test/etap/200-view-group-no-db-leaks.t
--
diff --git a/test/etap/200-view-group-no-db-leaks.t 
b/test/etap/200-view-group-no-db-leaks.t
index 3aa26b6..b7ebeb3 100755
--- a/test/etap/200-view-group-no-db-leaks.t
+++ b/test/etap/200-view-group-no-db-leaks.t
@@ -54,7 +54,7 @@ ddoc_name() - foo.
 main(_) -
 test_util:init_code_path(),
 
-etap:plan(28

[2/3] git commit: clear ETS table entry if view group fails to start

[randall]

clear ETS table entry if view group fails to start

Without this, the next process which tries to open the view group
will add itself to the wait list even though the monitor has already
fired. When that happens, the caller hangs forever.


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

Branch: refs/heads/1.2.x
Commit: a38f59d1752ec611f0edc26e8f641a36b52f0c67
Parents: 04c4a10
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 20:49:19 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Sun Mar 18 21:36:48 2012 -0700

--
 src/couchdb/couch_view.erl |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a38f59d1/src/couchdb/couch_view.erl
--
diff --git a/src/couchdb/couch_view.erl b/src/couchdb/couch_view.erl
index 29026ed..f12524d 100644
--- a/src/couchdb/couch_view.erl
+++ b/src/couchdb/couch_view.erl
@@ -384,7 +384,9 @@ handle_info({'DOWN', _, _, _, {DbName, DDocId, Sig, 
Reply}}, Server) -
 case Reply of {ok, NewPid} -
 link(NewPid),
 add_to_ets(NewPid, DbName, DDocId, Sig);
- _ - ok end,
+ _ -
+ets:delete(group_servers_by_sig, {DbName, Sig})
+end,
 {noreply, Server}.
 
 add_to_ets(Pid, DbName, DDocId, Sig) -

[1/3] git commit: don't delete view groups that fail to open

[randall]

Updated Branches:
  refs/heads/1.2.x 29eac043f - 94e72e7fc


don't delete view groups that fail to open

...but log a message instead. Fixes COUCHDB-1445.


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

Branch: refs/heads/1.2.x
Commit: 94e72e7fcc66f6740a3ec517a1bccf2cfa024cf7
Parents: a38f59d
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 16:00:24 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Sun Mar 18 21:39:06 2012 -0700

--
 src/couchdb/couch_util.erl |7 -
 src/couchdb/couch_view_group.erl   |   17 
 test/etap/200-view-group-no-db-leaks.t |   35 +-
 3 files changed, 50 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/94e72e7f/src/couchdb/couch_util.erl
--
diff --git a/src/couchdb/couch_util.erl b/src/couchdb/couch_util.erl
index 6638b47..f229760 100644
--- a/src/couchdb/couch_util.erl
+++ b/src/couchdb/couch_util.erl
@@ -17,7 +17,7 @@
 -export([rand32/0, implode/2, collate/2, collate/3]).
 -export([abs_pathname/1,abs_pathname/2, trim/1]).
 -export([encodeBase64Url/1, decodeBase64Url/1]).
--export([validate_utf8/1, to_hex/1, parse_term/1, dict_find/3]).
+-export([validate_utf8/1, to_hex/1, from_hex/1, parse_term/1, dict_find/3]).
 -export([get_nested_json_value/2, json_user_ctx/1]).
 -export([proplist_apply_field/2, json_apply_field/2]).
 -export([to_binary/1, to_integer/1, to_list/1, url_encode/1]).
@@ -136,6 +136,11 @@ to_hex([H|T]) -
 to_digit(N) when N  10 - $0 + N;
 to_digit(N) - $a + N-10.
 
+from_hex(Hex) when is_binary(Hex) -
+mochihex:to_bin(?b2l(Hex));
+from_hex(Hex) when is_list(Hex) -
+mochihex:to_bin(Hex).
+
 
 parse_term(Bin) when is_binary(Bin) -
 parse_term(binary_to_list(Bin));

http://git-wip-us.apache.org/repos/asf/couchdb/blob/94e72e7f/src/couchdb/couch_view_group.erl
--
diff --git a/src/couchdb/couch_view_group.erl b/src/couchdb/couch_view_group.erl
index 97fc512..d5bd928 100644
--- a/src/couchdb/couch_view_group.erl
+++ b/src/couchdb/couch_view_group.erl
@@ -15,7 +15,8 @@
 
 %% API
 -export([start_link/1, request_group/2, request_group_info/1]).
--export([open_db_group/2, open_temp_group/5, 
design_doc_to_view_group/1,design_root/2]).
+-export([open_db_group/2, open_temp_group/5, design_doc_to_view_group/1]).
+-export([design_root/2, index_file_name/3]).
 
 %% Exports for the compactor
 -export([get_index_header_data/1]).
@@ -431,8 +432,11 @@ prepare_group({RootDir, DbName, #group{sig=Sig}=Group}, 
ForceReset)-
 {ok, Db, reset_file(Db, Fd, DbName, Group)}
 end
 end;
-Error -
-catch delete_index_file(RootDir, DbName, Sig),
+{error, Reason} = Error -
+?LOG_ERROR(Failed to open view file '~s': ~s, [
+index_file_name(RootDir, DbName, Sig),
+file:format_error(Reason)
+]),
 Error
 end;
 Else -
@@ -457,6 +461,10 @@ hex_sig(GroupSig) -
 design_root(RootDir, DbName) -
 RootDir ++ /. ++ ?b2l(DbName) ++ _design/.
 
+index_file_name(RootDir, DBName, Pid) when is_pid(Pid) -
+{ok, GroupInfo} = request_group_info(Pid),
+GroupSig = couch_util:from_hex(couch_util:get_value(signature, GroupInfo)),
+index_file_name(RootDir, DBName, GroupSig);
 index_file_name(RootDir, DbName, GroupSig) -
 design_root(RootDir, DbName) ++ hex_sig(GroupSig) ++.view.
 
@@ -641,9 +649,6 @@ reset_file(Db, Fd, DbName, #group{sig=Sig,name=Name} = 
Group) -
 ok = couch_file:write_header(Fd, {Sig, nil}),
 init_group(Db, Fd, reset_group(Group), nil).
 
-delete_index_file(RootDir, DbName, GroupSig) -
-couch_file:delete(RootDir, index_file_name(RootDir, DbName, GroupSig)).
-
 init_group(Db, Fd, #group{views=Views}=Group, nil) -
 init_group(Db, Fd, Group,
 #index_header{seq=0, purge_seq=couch_db:get_purge_seq(Db),

http://git-wip-us.apache.org/repos/asf/couchdb/blob/94e72e7f/test/etap/200-view-group-no-db-leaks.t
--
diff --git a/test/etap/200-view-group-no-db-leaks.t 
b/test/etap/200-view-group-no-db-leaks.t
index 3aa26b6..b7ebeb3 100755
--- a/test/etap/200-view-group-no-db-leaks.t
+++ b/test/etap/200-view-group-no-db-leaks.t
@@ -54,7 +54,7 @@ ddoc_name() - foo.
 main(_) -
 test_util:init_code_path(),
 
-etap:plan(28),
+etap:plan(33),
 case (catch test()) of
 ok -
 etap:end_tests();
@@ -129,8

[3/3] git commit: remove unnecessary eaccess special casing

[randall]

remove unnecessary eaccess special casing

It's better to let these errors bubble and/or not give them special
treatment when file:format_error/1 can do a better job of describing
the failure.


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

Branch: refs/heads/1.2.x
Commit: 04c4a1041de06e8e39983cf9616c8baf9d889106
Parents: 29eac04
Author: Randall Leeds rand...@apache.org
Authored: Sun Mar 18 20:19:27 2012 -0700
Committer: Randall Leeds rand...@apache.org
Committed: Sun Mar 18 21:36:46 2012 -0700

--
 src/couchdb/couch_config.erl|   11 ---
 src/couchdb/couch_config_writer.erl |8 +---
 src/couchdb/couch_file.erl  |5 +
 src/couchdb/couch_log.erl   |2 --
 src/couchdb/couch_server_sup.erl|   14 +++---
 5 files changed, 17 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/04c4a104/src/couchdb/couch_config.erl
--
diff --git a/src/couchdb/couch_config.erl b/src/couchdb/couch_config.erl
index f669853..44a102d 100644
--- a/src/couchdb/couch_config.erl
+++ b/src/couchdb/couch_config.erl
@@ -187,13 +187,10 @@ parse_ini_file(IniFile) -
 case file:read_file(IniFilename) of
 {ok, IniBin0} -
 IniBin0;
-{error, eacces} -
-throw({file_permission_error, IniFile});
-{error, enoent} -
-Fmt = Couldn't find server configuration file ~s.,
-Msg = ?l2b(io_lib:format(Fmt, [IniFilename])),
-?LOG_ERROR(~s~n, [Msg]),
-throw({startup_error, Msg})
+{error, Reason} = Error -
+?LOG_ERROR(Couldn't read server configuration file ~s: ~s,
+[IniFilename, file:format_error(Reason)]),
+throw(Error)
 end,
 
 Lines = re:split(IniBin, \r\n|\n|\r|\032, [{return, list}]),

http://git-wip-us.apache.org/repos/asf/couchdb/blob/04c4a104/src/couchdb/couch_config_writer.erl
--
diff --git a/src/couchdb/couch_config_writer.erl 
b/src/couchdb/couch_config_writer.erl
index decd269..3a65c37 100644
--- a/src/couchdb/couch_config_writer.erl
+++ b/src/couchdb/couch_config_writer.erl
@@ -22,6 +22,8 @@
 
 -export([save_to_file/2]).
 
+-include(couch_db.hrl).
+
 %% @spec save_to_file(
 %%   Config::{{Section::string(), Option::string()}, Value::string()},
 %%   File::filename()) - ok
@@ -38,9 +40,9 @@ save_to_file({{Section, Key}, Value}, File) -
 case file:write_file(File, NewFileContents) of
 ok -
 ok;
-{error, eacces} -
-{file_permission_error, File};
-Error -
+{error, Reason} = Error -
+?LOG_ERROR(Couldn't write config file ~s: ~s,
+[File, file:format_error(Reason)]),
 Error
 end.
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/04c4a104/src/couchdb/couch_file.erl
--
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index e195db0..5e476af 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -58,10 +58,7 @@ open(Filepath, Options) -
 {trap_exit, true} - receive {'EXIT', Pid, _} - ok end;
 {trap_exit, false} - ok
 end,
-case Error of
-{error, eacces} - {file_permission_error, Filepath};
-_ - Error
-end
+Error
 end;
 Error -
 Error

http://git-wip-us.apache.org/repos/asf/couchdb/blob/04c4a104/src/couchdb/couch_log.erl
--
diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
index 8e24cab..7fb95a7 100644
--- a/src/couchdb/couch_log.erl
+++ b/src/couchdb/couch_log.erl
@@ -89,8 +89,6 @@ init([]) -
 case file:open(Filename, [append]) of
 {ok, Fd} -
 {ok, #state{fd = Fd, level = Level, sasl = Sasl}};
-{error, eacces} -
-{stop, {file_permission_error, Filename}};
 Error -
 {stop, Error}
 end.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/04c4a104/src/couchdb/couch_server_sup.erl
--
diff --git a/src/couchdb/couch_server_sup.erl b/src/couchdb/couch_server_sup.erl
index 7baede3..be3c3a3 100644
--- a/src/couchdb/couch_server_sup.erl
+++ b/src/couchdb/couch_server_sup.erl
@@ -46,7 +46,9 @@ start_server(IniFiles) -
 {ok, [PidFile]} -
 case file:write_file(PidFile, os:getpid()) of
 ok - ok;
-Error - io:format

Git Push Summary

[randall]

Updated Branches:
  refs/heads/htdocs [deleted] 765211ca3

[5/50] git commit: updated description

[randall]

updated description

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1196692 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: e1639ee0df909f77eef76e4a392154bbefe838b1
Parents: dac2e74
Author: Noah Slater nsla...@apache.org
Authored: Wed Nov 2 17:03:47 2011 +
Committer: Noah Slater nsla...@apache.org
Committed: Wed Nov 2 17:03:47 2011 +

--
 index.txt |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e1639ee0/index.txt
--
diff --git a/index.txt b/index.txt
index 36e6361..eeaed25 100644
--- a/index.txt
+++ b/index.txt
@@ -8,7 +8,7 @@ Sort-Index: 010
 =
 
 Apache CouchDB is a document-oriented database that can be queried and indexed
-in a MapReduce fashion using JavaScript. CouchDB also offers incremental
+using JavaScript in a MapReduce fashion. CouchDB also offers incremental
 replication with bi-directional conflict detection and resolution.
 
 CouchDB provides a RESTful JSON API than can be accessed from any environment

[3/50] git commit: move books link to wiki

[randall]

move books link to wiki

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1205386 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: df80161f5dbc2f8c56c660674ea664a39a03f349
Parents: 57afcbc
Author: Jan Lehnardt j...@apache.org
Authored: Wed Nov 23 13:08:48 2011 +
Committer: Jan Lehnardt j...@apache.org
Committed: Wed Nov 23 13:08:48 2011 +

--
 docs/books.html |  106 --
 docs/books.txt  |   19 +
 2 files changed, 3 insertions(+), 122 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/df80161f/docs/books.html
--
diff --git a/docs/books.html b/docs/books.html
deleted file mode 100644
index 8dbb47a..000
--- a/docs/books.html
+++ /dev/null
@@ -1,106 +0,0 @@
-!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01//EN
-  http://www.w3.org/TR/html4/strict.dtd;
-!--
-Copyright 2008 The Apache Software Foundation
-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.
---
-html lang=en
-  head
-meta http-equiv=Content-Type content=text/html;charset=utf-8
-titleApache CouchDB: Books/title
-meta name=description content=Apache CouchDB is a document-oriented 
database that can be queried and indexed using JavaScript in a MapReduce 
fashion.
-meta name=keywords 
content=CouchDB,database,document,REST,HTTP,JSON,Javascript
-link rel=icon type=img/x-icon href=../favicon.ico
-link rel=shortcut icon type=img/x-icon href=../favicon.ico
-link rel=stylesheet type=text/css href=../style/layout.css
-link rel=stylesheet type=text/css href=../style/print.css 
media=print
-  /head
-  body
-div id=headerdiv class=wrap
-  div class=logo-tm™/div
-  a class=couchdb href=../index.html
-object data=../img/couchdb-logo.svg width=400 height=110 
type=image/svg+xml
-  img src=../img/couchdb-logo.png width=400 height=110 
alt=CouchDB - Relax
-/object
-  /a
-  h1Apache CouchDB. Relax./h1
-/div/div
-div id=breadcrumbsul
-lia href=../index.htmlHome/a/li
-li»/li
-lia href=index.htmlDocumentation/a/li
-li»/li
-li class=activea href=books.htmlBooks/a/li
-/ul
-/div
-div id=maindiv class=wrap
-  div id=navul
-lia class= href=../index.htmlspanHome/span/a/li
-lia class=external 
href=http://www.google.com/coop/cse?cx=006426053638666134111:bfy4xffxeqc;spanSearch/span/a/li
-lia class= href=../downloads.htmlspanDownloads/span/a/li
-lia class= href=../screenshots.htmlspanScreenshots/span/a/li
-lia class=external 
href=http://www.apache.org/licenses/;spanLicense/span/a/li
-lia class=external 
href=https://issues.apache.org/jira/browse/COUCHDB?report=com.atlassian.jira.plugin.system.project:roadmap-panel;spanRoad
 Map/span/a/li
-lia class= href=index.htmlspanDocumentation/span/aul
-lia class= href=intro.htmlspanIntroduction/span/a/li
-lia class= href=overview.htmlspanOverview/span/a/li
-lia class=external 
href=http://wiki.apache.org/couchdb/;spanWiki/span/a/li
-lia class=active href=books.htmlspanBooks/span/a/li
-lia class=external 
href=http://www.apache.org/foundation/thanks.html;spanThanks/span/a/li
-lia class=external 
href=http://www.apache.org/foundation/sponsorship.html;spanBecome a 
Sponsor/span/a/li
-/ul
-/li
-lia class= href=../community/index.htmlspanGet 
Involved/span/aul
-lia class= href=../community/lists.htmlspanMailing 
Lists/span/a/li
-lia class= href=../community/issues.htmlspanIssue 
Tracking/span/a/li
-lia class= href=../community/code.htmlspanSource Code/span/a/li
-lia class= 
href=../community/committers.htmlspanCommitters/span/a/li
-lia class=external 
href=http://wiki.apache.org/couchdb/Coding_Standards;spanCoding 
Standards/span/a/li
-lia class=external 
href=http://planet.couchdb.com/;spanPlanet/span/a/li
-/ul
-/li
-lia class= href=../notice/index.htmlspanNotices/span/aul
-lia class= href=../notice/1.0.1.htmlspanNotice for 
1.0.1/span/a/li
-/ul
-/li
-lia class= href=../security.htmlspanSecurity/span/a/li
-/ul
-/div
-  div id=contenth1Books/h1
-
-pAs of August 2009, there are three book on 

[2/50] git commit: regenerate site

[randall]

regenerate site

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1205387 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: f1b1d5a650c2ba6dc60242ca1a802c6078072611
Parents: df80161
Author: Jan Lehnardt j...@apache.org
Authored: Wed Nov 23 13:09:35 2011 +
Committer: Jan Lehnardt j...@apache.org
Committed: Wed Nov 23 13:09:35 2011 +

--
 community/code.html   |2 +-
 community/committers.html |   28 ++--
 community/index.html  |2 +-
 community/issues.html |2 +-
 community/lists.html  |   18 +-
 docs/index.html   |4 ++--
 docs/intro.html   |2 +-
 docs/overview.html|2 +-
 downloads.html|2 +-
 index.html|2 +-
 notice/1.0.1.html |2 +-
 notice/index.html |2 +-
 screenshots.html  |2 +-
 security.html |2 +-
 14 files changed, 36 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/f1b1d5a6/community/code.html
--
diff --git a/community/code.html b/community/code.html
index 566326c..6bf5953 100644
--- a/community/code.html
+++ b/community/code.html
@@ -54,8 +54,8 @@ limitations under the License.
 lia class= href=../docs/index.htmlspanDocumentation/span/aul
 lia class= href=../docs/intro.htmlspanIntroduction/span/a/li
 lia class= href=../docs/overview.htmlspanOverview/span/a/li
+lia class=external 
href=http://wiki.apache.org/couchdb/FrontPage#Books;spanBooks/span/a/li
 lia class=external 
href=http://wiki.apache.org/couchdb/;spanWiki/span/a/li
-lia class= href=../docs/books.htmlspanBooks/span/a/li
 lia class=external 
href=http://www.apache.org/foundation/thanks.html;spanThanks/span/a/li
 lia class=external 
href=http://www.apache.org/foundation/sponsorship.html;spanBecome a 
Sponsor/span/a/li
 /ul

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f1b1d5a6/community/committers.html
--
diff --git a/community/committers.html b/community/committers.html
index 40b8fe5..e302c03 100644
--- a/community/committers.html
+++ b/community/committers.html
@@ -54,8 +54,8 @@ limitations under the License.
 lia class= href=../docs/index.htmlspanDocumentation/span/aul
 lia class= href=../docs/intro.htmlspanIntroduction/span/a/li
 lia class= href=../docs/overview.htmlspanOverview/span/a/li
+lia class=external 
href=http://wiki.apache.org/couchdb/FrontPage#Books;spanBooks/span/a/li
 lia class=external 
href=http://wiki.apache.org/couchdb/;spanWiki/span/a/li
-lia class= href=../docs/books.htmlspanBooks/span/a/li
 lia class=external 
href=http://www.apache.org/foundation/thanks.html;spanThanks/span/a/li
 lia class=external 
href=http://www.apache.org/foundation/sponsorship.html;spanBecome a 
Sponsor/span/a/li
 /ul
@@ -78,71 +78,71 @@ limitations under the License.
 /div
   div id=contenth1Committers/h1
 
-pa href=http://damienkatz.net/;Damien Katz/a, a 
href=#x6D;#x61;#x69;#108;#116;#111;:#100;#x61;#109;#105;#101;#110;#64;#x61;#x70;#97;#99;#x68;e#46;#111;#114;#x67;#100;#x61;#109;#105;#101;#110;#64;#x61;#x70;#97;#99;#x68;e#46;#111;#114;#x67;/a/p
+pa href=http://damienkatz.net/;Damien Katz/a, a 
href=#x6D;#x61;#x69;#108;#116;#x6F;:#x64;a#x6D;#105;#x65;#110;#64;#97;#x70;#97;#x63;#x68;e#x2E;#x6F;#114;g#x64;a#x6D;#105;#x65;#110;#64;#97;#x70;#97;#x63;#x68;e#x2E;#x6F;#114;g/a/p
 
 pInventor, original developer and all around relaxed dude./p
 
-pa href=http://jan.prima.de/;Jan Lehnardt/a, a 
href=#109;#x61;#105;#x6C;#116;#111;:#x6A;#97;#x6E;#64;#97;#112;#97;#x63;#104;#x65;#46;#x6F;#x72;#x67;#x6A;#97;#x6E;#64;#97;#112;#97;#x63;#104;#x65;#46;#x6F;#x72;#x67;/a/p
+pa href=http://jan.prima.de/;Jan Lehnardt/a, a 
href=ma#105;#108;#x74;#x6F;:#x6A;#97;#110;#64;#x61;#112;#97;#x63;#104;#101;#x2E;o#114;#103;#x6A;#97;#110;#64;#x61;#112;#97;#x63;#104;#101;#x2E;o#114;#103;/a/p
 
 pContributes to all parts of CouchDB, helps out with the community, and
is PMC Chair. He is co-author of a 
href=http://guide.couchdb.org/;CouchDB:
The Definitive Guide/a./p
 
-pa href=http://nslater.org/;Noah Slater/a, a 
href=#x6D;#x61;#x69;l#x74;#x6F;:#110;#x73;#x6C;#x61;#116;e#114;#64;#97;#x70;#x61;#x63;#104;#x65;#x2E;#111;#114;#x67;#110;#x73;#x6C;#x61;#116;e#114;#64;#97;#x70;#x61;#x63;#104;#x65;#x2E;#111;#114;#x67;/a/p
+pa href=http://nslater.org/;Noah Slater/a, a 

[7/50] git commit: escape underscore thingies so that look pretty in your browser thingy.

[randall]

escape underscore thingies so that look pretty in your browser thingy.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1195472 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: fe3f680f57cea8c2e86b22419bc06044d64a4c5f
Parents: 330be9f
Author: Robert Newson rnew...@apache.org
Authored: Mon Oct 31 14:27:42 2011 +
Committer: Robert Newson rnew...@apache.org
Committed: Mon Oct 31 14:27:42 2011 +

--
 downloads.html |   22 +++---
 downloads.txt  |   22 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/fe3f680f/downloads.html
--
diff --git a/downloads.html b/downloads.html
index 77296cd..62339c8 100644
--- a/downloads.html
+++ b/downloads.html
@@ -96,26 +96,26 @@ limitations under the License.
 
 ul
 liSupport SpiderMonkey 1.8.5/li
-liAdd configurable maximum to the number of bytes returned by _log./li
+liAdd configurable maximum to the number of bytes returned by 
code_log/code./li
 liAllow CommonJS modules to be an empty string./li
 liBump minimum Erlang version to R13B02./li
-liDo not run deleted validateemdoc/emupdate functions./li
-liETags for views include current sequence if include_docs=true./li
-liFix bug where duplicates can appear in _changes feed./li
+liDo not run deleted codevalidate_doc_update/code functions./li
+liETags for views include current sequence if 
codeinclude_docs=true/code./li
+liFix bug where duplicates can appear in code_changes/code feed./li
 liFix bug where update handlers break after conflict resolution./li
-liFix bug with _replicator where include #8220;filter#8221; could crash 
couch./li
+liFix bug with code_replicator/code where include #8220;filter#8221; 
could crash couch./li
 liFix crashes when compacting large views./li
-liFix file descriptor leak in _log/li
-liFix missing revisions in emchanges?style=all/emdocs./li
-liImprove handling of compaction at maxemdbs/emopen limit./li
+liFix file descriptor leak in code_log/code/li
+liFix missing revisions in code_changes?style=all_docs/code./li
+liImprove handling of compaction at codemax_dbs_open/code limit./li
 liJSONP responses now send #8220;text/javascript#8221; for 
Content-Type./li
 liLink to ICU 4.2 on Windows./li
 liPermit forward slashes in path to update functions./li
-liReap couchjs processes that hit reduce_overflow error./li
+liReap couchjs processes that hit codereduce_overflow/code error./li
 liStatus code can be specified in update handlers./li
 liSupport provides() in show functions./li
-liemview/emcleanup when ddoc has no views now removes all index 
files./li
-limaxemreplication/emretry_count now supports 
#8220;infinity#8221;./li
+licode_view_cleanup/code when ddoc has no views now removes all index 
files./li
+licodemax_replication_retry_count/code now supports 
#8220;infinity#8221;./li
 liFix replication crash when source database has a document with empty 
ID./li
 liFix deadlock when assigning couchjs processes to serve requests./li
 liFixes to the document multipart PUT API./li

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fe3f680f/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index e2ce663..eb1f1d5 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -22,26 +22,26 @@ Current Releases
  Changes
 
  * Support SpiderMonkey 1.8.5
- * Add configurable maximum to the number of bytes returned by _log.
+ * Add configurable maximum to the number of bytes returned by `_log`.
  * Allow CommonJS modules to be an empty string.
  * Bump minimum Erlang version to R13B02.
- * Do not run deleted validate_doc_update functions.
- * ETags for views include current sequence if include_docs=true.
- * Fix bug where duplicates can appear in _changes feed.
+ * Do not run deleted `validate_doc_update` functions.
+ * ETags for views include current sequence if `include_docs=true`.
+ * Fix bug where duplicates can appear in `_changes` feed.
  * Fix bug where update handlers break after conflict resolution.
- * Fix bug with _replicator where include filter could crash couch.
+ * Fix bug with `_replicator` where include filter could crash couch.
  * Fix crashes when compacting large views.
- * Fix file descriptor leak in _log
- * Fix missing revisions in _changes?style=all_docs.
- * Improve handling of compaction at max_dbs_open limit.
+ * Fix file descriptor leak in `_log`
+ * Fix missing revisions in `_changes?style=all_docs`.
+ * 

[8/50] git commit: Add 1.1.1 to the downloads page

[randall]

Add 1.1.1 to the downloads page

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1195427 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 330be9f3f3491d9ae0f1882cddb43d6e2e0eeedb
Parents: 1cb0056
Author: Robert Newson rnew...@apache.org
Authored: Mon Oct 31 12:08:19 2011 +
Committer: Robert Newson rnew...@apache.org
Committed: Mon Oct 31 12:08:19 2011 +

--
 downloads.html |   41 +
 downloads.txt  |   37 +
 2 files changed, 78 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/330be9f3/downloads.html
--
diff --git a/downloads.html b/downloads.html
index 340395f..77296cd 100644
--- a/downloads.html
+++ b/downloads.html
@@ -81,6 +81,47 @@ limitations under the License.
 
 h2Current Releases/h2
 
+h31.1.1/h3
+
+h4Files/h4
+
+ul
+lia 
href=http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz;apache-couchdb-1.1.1.tar.gz/a
+[a 
href=http://www.apache.org/dist/couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz.asc;OpenPGP/a]
+[a 
href=http://www.apache.org/dist/couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz.md5;MD5/a]
+[a 
href=http://www.apache.org/dist/couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz.sha;SHA/a]/li
+/ul
+
+h4Changes/h4
+
+ul
+liSupport SpiderMonkey 1.8.5/li
+liAdd configurable maximum to the number of bytes returned by _log./li
+liAllow CommonJS modules to be an empty string./li
+liBump minimum Erlang version to R13B02./li
+liDo not run deleted validateemdoc/emupdate functions./li
+liETags for views include current sequence if include_docs=true./li
+liFix bug where duplicates can appear in _changes feed./li
+liFix bug where update handlers break after conflict resolution./li
+liFix bug with _replicator where include #8220;filter#8221; could crash 
couch./li
+liFix crashes when compacting large views./li
+liFix file descriptor leak in _log/li
+liFix missing revisions in emchanges?style=all/emdocs./li
+liImprove handling of compaction at maxemdbs/emopen limit./li
+liJSONP responses now send #8220;text/javascript#8221; for 
Content-Type./li
+liLink to ICU 4.2 on Windows./li
+liPermit forward slashes in path to update functions./li
+liReap couchjs processes that hit reduce_overflow error./li
+liStatus code can be specified in update handlers./li
+liSupport provides() in show functions./li
+liemview/emcleanup when ddoc has no views now removes all index 
files./li
+limaxemreplication/emretry_count now supports 
#8220;infinity#8221;./li
+liFix replication crash when source database has a document with empty 
ID./li
+liFix deadlock when assigning couchjs processes to serve requests./li
+liFixes to the document multipart PUT API./li
+liFixes regarding file descriptor leaks for databases with views./li
+/ul
+
 h31.1.0/h3
 
 h4Files/h4

http://git-wip-us.apache.org/repos/asf/couchdb/blob/330be9f3/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index 73609c1..e2ce663 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -10,6 +10,43 @@ The following releases of Apache CouchDB are available for 
download.
 Current Releases
 
 
+### 1.1.1
+
+ Files
+
+ * 
[apache-couchdb-1.1.1.tar.gz](http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz)
+   
[[OpenPGP](http://www.apache.org/dist/couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz.asc)]
+   
[[MD5](http://www.apache.org/dist/couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz.md5)]
+   
[[SHA](http://www.apache.org/dist/couchdb/1.1.1/apache-couchdb-1.1.1.tar.gz.sha)]
+
+ Changes
+
+ * Support SpiderMonkey 1.8.5
+ * Add configurable maximum to the number of bytes returned by _log.
+ * Allow CommonJS modules to be an empty string.
+ * Bump minimum Erlang version to R13B02.
+ * Do not run deleted validate_doc_update functions.
+ * ETags for views include current sequence if include_docs=true.
+ * Fix bug where duplicates can appear in _changes feed.
+ * Fix bug where update handlers break after conflict resolution.
+ * Fix bug with _replicator where include filter could crash couch.
+ * Fix crashes when compacting large views.
+ * Fix file descriptor leak in _log
+ * Fix missing revisions in _changes?style=all_docs.
+ * Improve handling of compaction at max_dbs_open limit.
+ * JSONP responses now send text/javascript for Content-Type.
+ * Link to ICU 4.2 on Windows.
+ * Permit forward slashes in path to update 

[11/50] git commit: remove misleading diagram from front page.

[randall]

remove misleading diagram from front page.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1178751 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 06372ffc59a63e36c8fde3e72dd255f8672fa570
Parents: d5bd834
Author: Robert Newson rnew...@apache.org
Authored: Tue Oct 4 10:24:17 2011 +
Committer: Robert Newson rnew...@apache.org
Committed: Tue Oct 4 10:24:17 2011 +

--
 index.html |3 ---
 index.txt  |5 +
 2 files changed, 1 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/06372ffc/index.html
--
diff --git a/index.html b/index.html
index 4b9fb56..9303ecb 100644
--- a/index.html
+++ b/index.html
@@ -75,9 +75,6 @@ limitations under the License.
 /div
   div id=contenth1The Apache CouchDB Project/h1
 
-pimg src=img/sketch.png width=292 height=340 alt=CouchDB Server 
Components
- style=float: right; margin-left: 2em/p
-
 pApache CouchDB is a document-oriented database that can be queried and 
indexed
 in a MapReduce fashion using JavaScript. CouchDB also offers incremental
 replication with bi-directional conflict detection and resolution./p

http://git-wip-us.apache.org/repos/asf/couchdb/blob/06372ffc/index.txt
--
diff --git a/index.txt b/index.txt
index 4579ea8..36e6361 100644
--- a/index.txt
+++ b/index.txt
@@ -7,9 +7,6 @@ Sort-Index: 010
 %(title)s
 =
 
-img src=img/sketch.png width=292 height=340 alt=CouchDB Server 
Components
- style=float: right; margin-left: 2em
-
 Apache CouchDB is a document-oriented database that can be queried and indexed
 in a MapReduce fashion using JavaScript. CouchDB also offers incremental
 replication with bi-directional conflict detection and resolution.
@@ -53,4 +50,4 @@ Apache Project
 Apache CouchDB is a project of [the Apache Software
 Foundation](http://www.apache.org/). Its work is defined by collaborative
 consensus based processes, an open, pragmatic software license and a desire to
-create high quality software that leads the way in its field.
\ No newline at end of file
+create high quality software that leads the way in its field.

[6/50] git commit: remove 0.11.2 and 1.1.0 from downloads page.

[randall]

remove 0.11.2 and 1.1.0 from downloads page.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1195688 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: dac2e74b619aa2e1f85f8d48789d3290fb592985
Parents: fe3f680
Author: Robert Newson rnew...@apache.org
Authored: Mon Oct 31 21:43:13 2011 +
Committer: Robert Newson rnew...@apache.org
Committed: Mon Oct 31 21:43:13 2011 +

--
 downloads.html |   55 ---
 downloads.txt  |   47 ---
 2 files changed, 0 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/dac2e74b/downloads.html
--
diff --git a/downloads.html b/downloads.html
index 62339c8..494af12 100644
--- a/downloads.html
+++ b/downloads.html
@@ -122,39 +122,6 @@ limitations under the License.
 liFixes regarding file descriptor leaks for databases with views./li
 /ul
 
-h31.1.0/h3
-
-h4Files/h4
-
-ul
-lia 
href=http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz;apache-couchdb-1.1.0.tar.gz/a
-[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.asc;OpenPGP/a]
-[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.md5;MD5/a]
-[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.sha;SHA/a]/li
-/ul
-
-h4Changes/h4
-
-ul
-liNative SSL support./li
-liAdded support for HTTP range requests for attachments./li
-liAdded built-in filters for code_changes/code: code_doc_ids/code 
and code_design/code./li
-liAdded configuration option for TCP_NODELAY aka #8220;Nagle#8221;./li
-liAllow wildcards in vhosts definitions./li
-liMore granular ETag support for views./li
-liMore flexible URL rewriter./li
-liAdded OS Process module to manage daemons outside of CouchDB./li
-liAdded HTTP Proxy handler for more scalable externals./li
-liAdded code_replicator/code database to manage replications./li
-liMultiple micro-optimizations when reading data./li
-liAdded CommonJS support to map functions./li
-liAdded codestale=update_after/code query option that triggers a view 
update after
-returning a codestale=ok/code response./li
-liMore explicit error messages when it#8217;s not possible to access a file 
due
-to lack of permissions./li
-liAdded a #8220;change password#8221;-feature to Futon./li
-/ul
-
 h31.0.3/h3
 
 h4Files/h4
@@ -185,28 +152,6 @@ to lack of permissions./li
 liWindows builds now require ICU = 4.4.0 and Erlang = R14B03./li
 /ul
 
-h30.11.2/h3
-
-h4Files/h4
-
-ul
-lia 
href=http://www.apache.org/dyn/closer.cgi?path=/couchdb/0.11.2/apache-couchdb-0.11.2.tar.gz;apache-couchdb-0.11.2.tar.gz/a
-[a 
href=http://www.apache.org/dist/couchdb/0.11.2/apache-couchdb-0.11.2.tar.gz.asc;OpenPGP/a]
-[a 
href=http://www.apache.org/dist/couchdb/0.11.2/apache-couchdb-0.11.2.tar.gz.md5;MD5/a]
-[a 
href=http://www.apache.org/dist/couchdb/0.11.2/apache-couchdb-0.11.2.tar.gz.sha;SHA/a]/li
-/ul
-
-h4Changes/h4
-
-ul
-liReplicator buxfixes for replicating design documents from secured 
databases./li
-liBetter error messages on invalid URL requests./li
-liUser documents can now be deleted by admins or the user./li
-liAvoid potential DOS attack by guarding all creation of atoms./li
-liSome Futon and JavaScript library bugfixes./li
-liFixed CVE-2010-2234: Apache CouchDB Cross Site Request Forgery Attack/li
-/ul
-
 h2Archived Releases/h2
 
 pOld Apache CouchDB releases can be found here:/p

http://git-wip-us.apache.org/repos/asf/couchdb/blob/dac2e74b/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index eb1f1d5..9cae008 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -47,35 +47,6 @@ Current Releases
  * Fixes to the document multipart PUT API.
  * Fixes regarding file descriptor leaks for databases with views.
 
-### 1.1.0
-
- Files
-
- * 
[apache-couchdb-1.1.0.tar.gz](http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz)
-   
[[OpenPGP](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.asc)]
-   
[[MD5](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.md5)]
-   
[[SHA](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.sha)]
-
- Changes
-
- * Native SSL support.
- * Added support for HTTP range requests for attachments.
- * Added built-in filters for `_changes`: `_doc_ids` and `_design`.
- * Added configuration option for TCP_NODELAY aka 

[20/50] git commit: add 1.1.0 to downloads.txt|html

[randall]

add 1.1.0 to downloads.txt|html

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1131130 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 393b3539e09c3b38e2330015354d279d593849b9
Parents: ff5e72c
Author: Robert Newson rnew...@apache.org
Authored: Fri Jun 3 18:12:47 2011 +
Committer: Robert Newson rnew...@apache.org
Committed: Fri Jun 3 18:12:47 2011 +

--
 downloads.html |   33 +
 downloads.txt  |   29 +
 2 files changed, 62 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/393b3539/downloads.html
--
diff --git a/downloads.html b/downloads.html
index 5ceb2ce..e5be2d8 100644
--- a/downloads.html
+++ b/downloads.html
@@ -81,6 +81,39 @@ limitations under the License.
 
 h2Current Releases/h2
 
+h31.1.0/h3
+
+h4Files/h4
+
+ul
+lia 
href=http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz;apache-couchdb-1.1.0.tar.gz/a
+[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.asc;OpenPGP/a]
+[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.md5;MD5/a]
+[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.sha;SHA/a]/li
+/ul
+
+h4Changes/h4
+
+ul
+liNative SSL support./li
+liAdded support for HTTP range requests for attachments./li
+liAdded built-in filters for code_changes/code: code_doc_ids/code 
and code_design/code./li
+liAdded configuration option for TCP_NODELAY aka #8220;Nagle#8221;./li
+liAllow wildcards in vhosts definitions./li
+liMore granular ETag support for views./li
+liMore flexible URL rewriter./li
+liAdded OS Process module to manage daemons outside of CouchDB./li
+liAdded HTTP Proxy handler for more scalable externals./li
+liAdded code_replicator/code database to manage replications./li
+liMultiple micro-optimizations when reading data./li
+liAdded CommonJS support to map functions./li
+liAdded codestale=update_after/code query option that triggers a view 
update after
+returning a codestale=ok/code response./li
+liMore explicit error messages when it#8217;s not possible to access a file 
due
+to lack of permissions./li
+liAdded a #8220;change password#8221;-feature to Futon./li
+/ul
+
 h31.0.2/h3
 
 h4Files/h4

http://git-wip-us.apache.org/repos/asf/couchdb/blob/393b3539/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index a43946d..caed7b3 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -10,6 +10,35 @@ The following releases of Apache CouchDB are available for 
download.
 Current Releases
 
 
+### 1.1.0
+
+ Files
+
+ * 
[apache-couchdb-1.1.0.tar.gz](http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz)
+   
[[OpenPGP](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.asc)]
+   
[[MD5](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.md5)]
+   
[[SHA](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.sha)]
+
+ Changes
+
+ * Native SSL support.
+ * Added support for HTTP range requests for attachments.
+ * Added built-in filters for `_changes`: `_doc_ids` and `_design`.
+ * Added configuration option for TCP_NODELAY aka Nagle.
+ * Allow wildcards in vhosts definitions.
+ * More granular ETag support for views.
+ * More flexible URL rewriter.
+ * Added OS Process module to manage daemons outside of CouchDB.
+ * Added HTTP Proxy handler for more scalable externals.
+ * Added `_replicator` database to manage replications.
+ * Multiple micro-optimizations when reading data.
+ * Added CommonJS support to map functions.
+ * Added `stale=update_after` query option that triggers a view update after
+   returning a `stale=ok` response.
+ * More explicit error messages when it's not possible to access a file due
+   to lack of permissions.
+ * Added a change password-feature to Futon.
+
 ### 1.0.2
 
  Files

[21/50] git commit: update committers.txt as well

[randall]

update committers.txt as well

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1125777 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: ff5e72c24c8bf687d27c9623177ee71a34da3f6e
Parents: cede0cf
Author: Randall Leeds rand...@apache.org
Authored: Sat May 21 19:43:03 2011 +
Committer: Randall Leeds rand...@apache.org
Committed: Sat May 21 19:43:03 2011 +

--
 community/committers.txt |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ff5e72c2/community/committers.txt
--
diff --git a/community/committers.txt b/community/committers.txt
index d64b5e3..10e64ae 100644
--- a/community/committers.txt
+++ b/community/committers.txt
@@ -67,3 +67,10 @@ Mark Hammond, mhamm...@apache.org
 Robert Newson, rnew...@apache.org
 
  Contributes bug fixes and small features.
+
+Randall Leeds, rand...@apache.org
+
+ Squashes bugs and tunes performance. Tweaks API interoperabilities,
+ forward-/backward-compatibility and developer interactions. Maintains
+ CouchDB-Lounge.
+

[33/50] git commit: typo

[randall]

typo

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@986718 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 9591460061038571e3cb90bfbd6ad08a5b126326
Parents: f068dd8
Author: Jan Lehnardt j...@apache.org
Authored: Wed Aug 18 14:58:45 2010 +
Committer: Jan Lehnardt j...@apache.org
Committed: Wed Aug 18 14:58:45 2010 +

--
 downloads.html |4 ++--
 downloads.txt  |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/95914600/downloads.html
--
diff --git a/downloads.html b/downloads.html
index 61087cd..b202544 100644
--- a/downloads.html
+++ b/downloads.html
@@ -108,13 +108,12 @@ limitations under the License.
 ul
 liFix data corruption bug COUCHDB-844. Please see
 a href=http://couchdb.apache.org/notice/1.0.1.html;the release notice/a 
for details./li
-liAdded support for replication via an HTTP/HTTP proxy./li
+liAdded support for replication via an HTTP/HTTPS proxy./li
 liFixed various replicator bugs for interop with older CouchDB versions./li
 liShow fields saved along with _deleted=true. Allows for auditing of 
deletes./li
 liEnable basic-auth popup when required to access the server, to prevent
 people from getting locked out./li
 liUser interface element for querying stale (cached) views./li
-liFixed CVE-2010-2234: Apache CouchDB Cross Site Request Forgery Attack/li
 /ul
 
 h30.11.2/h3
@@ -136,6 +135,7 @@ people from getting locked out./li
 liUser documents can now be deleted by admins or the user./li
 liAvoid potential DOS attack by guarding all creation of atoms./li
 liSome Futon and JavaScript library bugfixes./li
+liFixed CVE-2010-2234: Apache CouchDB Cross Site Request Forgery Attack/li
 /ul
 
 h30.11.1/h3

http://git-wip-us.apache.org/repos/asf/couchdb/blob/95914600/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index 9dadbe1..d5ba739 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -35,7 +35,7 @@ See [the release notice](notice/1.0.1.html) for more 
information.
 
   * Fix data corruption bug COUCHDB-844. Please see
 [the release notice](http://couchdb.apache.org/notice/1.0.1.html) for 
details.
-  * Added support for replication via an HTTP/HTTP proxy.
+  * Added support for replication via an HTTP/HTTPS proxy.
   * Fixed various replicator bugs for interop with older CouchDB versions.
   * Show fields saved along with _deleted=true. Allows for auditing of deletes.
   * Enable basic-auth popup when required to access the server, to prevent

[32/50] git commit: clean up wording

[randall]

clean up wording

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@989943 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: b5f87f03bb8d032524eb42bc5f5d88e2bfe4f632
Parents: 9591460
Author: Jan Lehnardt j...@apache.org
Authored: Thu Aug 26 21:39:27 2010 +
Committer: Jan Lehnardt j...@apache.org
Committed: Thu Aug 26 21:39:27 2010 +

--
 notice/1.0.1.html |   20 ++--
 notice/1.0.1.txt  |   20 ++--
 2 files changed, 12 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/b5f87f03/notice/1.0.1.html
--
diff --git a/notice/1.0.1.html b/notice/1.0.1.html
index 7a7b649..d495127 100644
--- a/notice/1.0.1.html
+++ b/notice/1.0.1.html
@@ -80,27 +80,19 @@ limitations under the License.
 
 pdiv style=border:5px dashed #F00;padding:1em/p
 
-pstrongA REPAIR TOOL IS NOW AVAILABLE/strong/p
+pstrongA 1.0.0 RECOVERY TOOL IS NOW AVAILABLE/strong/p
 
-pDownload the a href=http://wiki.couchone.com/page/repair-tool#/;CouchDB 
1.0.0 Repair Tool/a if you want to recover your data./p
+pDownload the a href=http://wiki.couchone.com/page/repair-tool#/;CouchDB 
1.0.0 Repair Tool/a to recover data./p
 
 p/div/p
 
-h2Warning/h2
+h2Notes on a Nasty Bug/h2
 
-pIf you are using CouchDB 1.0.0 and have the default setting for 
#8216;delayed_commits#8217; (true) then you are affected by this data loss 
bug. You should read this page very carefully and apply the remedy as soon as 
practicable./p
+pDevelopers should be using 1.0.1 release only at this point; not the 1.0.0 
version. Read on to find out why./p
 
-pThis bug does not affect earlier releases of CouchDB./p
+pOn the weekend of August 7th–8th, 2010 we discovered and fixed a bug in 
CouchDB 1.0.0. The problem was subtle (cancelling a timer, without deleting the 
reference to it) but the ramifications were not: there was potential data loss 
for users of 1.0.0. The 1.0.1 release contains a permanent fix, and a 
href=../downloads.htmlis available now on the download page/a./p
 
-pEven if you have lost data due to this bug it is possible that it can be 
recovered. If you can, archive a copy of the database that has lost data, if 
not, at least do not compact your databases as the repair tool will not be 
effective if you do so. Please subscribe to the a 
href=http://couchdb.apache.org/community/lists.html;user@ or dev@ mailing 
list/a to get notified when the tool will be available./p
-
-h2Post mortem for a nasty bug/h2
-
-pOver the weekend of August 7th–8th, 2010 we discovered and fixed a nasty 
bug in CouchDB 1.0.0. The problem was subtle (cancelling a timer, without 
deleting the reference to it) but the ramifications are not: strongonce the 
bad code path is triggered, subsequent writes to the database are never 
committed./strong This means there is potential data-loss for users of 
1.0.0./p
-
-pLuckily, triggering the bad code path doesn#8217;t happen to everyone, and 
there is a hot fix that can prevent data loss (as long as it is applied before 
the server is restarted or crashes.)/p
-
-pThe 1.0.1 release will contain a permanent fix, and is expected this week. 
For now, this article will explain how to achieve data-safety on CouchDB 1.0.0. 
We will also look at the bug itself, how it happened, and what we are doing to 
prevent something similar happening again./p
+pWe are proud how quickly the CouchDB community recovered from this bug and 
went the extra mile to make sure everyone#8217;s data was safe. It is clear we 
have a group of developers who care enough about all users#8217; data that it 
aggressively pursued an #8220;edge case#8221; bug so no one would be caught 
off guard. Further, the team worked for the next week to create a repair tool 
to recover access to data which was affected by the bug. As a result, no users 
lost data permanently. Kudos!/p
 
 h2The Remedy/h2
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/b5f87f03/notice/1.0.1.txt
--
diff --git a/notice/1.0.1.txt b/notice/1.0.1.txt
index f67d004..e23bb90 100644
--- a/notice/1.0.1.txt
+++ b/notice/1.0.1.txt
@@ -5,27 +5,19 @@ Sort-Index: 061
 
   div style=border:5px dashed #F00;padding:1em
 
-**A REPAIR TOOL IS NOW AVAILABLE**
+**A 1.0.0 RECOVERY TOOL IS NOW AVAILABLE**
 
-Download the [CouchDB 1.0.0 Repair 
Tool](http://wiki.couchone.com/page/repair-tool#/) if you want to recover your 
data.
+Download the [CouchDB 1.0.0 Repair 

[28/50] git commit: move 1.0.0 notice to 1.0.1 release

[randall]

move 1.0.0 notice to 1.0.1 release

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1064422 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 25f0ba3b42048fee41df5786623c321d7d253394
Parents: d13665a
Author: Jan Lehnardt j...@apache.org
Authored: Fri Jan 28 02:02:18 2011 +
Committer: Jan Lehnardt j...@apache.org
Committed: Fri Jan 28 02:02:18 2011 +

--
 downloads.html |   24 
 downloads.txt  |   25 +
 2 files changed, 25 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/25f0ba3b/downloads.html
--
diff --git a/downloads.html b/downloads.html
index 0bdd7ba..82b013f 100644
--- a/downloads.html
+++ b/downloads.html
@@ -80,18 +80,6 @@ limitations under the License.
 
 h2Current Releases/h2
 
-pdiv style=border:5px dashed #F00;padding:1em/p
-
-pstrongCAUTION/strong/p
-
-pThe 1.0.0 release has a data-loss bug in its default configuration./p
-
-pstrongIF YOU ARE RUNNING 1.0.0, PLEASE UPGRADE TO 1.0.1 AS SOON AS 
POSSIBLE/strong/p
-
-pSee a href=notice/1.0.1.htmlthe release notice/a for more 
information./p
-
-p/div/p
-
 h31.0.2/h3
 
 h4Files/h4
@@ -148,6 +136,18 @@ scratch to fix the issue. See COUCHDB-999 for details./li
 
 h31.0.1/h3
 
+pdiv style=border:5px dashed #F00;padding:1em/p
+
+pstrongCAUTION/strong/p
+
+pThe 1.0.0 release has a data-loss bug in its default configuration./p
+
+pstrongIF YOU ARE RUNNING 1.0.0, PLEASE UPGRADE TO 1.0.1 AS SOON AS 
POSSIBLE/strong/p
+
+pSee a href=notice/1.0.1.htmlthe release notice/a for more 
information./p
+
+p/div/p
+
 h4Files/h4
 
 ul

http://git-wip-us.apache.org/repos/asf/couchdb/blob/25f0ba3b/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index f86875e..a43946d 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -10,18 +10,6 @@ The following releases of Apache CouchDB are available for 
download.
 Current Releases
 
 
-  div style=border:5px dashed #F00;padding:1em
-
-**CAUTION**
-
-The 1.0.0 release has a data-loss bug in its default configuration.
-
-**IF YOU ARE RUNNING 1.0.0, PLEASE UPGRADE TO 1.0.1 AS SOON AS POSSIBLE**
-
-See [the release notice](notice/1.0.1.html) for more information.
-
-  /div
-
 ### 1.0.2
 
  Files
@@ -74,6 +62,19 @@ See [the release notice](notice/1.0.1.html) for more 
information.
 
 ### 1.0.1
 
+  div style=border:5px dashed #F00;padding:1em
+
+**CAUTION**
+
+The 1.0.0 release has a data-loss bug in its default configuration.
+
+**IF YOU ARE RUNNING 1.0.0, PLEASE UPGRADE TO 1.0.1 AS SOON AS POSSIBLE**
+
+See [the release notice](notice/1.0.1.html) for more information.
+
+  /div
+
+
  Files
 
  * 
[apache-couchdb-1.0.1.tar.gz](http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz)

[26/50] git commit: fix license links as per guidelines http://apache.org/foundation/marks/pmcs#navigation

[randall]

fix license links as per guidelines 
http://apache.org/foundation/marks/pmcs#navigation

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1070444 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 846333ce1ad1806b72c2559bcf669ce3efba1ce0
Parents: 24a2423
Author: Jan Lehnardt j...@apache.org
Authored: Mon Feb 14 11:17:22 2011 +
Committer: Jan Lehnardt j...@apache.org
Committed: Mon Feb 14 11:17:22 2011 +

--
 license.txt |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/846333ce/license.txt
--
diff --git a/license.txt b/license.txt
index 16be82d..610373d 100644
--- a/license.txt
+++ b/license.txt
@@ -1,5 +1,5 @@
 Title: License
-Location: http://www.apache.org/licenses/LICENSE-2.0.html
+Location: http://www.apache.org/licenses/
 Navigation-Class: external
 Sort-Index: 030
 

[31/50] git commit: remove misleading Reader Access section. closes COUCHDB-496.

[randall]

remove misleading Reader Access section. closes COUCHDB-496.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1022534 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 2686fe0532c90ae4aabb55f08c29db6e92026b30
Parents: b5f87f0
Author: Robert Newson rnew...@apache.org
Authored: Thu Oct 14 13:56:23 2010 +
Committer: Robert Newson rnew...@apache.org
Committed: Thu Oct 14 13:56:23 2010 +

--
 docs/overview.html |   17 -
 docs/overview.txt  |   18 --
 2 files changed, 0 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/2686fe05/docs/overview.html
--
diff --git a/docs/overview.html b/docs/overview.html
index 31cb5cd..81d73a5 100644
--- a/docs/overview.html
+++ b/docs/overview.html
@@ -256,23 +256,6 @@ can create other administrator accounts and update design 
documents. Design
 documents are special documents containing view definitions and other special 
 formulas, as well as regular fields and blobs./p
 
-h2Reader Access/h2
-
-pTo protect document contents, CouchDB documents can have a reader list. 
This is 
-an optional list of reader-names allowed to read the document. When a reader 
-list is used, protected documents are only viewable by listed users./p
-
-pWhen a user accesses a database, the his/her credentials (name and 
password) 
-are used to dynamically determine his reader names. The user credentials are 
-input to a JavaScript function and the function returns a list of names for 
the 
-user, or an error if the user credentials are wrong./p
-
-pWhen a document is protected by reader access lists, any user attempting to 
-read the document must be listed. Reader lists are enforced in views too. 
-Documents that are not allowed to be read by the user are dynamically filtered 
-out of views, keeping the document row and extracted information invisible to 
-non-readers./p
-
 h2Update Validation/h2
 
 pAs documents written to disk, they can be validated dynamically by 
JavaScript 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/2686fe05/docs/overview.txt
--
diff --git a/docs/overview.txt b/docs/overview.txt
index 7100b36..5a8a260 100644
--- a/docs/overview.txt
+++ b/docs/overview.txt
@@ -198,24 +198,6 @@ can create other administrator accounts and update design 
documents. Design
 documents are special documents containing view definitions and other special 
 formulas, as well as regular fields and blobs.
 
-Reader Access
--
-
-To protect document contents, CouchDB documents can have a reader list. This 
is 
-an optional list of reader-names allowed to read the document. When a reader 
-list is used, protected documents are only viewable by listed users.
-
-When a user accesses a database, the his/her credentials (name and password) 
-are used to dynamically determine his reader names. The user credentials are 
-input to a JavaScript function and the function returns a list of names for 
the 
-user, or an error if the user credentials are wrong.
-
-When a document is protected by reader access lists, any user attempting to 
-read the document must be listed. Reader lists are enforced in views too. 
-Documents that are not allowed to be read by the user are dynamically filtered 
-out of views, keeping the document row and extracted information invisible to 
-non-readers.
-
 Update Validation
 -
 

[27/50] git commit: add CVE-2010-3854

[randall]

add CVE-2010-3854

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1065356 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 24a2423323980485f6e3e295024ca963b79f3747
Parents: 25f0ba3
Author: Jan Lehnardt j...@apache.org
Authored: Sun Jan 30 19:16:21 2011 +
Committer: Jan Lehnardt j...@apache.org
Committed: Sun Jan 30 19:16:21 2011 +

--
 security.html |1 +
 security.txt  |3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/24a24233/security.html
--
diff --git a/security.html b/security.html
index ccd4e31..cb71b51 100644
--- a/security.html
+++ b/security.html
@@ -81,6 +81,7 @@ limitations under the License.
 ul
 lia href=http://markmail.org/message/7x6ljrjsj5u3zr4h;CVE-2010-0009/a 
affects all versions of Apache CouchDB prior to 0.11.0./li
 lia 
href=http://mail-archives.apache.org/mod_mbox/couchdb-dev/201008.mbox/%3cd105f928-15c0-403a-a958-1fd2648f5...@apache.org%3e;CVE-2010-2234/a
 affects all versions of Apache CouchDB prior to 0.11.2./li
+lia 
href=http://mail-archives.apache.org/mod_mbox/couchdb-dev/201101.mbox/%3cc840f655-c8c5-4ec6-8aa8-dd223e39c...@apache.org%3e;CVE-2010-3854/a
 affects all versions of Apache CouchDB prior to 1.0.1./li
 /ul
 
 h2Reporting New Security Problems with Apache CouchDB/h2

http://git-wip-us.apache.org/repos/asf/couchdb/blob/24a24233/security.txt
--
diff --git a/security.txt b/security.txt
index cef9d63..ec7c367 100644
--- a/security.txt
+++ b/security.txt
@@ -12,9 +12,12 @@ List of Vulnerabilities
 
 * [CVE-2010-0009][] affects all versions of Apache CouchDB prior to 0.11.0.
 * [CVE-2010-2234][] affects all versions of Apache CouchDB prior to 0.11.2.
+* [CVE-2010-3854][] affects all versions of Apache CouchDB prior to 1.0.1.
 
 [CVE-2010-0009]: http://markmail.org/message/7x6ljrjsj5u3zr4h
 [CVE-2010-2234]: 
http://mail-archives.apache.org/mod_mbox/couchdb-dev/201008.mbox/%%3cd105f928-15c0-403a-a958-1fd2648f5...@apache.org%%3e
+[CVE-2010-3854]:  
http://mail-archives.apache.org/mod_mbox/couchdb-dev/201101.mbox/%%3cc840f655-c8c5-4ec6-8aa8-dd223e39c...@apache.org%%3e
+
 
 Reporting New Security Problems with Apache CouchDB
 --- 

[30/50] git commit: remove unneeded notice

[randall]

remove unneeded notice

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1027111 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 7a437cdab53323266ad6a4c568eb58f96273ebf7
Parents: 2686fe0
Author: Jan Lehnardt j...@apache.org
Authored: Mon Oct 25 13:35:13 2010 +
Committer: Jan Lehnardt j...@apache.org
Committed: Mon Oct 25 13:35:13 2010 +

--
 community/code.html |6 --
 community/code.txt  |6 --
 2 files changed, 0 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7a437cda/community/code.html
--
diff --git a/community/code.html b/community/code.html
index 910e05d..8302e9e 100644
--- a/community/code.html
+++ b/community/code.html
@@ -105,12 +105,6 @@ Foundation maintains a mirror at a 
href=http://git.apache.org/;http://git.apa
 
 pIf you like working on a href=https://github.com/;GitHub/a, here is 
the a href=https://github.com/apache/couchdb;GitHub Apache CouchDB
 mirror/a./p
-
-pemNote:/em We can’t accept empull-requests/em for contributions 
for legal reasons. If you
-are not a committer and want to contribute code, we have to ask you a 
href=https://issues.apache.org/jira/browse/COUCHDB;open a
-ticket/a with your patch attached. Merging your patch can happen via git 
though,
-so if you also include a link to your repository and commit we can make use of 
that.
-But again, it is emcruical/em that you a 
href=https://issues.apache.org/jira/browse/COUCHDB;attach your patch to a 
JIRA issue first/a./p
 div id=clear/div/div
 /div/div
 div id=footer

http://git-wip-us.apache.org/repos/asf/couchdb/blob/7a437cda/community/code.txt
--
diff --git a/community/code.txt b/community/code.txt
index 310529c..b3de538 100644
--- a/community/code.txt
+++ b/community/code.txt
@@ -32,12 +32,6 @@ Foundation maintains a mirror at 
[http://git.apache.org/][asf-git]
 If you like working on [GitHub][], here is the [GitHub Apache CouchDB
 mirror][asf-github].
 
-_Note:_ We can’t accept _pull-requests_ for contributions for legal reasons. 
If you
-are not a committer and want to contribute code, we have to ask you [open a
-ticket][jira] with your patch attached. Merging your patch can happen via git 
though,
-so if you also include a link to your repository and commit we can make use of 
that.
-But again, it is _cruical_ that you [attach your patch to a JIRA issue 
first][jira].
-
 [git]: http://git-scm.com/
 [asf-git]: http://git.apache.org/
 [asf-git-committers]: http://wiki.apache.org/general/GitAtApache

[19/50] git commit: revert for now

[randall]

revert for now

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1131135 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: e8cb607a8b0acc3cb45f8efbe77393b9bc0eb0b1
Parents: 393b353
Author: Robert Newson rnew...@apache.org
Authored: Fri Jun 3 18:28:16 2011 +
Committer: Robert Newson rnew...@apache.org
Committed: Fri Jun 3 18:28:16 2011 +

--
 downloads.html |   33 -
 downloads.txt  |   29 -
 2 files changed, 0 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e8cb607a/downloads.html
--
diff --git a/downloads.html b/downloads.html
index e5be2d8..5ceb2ce 100644
--- a/downloads.html
+++ b/downloads.html
@@ -81,39 +81,6 @@ limitations under the License.
 
 h2Current Releases/h2
 
-h31.1.0/h3
-
-h4Files/h4
-
-ul
-lia 
href=http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz;apache-couchdb-1.1.0.tar.gz/a
-[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.asc;OpenPGP/a]
-[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.md5;MD5/a]
-[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.sha;SHA/a]/li
-/ul
-
-h4Changes/h4
-
-ul
-liNative SSL support./li
-liAdded support for HTTP range requests for attachments./li
-liAdded built-in filters for code_changes/code: code_doc_ids/code 
and code_design/code./li
-liAdded configuration option for TCP_NODELAY aka #8220;Nagle#8221;./li
-liAllow wildcards in vhosts definitions./li
-liMore granular ETag support for views./li
-liMore flexible URL rewriter./li
-liAdded OS Process module to manage daemons outside of CouchDB./li
-liAdded HTTP Proxy handler for more scalable externals./li
-liAdded code_replicator/code database to manage replications./li
-liMultiple micro-optimizations when reading data./li
-liAdded CommonJS support to map functions./li
-liAdded codestale=update_after/code query option that triggers a view 
update after
-returning a codestale=ok/code response./li
-liMore explicit error messages when it#8217;s not possible to access a file 
due
-to lack of permissions./li
-liAdded a #8220;change password#8221;-feature to Futon./li
-/ul
-
 h31.0.2/h3
 
 h4Files/h4

http://git-wip-us.apache.org/repos/asf/couchdb/blob/e8cb607a/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index caed7b3..a43946d 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -10,35 +10,6 @@ The following releases of Apache CouchDB are available for 
download.
 Current Releases
 
 
-### 1.1.0
-
- Files
-
- * 
[apache-couchdb-1.1.0.tar.gz](http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz)
-   
[[OpenPGP](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.asc)]
-   
[[MD5](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.md5)]
-   
[[SHA](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.sha)]
-
- Changes
-
- * Native SSL support.
- * Added support for HTTP range requests for attachments.
- * Added built-in filters for `_changes`: `_doc_ids` and `_design`.
- * Added configuration option for TCP_NODELAY aka Nagle.
- * Allow wildcards in vhosts definitions.
- * More granular ETag support for views.
- * More flexible URL rewriter.
- * Added OS Process module to manage daemons outside of CouchDB.
- * Added HTTP Proxy handler for more scalable externals.
- * Added `_replicator` database to manage replications.
- * Multiple micro-optimizations when reading data.
- * Added CommonJS support to map functions.
- * Added `stale=update_after` query option that triggers a view update after
-   returning a `stale=ok` response.
- * More explicit error messages when it's not possible to access a file due
-   to lack of permissions.
- * Added a change password-feature to Futon.
-
 ### 1.0.2
 
  Files

[22/50] git commit: add my contributions blurb to committers page

[randall]

add my contributions blurb to committers page

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1125663 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: cede0cfadccf4e2536a5b8891b19a96f6362b1d8
Parents: e1e233a
Author: Randall Leeds rand...@apache.org
Authored: Sat May 21 10:45:39 2011 +
Committer: Randall Leeds rand...@apache.org
Committed: Sat May 21 10:45:39 2011 +

--
 community/committers.html |4 
 1 files changed, 4 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/cede0cfa/community/committers.html
--
diff --git a/community/committers.html b/community/committers.html
index 997c601..cce0518 100644
--- a/community/committers.html
+++ b/community/committers.html
@@ -141,6 +141,10 @@ limitations under the License.
 pRobert Newson, a 
href=#x6D;#x61;#x69;l#x74;#x6F;:#x72;#x6E;#x65;#x77;#115;#111;#110;#64;#x61;#x70;#x61;#99;#104;#101;#x2E;#111;#x72;#x67;#x72;#x6E;#x65;#x77;#115;#111;#110;#64;#x61;#x70;#x61;#99;#104;#101;#x2E;#111;#x72;#x67;/a/p
 
 pContributes bug fixes and small features./p
+
+pRandall Leeds, a 
href=m#x61;i#x6C;#x74;#x6F;#x3A;#x72;#x61;#x6E;#x64;#x61;#x6C;l#x40;#x61;#x70;#x61;#x63;#x68;#x65;#x2E;#x6F;#x72;#x67;r#x61;#x6E;d#x61;#x6C;#x6C;#x40;#x61;#x70;#x61;#x63;#x68;#x65;#x2E;#x6F;#x72;#x67;/a/p
+
+pSquashes bugs and tunes performance. Tweaks API interoperabilities, 
forward-/backward-compatibility and developer interactions. Maintains 
CouchDB-Lounge./p
 div id=clear/div/div
 /div/div
 div id=footer

[18/50] git commit: add 1.1.0 release

[randall]

add 1.1.0 release

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1132576 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: e24b4a9808a5708478a77072e144e6673738646c
Parents: e8cb607
Author: Robert Newson rnew...@apache.org
Authored: Mon Jun 6 10:14:40 2011 +
Committer: Robert Newson rnew...@apache.org
Committed: Mon Jun 6 10:14:40 2011 +

--
 downloads.html |   33 +
 downloads.txt  |   29 +
 2 files changed, 62 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e24b4a98/downloads.html
--
diff --git a/downloads.html b/downloads.html
index 5ceb2ce..e5be2d8 100644
--- a/downloads.html
+++ b/downloads.html
@@ -81,6 +81,39 @@ limitations under the License.
 
 h2Current Releases/h2
 
+h31.1.0/h3
+
+h4Files/h4
+
+ul
+lia 
href=http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz;apache-couchdb-1.1.0.tar.gz/a
+[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.asc;OpenPGP/a]
+[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.md5;MD5/a]
+[a 
href=http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.sha;SHA/a]/li
+/ul
+
+h4Changes/h4
+
+ul
+liNative SSL support./li
+liAdded support for HTTP range requests for attachments./li
+liAdded built-in filters for code_changes/code: code_doc_ids/code 
and code_design/code./li
+liAdded configuration option for TCP_NODELAY aka #8220;Nagle#8221;./li
+liAllow wildcards in vhosts definitions./li
+liMore granular ETag support for views./li
+liMore flexible URL rewriter./li
+liAdded OS Process module to manage daemons outside of CouchDB./li
+liAdded HTTP Proxy handler for more scalable externals./li
+liAdded code_replicator/code database to manage replications./li
+liMultiple micro-optimizations when reading data./li
+liAdded CommonJS support to map functions./li
+liAdded codestale=update_after/code query option that triggers a view 
update after
+returning a codestale=ok/code response./li
+liMore explicit error messages when it#8217;s not possible to access a file 
due
+to lack of permissions./li
+liAdded a #8220;change password#8221;-feature to Futon./li
+/ul
+
 h31.0.2/h3
 
 h4Files/h4

http://git-wip-us.apache.org/repos/asf/couchdb/blob/e24b4a98/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index a43946d..caed7b3 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -10,6 +10,35 @@ The following releases of Apache CouchDB are available for 
download.
 Current Releases
 
 
+### 1.1.0
+
+ Files
+
+ * 
[apache-couchdb-1.1.0.tar.gz](http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz)
+   
[[OpenPGP](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.asc)]
+   
[[MD5](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.md5)]
+   
[[SHA](http://www.apache.org/dist/couchdb/1.1.0/apache-couchdb-1.1.0.tar.gz.sha)]
+
+ Changes
+
+ * Native SSL support.
+ * Added support for HTTP range requests for attachments.
+ * Added built-in filters for `_changes`: `_doc_ids` and `_design`.
+ * Added configuration option for TCP_NODELAY aka Nagle.
+ * Allow wildcards in vhosts definitions.
+ * More granular ETag support for views.
+ * More flexible URL rewriter.
+ * Added OS Process module to manage daemons outside of CouchDB.
+ * Added HTTP Proxy handler for more scalable externals.
+ * Added `_replicator` database to manage replications.
+ * Multiple micro-optimizations when reading data.
+ * Added CommonJS support to map functions.
+ * Added `stale=update_after` query option that triggers a view update after
+   returning a `stale=ok` response.
+ * More explicit error messages when it's not possible to access a file due
+   to lack of permissions.
+ * Added a change password-feature to Futon.
+
 ### 1.0.2
 
  Files

[34/50] git commit: add CVE-2010-2234 to the security page

[randall]

add CVE-2010-2234 to the security page

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@986404 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: f068dd8ddbc0eb28331328e0abe35dffd1da2cd8
Parents: 6c03534
Author: Jan Lehnardt j...@apache.org
Authored: Tue Aug 17 17:26:25 2010 +
Committer: Jan Lehnardt j...@apache.org
Committed: Tue Aug 17 17:26:25 2010 +

--
 security.html |5 -
 security.txt  |5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/f068dd8d/security.html
--
diff --git a/security.html b/security.html
index 7624e0f..ccd4e31 100644
--- a/security.html
+++ b/security.html
@@ -78,7 +78,10 @@ limitations under the License.
 
 h2List of Vulnerabilities/h2
 
-pa href=http://markmail.org/message/7x6ljrjsj5u3zr4h;CVE-2010-0009/a 
affects all versions of Apache CouchDB prior to 0.11.0./p
+ul
+lia href=http://markmail.org/message/7x6ljrjsj5u3zr4h;CVE-2010-0009/a 
affects all versions of Apache CouchDB prior to 0.11.0./li
+lia 
href=http://mail-archives.apache.org/mod_mbox/couchdb-dev/201008.mbox/%3cd105f928-15c0-403a-a958-1fd2648f5...@apache.org%3e;CVE-2010-2234/a
 affects all versions of Apache CouchDB prior to 0.11.2./li
+/ul
 
 h2Reporting New Security Problems with Apache CouchDB/h2
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/f068dd8d/security.txt
--
diff --git a/security.txt b/security.txt
index 85e80e9..cef9d63 100644
--- a/security.txt
+++ b/security.txt
@@ -10,10 +10,11 @@ Sort-Index: 090
 List of Vulnerabilities
 ---
 
-[CVE-2010-0009][CVE-2010-0009] affects all versions of Apache CouchDB prior to 
0.11.0.
+* [CVE-2010-0009][] affects all versions of Apache CouchDB prior to 0.11.0.
+* [CVE-2010-2234][] affects all versions of Apache CouchDB prior to 0.11.2.
 
 [CVE-2010-0009]: http://markmail.org/message/7x6ljrjsj5u3zr4h
-
+[CVE-2010-2234]: 
http://mail-archives.apache.org/mod_mbox/couchdb-dev/201008.mbox/%%3cd105f928-15c0-403a-a958-1fd2648f5...@apache.org%%3e
 
 Reporting New Security Problems with Apache CouchDB
 --- 

[17/50] git commit: remove references to 1.0.1, 0.11.1 and 0.11.0 prior to archival.

[randall]

remove references to 1.0.1, 0.11.1 and 0.11.0 prior to archival.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1132905 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 8349c121351f5c0ca4f65da84409800a94208f0c
Parents: e24b4a9
Author: Robert Newson rnew...@apache.org
Authored: Tue Jun 7 08:28:09 2011 +
Committer: Robert Newson rnew...@apache.org
Committed: Tue Jun 7 08:28:09 2011 +

--
 downloads.html |  157 ---
 downloads.txt  |  146 ---
 2 files changed, 24 insertions(+), 279 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/8349c121/downloads.html
--
diff --git a/downloads.html b/downloads.html
index e5be2d8..a3621c2 100644
--- a/downloads.html
+++ b/downloads.html
@@ -116,6 +116,18 @@ to lack of permissions./li
 
 h31.0.2/h3
 
+pdiv style=border:5px dashed #F00;padding:1em/p
+
+pstrongCAUTION/strong/p
+
+pThe 1.0.0 release has a data-loss bug in its default configuration./p
+
+pstrongIF YOU ARE RUNNING 1.0.0, PLEASE UPGRADE TO 1.0.1 (OR HIGHER) AS 
SOON AS POSSIBLE/strong/p
+
+pSee a href=notice/1.0.1.htmlthe release notice/a for more 
information./p
+
+p/div/p
+
 h4Files/h4
 
 ul
@@ -168,42 +180,6 @@ this error is seen in the logs users should rebuild their 
views from
 scratch to fix the issue. See COUCHDB-999 for details./li
 /ul
 
-h31.0.1/h3
-
-pdiv style=border:5px dashed #F00;padding:1em/p
-
-pstrongCAUTION/strong/p
-
-pThe 1.0.0 release has a data-loss bug in its default configuration./p
-
-pstrongIF YOU ARE RUNNING 1.0.0, PLEASE UPGRADE TO 1.0.1 AS SOON AS 
POSSIBLE/strong/p
-
-pSee a href=notice/1.0.1.htmlthe release notice/a for more 
information./p
-
-p/div/p
-
-h4Files/h4
-
-ul
-lia 
href=http://www.apache.org/dyn/closer.cgi?path=/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz;apache-couchdb-1.0.1.tar.gz/a
-[a 
href=http://www.apache.org/dist/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz.asc;OpenPGP/a]
-[a 
href=http://www.apache.org/dist/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz.md5;MD5/a]
-[a 
href=http://www.apache.org/dist/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz.sha;SHA/a]/li
-/ul
-
-h4Changes/h4
-
-ul
-liFix data corruption bug COUCHDB-844. Please see
-a href=http://couchdb.apache.org/notice/1.0.1.html;the release notice/a 
for details./li
-liAdded support for replication via an HTTP/HTTPS proxy./li
-liFixed various replicator bugs for interop with older CouchDB versions./li
-liShow fields saved along with _deleted=true. Allows for auditing of 
deletes./li
-liEnable basic-auth popup when required to access the server, to prevent
-people from getting locked out./li
-liUser interface element for querying stale (cached) views./li
-/ul
-
 h30.11.2/h3
 
 h4Files/h4
@@ -226,115 +202,6 @@ people from getting locked out./li
 liFixed CVE-2010-2234: Apache CouchDB Cross Site Request Forgery Attack/li
 /ul
 
-h30.11.1/h3
-
-h4Files/h4
-
-ul
-lia 
href=http://www.apache.org/dyn/closer.cgi?path=/couchdb/0.11.1/apache-couchdb-0.11.1.tar.gz;apache-couchdb-0.11.1.tar.gz/a
-[a 
href=http://www.apache.org/dist/couchdb/0.11.1/apache-couchdb-0.11.1.tar.gz.asc;OpenPGP/a]
-[a 
href=http://www.apache.org/dist/couchdb/0.11.1/apache-couchdb-0.11.1.tar.gz.md5;MD5/a]
-[a 
href=http://www.apache.org/dist/couchdb/0.11.1/apache-couchdb-0.11.1.tar.gz.sha;SHA/a]/li
-/ul
-
-h4Changes/h4
-
-ul
-liMask passwords in active tasks and logging./li
-liUpdate mochijson2 to allow output of BigNums not in float form./li
-liAdded support for X-HTTP-METHOD-OVERRIDE./li
-liDisable jsonp by default./li
-liAccept gzip encoded standalone attachments./li
-liMade max_concurrent_connections configurable./li
-liAdded continuous replication option to Futon./li
-liAdded option to replicating test results anonymously to a community
-CouchDB instance./li
-liAllow creation and deletion of config entries in Futon./li
-liFixed various UI issues in Futon./li
-liFixed compatibility with the Erlang R14 series./li
-liFixed warnings on Linux builds./li
-liFixed build error when aclocal needs to be called during the build./li
-liRequire ICU 4.3.1./li
-liFixed compatibility with Solaris./li
-liAdded authentication redirect URL to log in clients./li
-liAdded authentication caching, to avoid repeated opening and closing of the
-users database for each request requiring authentication./li
-liMade authentication timeout configurable./li
-liTemporary views are now admin-only resources./li
-liDon#8217;t require a revpos for attachment 

[24/50] git commit: remove 1.0 notice, add paragraph about the ASF as per the guidelines http://apache.org/foundation/marks/pmcs#navigation

[randall]

remove 1.0 notice, add paragraph about the ASF as per the guidelines 
http://apache.org/foundation/marks/pmcs#navigation

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@1070446 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 78c76f7fcea98007685ba39364919afc7b4c1e3e
Parents: 646c5f6
Author: Jan Lehnardt j...@apache.org
Authored: Mon Feb 14 11:21:18 2011 +
Committer: Jan Lehnardt j...@apache.org
Committed: Mon Feb 14 11:21:18 2011 +

--
 community/committers.html |   24 
 community/lists.html  |   16 
 index.html|   13 +
 index.txt |   12 +---
 4 files changed, 38 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/78c76f7f/community/committers.html
--
diff --git a/community/committers.html b/community/committers.html
index b3c1cde..461f2b0 100644
--- a/community/committers.html
+++ b/community/committers.html
@@ -78,66 +78,66 @@ limitations under the License.
 /div
   div id=contenth1Committers/h1
 
-pa href=http://damienkatz.net/;Damien Katz/a, a 
href=#x6D;#x61;#x69;#x6C;#116;#111;:#x64;#97;#x6D;#105;#x65;n#64;#x61;p#x61;#x63;#104;#101;#46;#111;#x72;g#x64;#97;#x6D;#105;#x65;n#64;#x61;p#x61;#x63;#104;#101;#46;#111;#x72;g/a/p
+pa href=http://damienkatz.net/;Damien Katz/a, a 
href=#x6D;#97;#105;#x6C;#x74;#111;:#x64;#97;#x6D;#x69;#101;#110;#64;#x61;#112;#x61;ch#101;#x2E;#x6F;#x72;#x67;#x64;#97;#x6D;#x69;#101;#110;#64;#x61;#112;#x61;ch#101;#x2E;#x6F;#x72;#x67;/a/p
 
 pOriginal developer and Apache CouchDB PMC Chair./p
 
-pa href=http://jan.prima.de/;Jan Lehnardt/a, a 
href=#109;#97;#x69;#108;#116;#x6F;:#106;#97;#110;#64;#97;#112;#97;#99;#104;#101;#46;#111;#114;#103;#106;#97;#110;#64;#97;#112;#97;#99;#104;#101;#46;#111;#114;#103;/a/p
+pa href=http://jan.prima.de/;Jan Lehnardt/a, a 
href=#109;#x61;#x69;#x6C;t#111;:#106;#x61;#x6E;#64;#x61;#x70;#97;#99;#x68;e#x2E;#x6F;#x72;#103;#106;#x61;#x6E;#64;#x61;#x70;#97;#99;#x68;e#x2E;#x6F;#x72;#103;/a/p
 
 pWorked on the original UNIX port and now works on all ends in CouchDB.
He is a freelancing CouchDB consultant and gives presentations around the
world./p
 
-pa href=http://tumbolia.org/nslater;Noah Slater/a, a 
href=#x6D;#x61;#x69;#x6C;#116;o:#x6E;s#108;#97;#116;#x65;r#64;#x61;#x70;#x61;#99;#x68;#101;#46;#111;#x72;g#x6E;s#108;#97;#116;#x65;r#64;#x61;#x70;#x61;#99;#x68;#101;#46;#111;#x72;g/a/p
+pa href=http://tumbolia.org/nslater;Noah Slater/a, a 
href=#109;#x61;#105;#x6C;#116;#111;:#x6E;#x73;#108;#97;t#101;#x72;#64;#97;#112;#97;#99;h#x65;#46;#111;#114;#103;#x6E;#x73;#108;#97;t#101;#x72;#64;#97;#112;#97;#99;h#x65;#46;#111;#114;#103;/a/p
 
 pDeveloped and maintains the Autotools build system and application
infrastructure. He is CouchDB#8217;s release manager and maintains a 
number of
related packages for Debian GNU/Linux./p
 
-pa href=http://www.cmlenz.net/;Christopher Lenz/a, a 
href=#109;#x61;#x69;l#116;#111;:#x63;#109;#108;#101;#110;#122;#64;#97;#112;#x61;#x63;#104;#x65;#46;#x6F;#114;#103;#x63;#109;#108;#101;#110;#122;#64;#97;#112;#x61;#x63;#104;#x65;#46;#x6F;#114;#103;/a/p
+pa href=http://www.cmlenz.net/;Christopher Lenz/a, a 
href=#x6D;#x61;#105;#x6C;#x74;#111;:#99;m#108;#101;#110;#x7A;#64;#x61;#x70;a#x63;#x68;#x65;#x2E;o#x72;#x67;#99;m#108;#101;#110;#x7A;#64;#x61;#x70;a#x63;#x68;#x65;#x2E;o#x72;#x67;/a/p
 
 pDeveloped and maintains Futon, the Web administration console. He works on
the JavaScript view engine, SpiderMonkey and MochiWeb integration in
addition to an external Python client./p
 
-pa href=http://jchris.mfdz.com;J. Chris Anderson/a, a 
href=#x6D;#x61;#105;#x6C;#116;#x6F;:#106;#x63;#x68;#114;#x69;#115;#64;#97;#x70;#x61;#99;h#x65;#46;#111;r#103;#106;#x63;#x68;#114;#x69;#115;#64;#97;#x70;#x61;#99;h#x65;#46;#111;r#103;/a/p
+pa href=http://jchris.mfdz.com;J. Chris Anderson/a, a 
href=#109;#97;#x69;#x6C;#116;#x6F;:#x6A;#99;#x68;#114;#x69;#115;#64;#97;#x70;#97;#x63;#104;#101;#46;#x6F;#114;#103;#x6A;#99;#x68;#114;#x69;#115;#64;#97;#x70;#97;#x63;#104;#101;#46;#x6F;#114;#103;/a/p
 
 pUpgraded the Erlang JSON term format. Integrates community patches,
   particularly related to the HTTP API and the MapReduce system. Gives talks 
and
   presentations about CouchDB, with an eye toward recruiting more 
developers./p
 
-pa href=http://www.davispj.com/;Paul J. Davis/a, a 

[44/50] git commit: add note about not compacting.

[randall]

add note about not compacting.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@983817 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: b25f6b8158fc4e715601f4567770b513fd6f9acf
Parents: 55f6c87
Author: Robert Newson rnew...@apache.org
Authored: Mon Aug 9 20:52:10 2010 +
Committer: Robert Newson rnew...@apache.org
Committed: Mon Aug 9 20:52:10 2010 +

--
 notice/1.0.1.html |2 +-
 notice/1.0.1.txt  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/b25f6b81/notice/1.0.1.html
--
diff --git a/notice/1.0.1.html b/notice/1.0.1.html
index 48fbf23..c853206 100644
--- a/notice/1.0.1.html
+++ b/notice/1.0.1.html
@@ -84,7 +84,7 @@ limitations under the License.
 
 pThis bug does not affect earlier releases of CouchDB./p
 
-pEven if you have lost data due to this bug it is possible that it can be 
recovered. If you can, archive a copy of the database that has lost data. 
Please subscribe to the a 
href=http://couchdb.apache.org/community/lists.html;user@ or dev@ mailing 
list/a to get notified when the tool will be available./p
+pEven if you have lost data due to this bug it is possible that it can be 
recovered. If you can, archive a copy of the database that has lost data, if 
not, at least do not compact your databases as the repair tool will not be 
effective if you do so. Please subscribe to the a 
href=http://couchdb.apache.org/community/lists.html;user@ or dev@ mailing 
list/a to get notified when the tool will be available./p
 
 h2Post mortem for a nasty bug/h2
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/b25f6b81/notice/1.0.1.txt
--
diff --git a/notice/1.0.1.txt b/notice/1.0.1.txt
index c30785f..2763ad3 100644
--- a/notice/1.0.1.txt
+++ b/notice/1.0.1.txt
@@ -9,7 +9,7 @@ If you are using CouchDB 1.0.0 and have the default setting for 
'delayed_commits
 
 This bug does not affect earlier releases of CouchDB.
 
-Even if you have lost data due to this bug it is possible that it can be 
recovered. If you can, archive a copy of the database that has lost data. 
Please subscribe to the [user@ or dev@ mailing 
list](http://couchdb.apache.org/community/lists.html) to get notified when the 
tool will be available.
+Even if you have lost data due to this bug it is possible that it can be 
recovered. If you can, archive a copy of the database that has lost data, if 
not, at least do not compact your databases as the repair tool will not be 
effective if you do so. Please subscribe to the [user@ or dev@ mailing 
list](http://couchdb.apache.org/community/lists.html) to get notified when the 
tool will be available.
 
 ## Post mortem for a nasty bug
 

[42/50] git commit: Fixed the 1.0.1.txt bookmarklet.

[randall]

Fixed the 1.0.1.txt bookmarklet.

Apparently there was Python string interpolation. This requires 
literal percent signs to be doubled up. Ie, %% - %. 



git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@984144 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: a663d17d8a35f6515b83c9442744696ab42d87b5
Parents: 05aa876
Author: Paul Joseph Davis dav...@apache.org
Authored: Tue Aug 10 17:42:33 2010 +
Committer: Paul Joseph Davis dav...@apache.org
Committed: Tue Aug 10 17:42:33 2010 +

--
 community/committers.html |   24 
 community/lists.html  |   16 
 notice/1.0.1.txt  |2 +-
 notice/full_commit.js |   13 -
 4 files changed, 33 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/a663d17d/community/committers.html
--
diff --git a/community/committers.html b/community/committers.html
index c539c02..ee69128 100644
--- a/community/committers.html
+++ b/community/committers.html
@@ -78,66 +78,66 @@ limitations under the License.
 /div
   div id=contenth1Committers/h1
 
-pa href=http://damienkatz.net/;Damien Katz/a, a 
href=#x6D;#97;#x69;#108;#x74;#111;:#x64;#x61;#109;#x69;#101;n#64;#x61;#112;#x61;#99;#104;#101;.#x6F;#114;#103;#x64;#x61;#109;#x69;#101;n#64;#x61;#112;#x61;#99;#104;#101;.#x6F;#114;#103;/a/p
+pa href=http://damienkatz.net/;Damien Katz/a, a 
href=#x6D;#x61;#105;#x6C;#x74;#x6F;:#x64;a#x6D;#105;#x65;#x6E;#64;#x61;p#97;#99;#x68;#x65;#46;#x6F;#114;#x67;#x64;a#x6D;#105;#x65;#x6E;#64;#x61;p#97;#99;#x68;#x65;#46;#x6F;#114;#x67;/a/p
 
 pOriginal developer and Apache CouchDB PMC Chair./p
 
-pa href=http://jan.prima.de/;Jan Lehnardt/a, a 
href=#x6D;#x61;i#108;#116;o:#x6A;#97;#x6E;#64;#97;#x70;#x61;#99;#x68;#x65;#46;#111;#x72;#x67;#x6A;#97;#x6E;#64;#97;#x70;#x61;#99;#x68;#x65;#46;#111;#x72;#x67;/a/p
+pa href=http://jan.prima.de/;Jan Lehnardt/a, a 
href=#109;#x61;#105;#x6C;t#x6F;:#106;#x61;#110;#64;#97;#x70;#x61;#99;#104;#x65;#46;#x6F;#x72;#103;#106;#x61;#110;#64;#97;#x70;#x61;#99;#104;#x65;#46;#x6F;#x72;#103;/a/p
 
 pWorked on the original UNIX port and now works on all ends in CouchDB.
He is a freelancing CouchDB consultant and gives presentations around the
world./p
 
-pa href=http://tumbolia.org/nslater;Noah Slater/a, a 
href=#x6D;#97;#x69;#108;#116;#x6F;:#110;#115;#108;#x61;#116;e#x72;#64;a#x70;#97;#99;#104;#101;#46;o#x72;#x67;#110;#115;#108;#x61;#116;e#x72;#64;a#x70;#97;#99;#104;#101;#46;o#x72;#x67;/a/p
+pa href=http://tumbolia.org/nslater;Noah Slater/a, a 
href=#109;#x61;#x69;#x6C;#x74;#111;:#110;#115;#108;a#x74;#x65;#x72;#64;#x61;p#x61;#99;h#x65;#x2E;#111;r#103;#110;#115;#108;a#x74;#x65;#x72;#64;#x61;p#x61;#99;h#x65;#x2E;#111;r#103;/a/p
 
 pDeveloped and maintains the Autotools build system and application
infrastructure. He is CouchDB#8217;s release manager and maintains a 
number of
related packages for Debian GNU/Linux./p
 
-pa href=http://www.cmlenz.net/;Christopher Lenz/a, a 
href=#109;#x61;#105;#x6C;to:#99;#x6D;#108;#x65;#x6E;#x7A;#64;#x61;#112;#97;#99;h#101;#46;#x6F;#x72;#103;#99;#x6D;#108;#x65;#x6E;#x7A;#64;#x61;#112;#97;#99;h#101;#46;#x6F;#x72;#103;/a/p
+pa href=http://www.cmlenz.net/;Christopher Lenz/a, a 
href=#109;#x61;#x69;#x6C;#x74;#x6F;:#x63;m#108;#101;#110;#122;#64;#x61;#112;#x61;#99;#104;#101;#x2E;#x6F;#114;#x67;#x63;m#108;#101;#110;#122;#64;#x61;#112;#x61;#99;#104;#101;#x2E;#x6F;#114;#x67;/a/p
 
 pDeveloped and maintains Futon, the Web administration console. He works on
the JavaScript view engine, SpiderMonkey and MochiWeb integration in
addition to an external Python client./p
 
-pa href=http://jchris.mfdz.com;J. Chris Anderson/a, a 
href=#x6D;#x61;#105;#x6C;#116;#111;:#106;#99;#x68;#114;#x69;#x73;#64;#x61;#112;#x61;#x63;#104;#x65;#x2E;#x6F;#114;#x67;#106;#99;#x68;#114;#x69;#x73;#64;#x61;#112;#x61;#x63;#104;#x65;#x2E;#x6F;#114;#x67;/a/p
+pa href=http://jchris.mfdz.com;J. Chris Anderson/a, a 
href=#x6D;#97;#105;#x6C;#x74;#x6F;:#x6A;#99;#x68;#114;#105;#x73;#64;#97;#112;#x61;#x63;#104;#x65;#x2E;o#114;#103;#x6A;#99;#x68;#114;#105;#x73;#64;#97;#112;#x61;#x63;#104;#x65;#x2E;o#114;#103;/a/p
 
 pUpgraded the Erlang JSON term format. Integrates community patches,
   particularly related to the HTTP API and the MapReduce system. Gives talks 
and
   presentations about CouchDB, with an eye toward recruiting more 
developers./p
 
-pa href=http://www.davispj.com/;Paul J. Davis/a, a 

[48/50] git commit: fix apostrophe

[randall]

fix apostrophe

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@983410 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: bbae98a94e6882996130f9293e91f365f5db33c7
Parents: 9d60e78
Author: Jan Lehnardt j...@apache.org
Authored: Sun Aug 8 13:22:39 2010 +
Committer: Jan Lehnardt j...@apache.org
Committed: Sun Aug 8 13:22:39 2010 +

--
 downloads.html |2 +-
 downloads.txt  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/bbae98a9/downloads.html
--
diff --git a/downloads.html b/downloads.html
index e5e26c3..bceadf2 100644
--- a/downloads.html
+++ b/downloads.html
@@ -78,7 +78,7 @@ limitations under the License.
 
 pdiv style=border:5px dashed #F00;padding:1em/p
 
-pstrongCAUTION/strong The 1.0.0 release has a data-loss bug in 
it#8217;s default configuration.
+pstrongCAUTION/strong The 1.0.0 release has a data-loss bug in its 
default configuration.
 Please stand by and wait for the 1.0.1 release./p
 
 pIf you emare/em running CouchDB 1.0.0 in production, here are the steps 
to

http://git-wip-us.apache.org/repos/asf/couchdb/blob/bbae98a9/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index ff01a9f..313f77b 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -12,7 +12,7 @@ Current Releases
 
   div style=border:5px dashed #F00;padding:1em
 
-**CAUTION** The 1.0.0 release has a data-loss bug in it's default 
configuration.
+**CAUTION** The 1.0.0 release has a data-loss bug in its default configuration.
 Please stand by and wait for the 1.0.1 release.
 
 If you *are* running CouchDB 1.0.0 in production, here are the steps to

[49/50] git commit: add 1.0.0 data loss warning

[randall]

add 1.0.0 data loss warning

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site/htdocs@983383 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/htdocs
Commit: 9d60e788325bcb37df6d1cd8530f448b0e1ac5a1
Parents: f4c9503
Author: Jan Lehnardt j...@apache.org
Authored: Sun Aug 8 11:20:36 2010 +
Committer: Jan Lehnardt j...@apache.org
Committed: Sun Aug 8 11:20:36 2010 +

--
 downloads.html |   22 ++
 downloads.txt  |   20 
 2 files changed, 42 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9d60e788/downloads.html
--
diff --git a/downloads.html b/downloads.html
index 0f01142..e5e26c3 100644
--- a/downloads.html
+++ b/downloads.html
@@ -76,6 +76,28 @@ limitations under the License.
 
 h2Current Releases/h2
 
+pdiv style=border:5px dashed #F00;padding:1em/p
+
+pstrongCAUTION/strong The 1.0.0 release has a data-loss bug in 
it#8217;s default configuration.
+Please stand by and wait for the 1.0.1 release./p
+
+pIf you emare/em running CouchDB 1.0.0 in production, here are the steps 
to
+reconfigure CouchDB to avoid the bug. /p
+
+pemIt is important that you do not stop or restart the server./em/p
+
+precodecurl -X PUT http://127.0.0.1:5984/_config/couchdb/delayed_commits 
-d'false'
+/code/pre
+
+pThis disables emdelayed commits/em, the feature that includes the 
bug./p
+
+pThen, for each of your databases, run:/p
+
+precodecurl -X POST http://127.0.0.1:5984/database_name/_ensure_full_commit
+/code/pre
+
+p/div/p
+
 h31.0.0/h3
 
 h4Files/h4

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9d60e788/downloads.txt
--
diff --git a/downloads.txt b/downloads.txt
index 2f5265b..ff01a9f 100644
--- a/downloads.txt
+++ b/downloads.txt
@@ -10,6 +10,26 @@ The following releases of Apache CouchDB are available for 
download.
 Current Releases
 
 
+  div style=border:5px dashed #F00;padding:1em
+
+**CAUTION** The 1.0.0 release has a data-loss bug in it's default 
configuration.
+Please stand by and wait for the 1.0.1 release.
+
+If you *are* running CouchDB 1.0.0 in production, here are the steps to
+reconfigure CouchDB to avoid the bug. 
+
+*It is important that you do not stop or restart the server.*
+
+curl -X PUT http://127.0.0.1:5984/_config/couchdb/delayed_commits 
-d'false'
+
+This disables *delayed commits*, the feature that includes the bug.
+
+Then, for each of your databases, run:
+
+curl -X POST http://127.0.0.1:5984/database_name/_ensure_full_commit
+
+  /div
+
 ### 1.0.0
 
  Files

[3/7] git commit: Propogate failures from JS CLI tests to exit codes

[randall]

Propogate failures from JS CLI tests to exit codes

Assert that all tests pass and save the error code from the couchjs
invocation. Make check will actually fail when JS CLI tests fail.


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

Branch: refs/heads/master
Commit: 257eb522c753ae39a5333938ec1856acd8451ec2
Parents: 14ac709
Author: Randall Leeds rand...@apache.org
Authored: Wed Jan 18 23:15:53 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Thu Jan 26 17:03:10 2012 -0800

--
 test/javascript/cli_runner.js |9 -
 test/javascript/run.tpl   |5 -
 2 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/257eb522/test/javascript/cli_runner.js
--
diff --git a/test/javascript/cli_runner.js b/test/javascript/cli_runner.js
index dec8803..f53ffe8 100644
--- a/test/javascript/cli_runner.js
+++ b/test/javascript/cli_runner.js
@@ -25,8 +25,10 @@ function T(arg1, arg2) {
 }
 
 function runTestConsole(num, name, func) {
+  var passed = false;
   try {
 func();
+passed = true;
 print(ok  + num +   + name);
   } catch(e) {
 print(not ok  + num +   + name);
@@ -35,17 +37,22 @@ function runTestConsole(num, name, func) {
   console.log(Stacktrace:\n + e.stack.replace(/^/gm, \t));
 }
   }
+  return passed;
 }
 
 function runAllTestsConsole() {
   var numTests = 0;
+  var numPassed = 0;
   for(var t in couchTests) { numTests += 1; }
   print(1.. + numTests);
   var testId = 0;
   for(var t in couchTests) {
 testId += 1;
-runTestConsole(testId, t, couchTests[t]);
+if(runTestConsole(testId, t, couchTests[t])) {
+  numPassed++;
+}
   }
+  T(numPassed == numTests, All JS CLI tests should pass.);
 };
 
 waitForSuccess(CouchDB.getVersion);

http://git-wip-us.apache.org/repos/asf/couchdb/blob/257eb522/test/javascript/run.tpl
--
diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl
index 35ff531..47d2f6e 100644
--- a/test/javascript/run.tpl
+++ b/test/javascript/run.tpl
@@ -29,7 +29,7 @@ else
 TEST_SRC=$SCRIPT_DIR/test/$1.js
 if [ ! -f $TEST_SRC ]; then
 echo file $1 does not exist
-exit
+exit 1
 fi
 fi
 fi
@@ -62,9 +62,12 @@ $COUCHJS -H \
$TEST_SRC \
$JS_TEST_DIR/couch_http.js \
$JS_TEST_DIR/cli_runner.js
+RESULT=$?
 
 if [ -z $COUCHDB_NO_START ]; then
# stop CouchDB
./utils/run -d
trap - 0
 fi
+
+exit $RESULT

[4/7] git commit: print JS CLI test tracebacks to stderr

[randall]

print JS CLI test tracebacks to stderr

Nothing in couchjs assumes that multiple arguments to the couchjs
`print` function is sensible. The call signature changes to take an
optional second parameter - a true value prints to stderr.

From this point forward, console.log in the JS CLI prints to stderr.


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

Branch: refs/heads/master
Commit: 14ac70910acc5eab03e443a112bce04dfef91b6d
Parents: 0c619ed
Author: Randall Leeds rand...@apache.org
Authored: Wed Jan 18 22:48:01 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Thu Jan 26 17:03:08 2012 -0800

--
 src/couchdb/priv/couch_js/util.c |   19 ++-
 test/javascript/cli_runner.js|6 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/14ac7091/src/couchdb/priv/couch_js/util.c
--
diff --git a/src/couchdb/priv/couch_js/util.c b/src/couchdb/priv/couch_js/util.c
index b7bd3e4..d41d9e9 100644
--- a/src/couchdb/priv/couch_js/util.c
+++ b/src/couchdb/priv/couch_js/util.c
@@ -207,20 +207,21 @@ couch_readfile(JSContext* cx, const char* filename)
 void
 couch_print(JSContext* cx, uintN argc, jsval* argv)
 {
-char *bytes;
-uintN i;
+char *bytes = NULL;
+FILE *stream = stdout;
 
-for(i = 0; i  argc; i++)
-{
-bytes = enc_string(cx, argv[i], NULL);
+if (argc) {
+if (argc  1  argv[1] == JSVAL_TRUE) {
+  stream = stderr;
+}
+bytes = enc_string(cx, argv[0], NULL);
 if(!bytes) return;
-
-fprintf(stdout, %s%s, i ?   : , bytes);
+fprintf(stream, %s, bytes);
 JS_free(cx, bytes);
 }
 
-fputc('\n', stdout);
-fflush(stdout);
+fputc('\n', stream);
+fflush(stream);
 }
 
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/14ac7091/test/javascript/cli_runner.js
--
diff --git a/test/javascript/cli_runner.js b/test/javascript/cli_runner.js
index d9d7fce..dec8803 100644
--- a/test/javascript/cli_runner.js
+++ b/test/javascript/cli_runner.js
@@ -13,7 +13,7 @@
 var console = {
   log: function(arg) {
 var msg = (arg.toString()).replace(/\n/g, \n);
-print(#  + msg);
+print(msg, true);
   }
 };
 
@@ -30,9 +30,9 @@ function runTestConsole(num, name, func) {
 print(ok  + num +   + name);
   } catch(e) {
 print(not ok  + num +   + name);
-print(#  + e.toSource());
+console.log(e.toSource());
 if (e.stack) {
-  print(# Stacktrace:\n + e.stack.replace(/^/gm, \t));
+  console.log(Stacktrace:\n + e.stack.replace(/^/gm, \t));
 }
   }
 }

[1/7] git commit: Fix JS tests for COUCHDB-1338

[randall]

Updated Branches:
  refs/heads/master 7309340cf - 127cbe36c


Fix JS tests for COUCHDB-1338

Fix two bad assumptions:

- The server restarts on the same port

  Change replicator_db test which verifies that replications described
  by _replicator documents survive restart to use non-HTTP db references.

- The config port matches the port in the CouchDB request URL.


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

Branch: refs/heads/master
Commit: 127cbe36c279ee46f387143a74613ba546e06e42
Parents: d20e792
Author: Randall Leeds rand...@apache.org
Authored: Wed Dec 14 22:52:13 2011 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Thu Jan 26 17:03:10 2012 -0800

--
 share/www/script/couch.js  |   13 -
 share/www/script/test/config.js|2 +-
 share/www/script/test/replicator_db.js |   39 +--
 3 files changed, 32 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/127cbe36/share/www/script/couch.js
--
diff --git a/share/www/script/couch.js b/share/www/script/couch.js
index d078d96..f7099e3 100644
--- a/share/www/script/couch.js
+++ b/share/www/script/couch.js
@@ -478,7 +478,18 @@ CouchDB.params = function(options) {
 };
 // Used by replication test
 if (typeof window == 'undefined' || !window) {
-  CouchDB.host = 127.0.0.1:5984;
+  var hostRE = RegExp(https?://([^\/]+));
+  var getter = function () {
+return (new CouchHTTP).base_url.match(hostRE)[1];
+  };
+  if(Object.defineProperty) {
+Object.defineProperty(CouchDB, host, {
+  get : getter,
+  enumerable : true
+});
+  } else {
+CouchDB.__defineGetter__(host, getter);
+  }
   CouchDB.protocol = http://;;
   CouchDB.inBrowser = false;
 } else {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/127cbe36/share/www/script/test/config.js
--
diff --git a/share/www/script/test/config.js b/share/www/script/test/config.js
index 9e4ae35..5382778 100644
--- a/share/www/script/test/config.js
+++ b/share/www/script/test/config.js
@@ -46,7 +46,7 @@ couchTests.config = function(debug) {
 config_port = config.ssl.port;
   }
 
-  if(port) {
+  if(port  config_port != 0) {
 TEquals(config_port, port, ports should match);
   }
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/127cbe36/share/www/script/test/replicator_db.js
--
diff --git a/share/www/script/test/replicator_db.js 
b/share/www/script/test/replicator_db.js
index 5eedc10..3795386 100644
--- a/share/www/script/test/replicator_db.js
+++ b/share/www/script/test/replicator_db.js
@@ -15,7 +15,6 @@ couchTests.replicator_db = function(debug) {
   if (debug) debugger;
 
   var wait_rep_doc = 500; // number of millisecs to wait after saving a Rep Doc
-  var host = CouchDB.host;
   var dbA = new CouchDB(test_suite_rep_db_a, 
{X-Couch-Full-Commit:false});
   var dbB = new CouchDB(test_suite_rep_db_b, 
{X-Couch-Full-Commit:false});
   var repDb = new CouchDB(test_suite_rep_db, 
{X-Couch-Full-Commit:false});
@@ -157,7 +156,7 @@ couchTests.replicator_db = function(debug) {
 
 var repDoc = {
   _id: foo_filt_rep_doc,
-  source: http://; + host + / + dbA.name,
+  source: http://; + CouchDB.host + / + dbA.name,
   target: dbB.name,
   filter: mydesign/myfilter,
   query_params: {
@@ -206,7 +205,7 @@ couchTests.replicator_db = function(debug) {
 
 var repDoc = {
   _id: foo_cont_rep_doc,
-  source: http://; + host + / + dbA.name,
+  source: http://; + CouchDB.host + / + dbA.name,
   target: dbB.name,
   continuous: true,
   user_ctx: {
@@ -305,7 +304,7 @@ couchTests.replicator_db = function(debug) {
 
 var repDoc = {
   _id: foo_cont_rep_doc,
-  source: http://; + host + / + dbA.name,
+  source: http://; + CouchDB.host + / + dbA.name,
   target: dbB.name,
   doc_ids: [foo666, foo3, _design/mydesign, foo999, foo1]
 };
@@ -435,12 +434,12 @@ couchTests.replicator_db = function(debug) {
 
 var repDoc1 = {
   _id: foo_dup_rep_doc_1,
-  source: http://; + host + / + dbA.name,
+  source: http://; + CouchDB.host + / + dbA.name,
   target: dbB.name
 };
 var repDoc2 = {
   _id: foo_dup_rep_doc_2,
-  source: http://; + host + / + dbA.name,
+  source: http://; + CouchDB.host + / + dbA.name,
   target: dbB.name
 };
 
@@ -477,13 +476,13 @@ couchTests.replicator_db = function(debug) {
 
 var repDoc1 = {
   _id

[2/7] git commit: COUCHDB-1338 - run js tests with port=0

[randall]

COUCHDB-1338 - run js tests with port=0

When the JS tests POST to /_restart, the server comes back up on a
different port. To work around this, add a getter property for the
CouchHTTP.prototype.base_url property, using a reserved slot on the
object to store the value.


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

Branch: refs/heads/master
Commit: d20e792617db738dd5ad0e046ae847cd740f586f
Parents: 257eb52
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 7 14:21:29 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Thu Jan 26 17:03:10 2012 -0800

--
 src/couchdb/priv/couch_js/help.h  |2 +
 src/couchdb/priv/couch_js/http.c  |   60 +++-
 src/couchdb/priv/couch_js/http.h  |3 ++
 src/couchdb/priv/couch_js/sm170.c |8 
 src/couchdb/priv/couch_js/sm180.c |8 
 src/couchdb/priv/couch_js/sm185.c |8 
 src/couchdb/priv/couch_js/util.c  |3 +-
 src/couchdb/priv/couch_js/util.h  |2 +
 test/Makefile.am  |1 +
 test/etap/Makefile.am |1 -
 test/etap/random_port.ini |   19 --
 test/etap/test_util.erl.in|2 +-
 test/javascript/Makefile.am   |1 +
 test/javascript/couch_http.js |9 ++---
 test/javascript/run.tpl   |9 -
 test/random_port.ini  |   19 ++
 16 files changed, 125 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d20e7926/src/couchdb/priv/couch_js/help.h
--
diff --git a/src/couchdb/priv/couch_js/help.h b/src/couchdb/priv/couch_js/help.h
index 4102594..b31bb8c 100644
--- a/src/couchdb/priv/couch_js/help.h
+++ b/src/couchdb/priv/couch_js/help.h
@@ -50,6 +50,8 @@ static const char USAGE_TEMPLATE[] =
   if package was built with cURL available)\n
   -S SIZE specify that the interpreter should set the\n
   stack quota for JS contexts to SIZE bytes\n
+  -u FILE path to a .uri file containing the address\n
+  (or addresses) of one or more servers\n
 \n
 Report bugs at %s.\n;
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/d20e7926/src/couchdb/priv/couch_js/http.c
--
diff --git a/src/couchdb/priv/couch_js/http.c b/src/couchdb/priv/couch_js/http.c
index fb54869..e8cd789 100644
--- a/src/couchdb/priv/couch_js/http.c
+++ b/src/couchdb/priv/couch_js/http.c
@@ -13,9 +13,13 @@
 #include stdio.h
 #include stdlib.h
 #include string.h
+#include sys/types.h
+#include sys/stat.h
+#include unistd.h
 #include jsapi.h
 #include config.h
 #include utf8.h
+#include util.h
 
 // Soft dependency on cURL bindings because they're
 // only used when running the JS tests from the
@@ -71,6 +75,12 @@ http_status(JSContext* cx, JSObject* req, jsval body)
 return -1;
 }
 
+JSBool
+http_uri(JSContext* cx, JSObject* req, couch_args* args, jsval* uri_val)
+{
+return JS_FALSE;
+}
+
 
 #else
 #include curl/curl.h
@@ -342,6 +352,42 @@ http_status(JSContext* cx, JSObject* req)
 return http-last_status;
 }
 
+JSBool
+http_uri(JSContext* cx, JSObject* req, couch_args* args, jsval* uri_val)
+{
+FILE* uri_fp = NULL;
+JSString* uri_str;
+
+// Default is http://localhost:5984/ when no uri file is specified
+if (!args-uri_file) {
+uri_str = JS_InternString(cx, http://localhost:5984/;);
+*uri_val = STRING_TO_JSVAL(uri_str);
+return JS_TRUE;
+}
+
+// Else check to see if the base url is cached in a reserved slot
+if (JS_GetReservedSlot(cx, req, 0, uri_val)  !JSVAL_IS_VOID(*uri_val)) {
+return JS_TRUE;
+}
+
+// Read the first line of the couch.uri file.
+if(!((uri_fp = fopen(args-uri_file, r)) 
+ (uri_str = couch_readline(cx, uri_fp {
+JS_ReportError(cx, Failed to read couch.uri file.);
+goto error;
+}
+
+fclose(uri_fp);
+*uri_val = STRING_TO_JSVAL(uri_str);
+JS_SetReservedSlot(cx, req, 0, *uri_val);
+return JS_TRUE;
+
+error:
+if(uri_fp) fclose(uri_fp);
+return JS_FALSE;
+}
+
+
 // Curl Helpers
 
 typedef struct {
@@ -373,6 +419,7 @@ static JSBool
 go(JSContext* cx, JSObject* obj, HTTPData* http, char* body, size_t bodylen)
 {
 CurlState state;
+char* referer;
 JSString* jsbody;
 JSBool ret = JS_FALSE;
 jsval tmp;
@@ -400,7 +447,6 @@ go(JSContext* cx, JSObject* obj, HTTPData* http, char* 
body, size_t bodylen)
 curl_easy_setopt(HTTP_HANDLE, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4

[7/7] git commit: COUCHDB-111 handle multiple files in couchjs

[randall]

COUCHDB-111 handle multiple files in couchjs

Rather than concatenating all the input files and compiling them into a
script with the name 'multiple files', compile each one and execute
it with the same globals.

This change is intended to aide in COUCHDB-111 by preserving file name
and line number information when executing scripts.


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

Branch: refs/heads/master
Commit: 5f55e9f18397b671cefcf1ce8eef1b787f36c398
Parents: 7309340
Author: Randall Leeds rand...@apache.org
Authored: Wed Nov 30 21:28:35 2011 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Thu Jan 26 16:14:34 2012 -0800

--
 src/couchdb/priv/couch_js/sm170.c |   50 -
 src/couchdb/priv/couch_js/sm180.c |   50 -
 src/couchdb/priv/couch_js/sm185.c |   54 +++-
 src/couchdb/priv/couch_js/util.c  |   17 +-
 src/couchdb/priv/couch_js/util.h  |7 ++--
 test/javascript/run.tpl   |6 ++--
 6 files changed, 94 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/5f55e9f1/src/couchdb/priv/couch_js/sm170.c
--
diff --git a/src/couchdb/priv/couch_js/sm170.c 
b/src/couchdb/priv/couch_js/sm170.c
index c900b85..796c1d6 100644
--- a/src/couchdb/priv/couch_js/sm170.c
+++ b/src/couchdb/priv/couch_js/sm170.c
@@ -295,6 +295,7 @@ main(int argc, const char* argv[])
 size_t slen;
 jsval sroot;
 jsval result;
+int i;
 
 couch_args* args = couch_parse_args(argc, argv);
 
@@ -342,32 +343,35 @@ main(int argc, const char* argv[])
 }
 } 
 
-// Convert script source to jschars.
-scriptsrc = dec_string(cx, args-script, strlen(args-script));
-if(!scriptsrc)
-return 1;
+for (i = 0 ; args-scripts[i] ; i++) {
+// Convert script source to jschars.
+scriptsrc = couch_readfile(cx, args-scripts[i]);
+if(!scriptsrc)
+return 1;
 
-schars = JS_GetStringChars(scriptsrc);
-slen = JS_GetStringLength(scriptsrc);
-
-// Root it so GC doesn't collect it.
-sroot = STRING_TO_JSVAL(scriptsrc); 
-if(JS_AddRoot(cx, sroot) != JS_TRUE) {
-fprintf(stderr, Internal root error.\n);
-return 1;
-}
+schars = JS_GetStringChars(scriptsrc);
+slen = JS_GetStringLength(scriptsrc);
 
-// Compile and run
-script = JS_CompileUCScript(cx, global, schars, slen, args-script_name, 
1);
-if(!script) {
-fprintf(stderr, Failed to compile script.\n);
-return 1;
+// Root it so GC doesn't collect it.
+sroot = STRING_TO_JSVAL(scriptsrc);
+if(JS_AddRoot(cx, sroot) != JS_TRUE) {
+fprintf(stderr, Internal root error.\n);
+return 1;
+}
+
+// Compile and run
+script = JS_CompileUCScript(cx, global, schars, slen,
+args-scripts[i], 1);
+if(!script) {
+fprintf(stderr, Failed to compile script.\n);
+return 1;
+}
+
+JS_ExecuteScript(cx, global, script, result);
+
+// Warning message if we don't remove it.
+JS_RemoveRoot(cx, sroot);
 }
-
-JS_ExecuteScript(cx, global, script, result);
-
-// Warning message if we don't remove it.
-JS_RemoveRoot(cx, sroot);
 
 FINISH_REQUEST(cx);
 JS_DestroyContext(cx);

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5f55e9f1/src/couchdb/priv/couch_js/sm180.c
--
diff --git a/src/couchdb/priv/couch_js/sm180.c 
b/src/couchdb/priv/couch_js/sm180.c
index dee16a7..4d1bbf9 100644
--- a/src/couchdb/priv/couch_js/sm180.c
+++ b/src/couchdb/priv/couch_js/sm180.c
@@ -304,6 +304,7 @@ main(int argc, const char* argv[])
 size_t slen;
 jsval sroot;
 jsval result;
+int i;
 
 couch_args* args = couch_parse_args(argc, argv);
 
@@ -351,32 +352,35 @@ main(int argc, const char* argv[])
 }
 } 
 
-// Convert script source to jschars.
-scriptsrc = dec_string(cx, args-script, strlen(args-script));
-if(!scriptsrc)
-return 1;
+for (i = 0 ; args-scripts[i] ; i++) {
+// Convert script source to jschars.
+scriptsrc = couch_readfile(cx, args-scripts[i]);
+if(!scriptsrc)
+return 1;
 
-schars = JS_GetStringChars(scriptsrc);
-slen = JS_GetStringLength(scriptsrc);
-
-// Root it so GC doesn't collect it.
-sroot = STRING_TO_JSVAL(scriptsrc); 
-if(JS_AddRoot(cx

[6/7] git commit: COUCHDB-111 and COUCHDB-1389 JS Error Tracebacks

[randall]

COUCHDB-111 and COUCHDB-1389 JS Error Tracebacks

couchjs:
- report stacktraces on exceptions using JS_ReportError

- responds with a trace and message on errors when possible

- propogate Error-like objects from validate_doc_update to the loop

- make Error-like object play nicely with couch_os_process

couch.js:

- transform HTTP error response bodies into an Error instance to
  capture stack information

cli tests:

- print a stacktrace for individual test failures when running the suite

Fix COUCHDB-111
Fix COUCHDB-1389


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

Branch: refs/heads/master
Commit: 32a1113417c25deee9052e7d3de37cc0faea9914
Parents: 5f55e9f
Author: Randall Leeds rand...@apache.org
Authored: Thu Dec 15 19:49:34 2011 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Thu Jan 26 17:02:38 2012 -0800

--
 share/server/loop.js  |2 +
 share/server/validate.js  |5 +++-
 share/www/script/couch.js |   13 -
 src/couchdb/priv/couch_js/sm170.c |2 +
 src/couchdb/priv/couch_js/sm180.c |2 +
 src/couchdb/priv/couch_js/sm185.c |2 +
 src/couchdb/priv/couch_js/util.c  |   45 +++-
 test/javascript/cli_runner.js |   19 ++---
 8 files changed, 77 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/32a11134/share/server/loop.js
--
diff --git a/share/server/loop.js b/share/server/loop.js
index eb7f75b..986c8b3 100644
--- a/share/server/loop.js
+++ b/share/server/loop.js
@@ -140,6 +140,8 @@ var Loop = function() {
 } else if (e.error  e.reason) {
   // compatibility with old error format
   respond([error, e.error, e.reason]);
+} else if (e.name) {
+  respond([error, e.name, e]);
 } else {
   respond([error,unnamed_error,e.toSource()]);
 }

http://git-wip-us.apache.org/repos/asf/couchdb/blob/32a11134/share/server/validate.js
--
diff --git a/share/server/validate.js b/share/server/validate.js
index 76a1412..5b50e54 100644
--- a/share/server/validate.js
+++ b/share/server/validate.js
@@ -14,8 +14,11 @@ var Validate = {
   validate : function(fun, ddoc, args) {
 try {
   fun.apply(ddoc, args);
-  print(1);
+  respond(1);
 } catch (error) {
+  if (error.name  error.stack) {
+throw error;
+  }
   respond(error);
 }
   }

http://git-wip-us.apache.org/repos/asf/couchdb/blob/32a11134/share/www/script/couch.js
--
diff --git a/share/www/script/couch.js b/share/www/script/couch.js
index 86aaabf..d078d96 100644
--- a/share/www/script/couch.js
+++ b/share/www/script/couch.js
@@ -462,7 +462,8 @@ CouchDB.maybeThrowError = function(req) {
 } catch (ParseError) {
   var result = {error:unknown, reason:req.responseText};
 }
-throw result;
+
+throw (new CouchError(result));
   }
 }
 
@@ -485,3 +486,13 @@ if (typeof window == 'undefined' || !window) {
   CouchDB.inBrowser = true;
   CouchDB.protocol = window.location.protocol + //;
 }
+
+// Turns an {error: ..., reason: ...} response into an Error instance
+function CouchError(error) {
+  var inst = new Error(error.reason);
+  inst.name = 'CouchError';
+  inst.error = error.error;
+  inst.reason = error.reason;
+  return inst;
+}
+CouchError.prototype.constructor = CouchError;

http://git-wip-us.apache.org/repos/asf/couchdb/blob/32a11134/src/couchdb/priv/couch_js/sm170.c
--
diff --git a/src/couchdb/priv/couch_js/sm170.c 
b/src/couchdb/priv/couch_js/sm170.c
index 796c1d6..bb28870 100644
--- a/src/couchdb/priv/couch_js/sm170.c
+++ b/src/couchdb/priv/couch_js/sm170.c
@@ -113,6 +113,7 @@ req_status(JSContext* cx, JSObject* obj, jsval idval, 
jsval* rval)
 
 
 static JSBool
+base_url(JSContext *cx, JSObject* obj, jsval idval, jsval* rval)
 evalcx(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
 JSString *str;
@@ -244,6 +245,7 @@ JSClass CouchHTTPClass = {
 
 JSPropertySpec CouchHTTPProperties[] = {
 {status, 0, JSPROP_READONLY, req_status, NULL},
+{base_url, 0, JSPROP_READONLY | JSPROP_SHARED, base_url, NULL},
 {0, 0, 0, 0, 0}
 };
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/32a11134/src/couchdb/priv/couch_js/sm180.c
--
diff --git a/src/couchdb/priv/couch_js/sm180.c 
b/src/couchdb/priv/couch_js/sm180.c
index 4d1bbf9

[1/2] git commit: remove obsolete entry in .gitignore

[randall]

Updated Branches:
  refs/heads/1.2.x 32c702572 - c7765f657
  refs/heads/master fb3f2ae8b - 6282b5d03


remove obsolete entry in .gitignore


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

Branch: refs/heads/1.2.x
Commit: c7765f6574768caf2be2c98331263ab91182cda9
Parents: 32c7025
Author: Randall Leeds rand...@apache.org
Authored: Tue Jan 24 13:29:02 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Tue Jan 24 13:29:29 2012 -0800

--
 .gitignore |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c7765f65/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 365d963..cbf2b42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ var/Makefile
 
 bin/couchdb
 bin/couchdb.1
-bin/couchjs
 bin/couch-config
 bin/couch-config_dev
 etc/couchdb/default.ini

[2/2] git commit: remove obsolete entry in .gitignore

[randall]

remove obsolete entry in .gitignore


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

Branch: refs/heads/master
Commit: 6282b5d030ac74274fa1628a5a0b0e66293297b1
Parents: fb3f2ae
Author: Randall Leeds rand...@apache.org
Authored: Tue Jan 24 13:29:02 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Tue Jan 24 13:29:02 2012 -0800

--
 .gitignore |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/6282b5d0/.gitignore
--
diff --git a/.gitignore b/.gitignore
index a24f0a1..f3bdc52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,6 @@ var/Makefile
 
 bin/couchdb
 bin/couchdb.1
-bin/couchjs
 bin/couch-config
 bin/couch-config_dev
 etc/couchdb/default.ini

[1/2] git commit: Fixing COUCHDB-1383: update the in memory state of the view on save.

[randall]

Updated Branches:
  refs/heads/1.2.x 851e04167 - ea01eaafa
  refs/heads/master 5cece68ec - ce483428d


Fixing COUCHDB-1383: update the in memory state of the view on save.


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

Branch: refs/heads/master
Commit: ce483428d6553c9b2f8930e4649c4770ed83f78c
Parents: 5cece68
Author: Sam Bisbee s...@sbisbee.com
Authored: Wed Jan 18 11:02:43 2012 -0500
Committer: Randall Leeds rand...@apache.org
Committed: Mon Jan 23 20:27:01 2012 -0800

--
 share/www/script/futon.browse.js |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ce483428/share/www/script/futon.browse.js
--
diff --git a/share/www/script/futon.browse.js b/share/www/script/futon.browse.js
index d336237..da3344f 100644
--- a/share/www/script/futon.browse.js
+++ b/share/www/script/futon.browse.js
@@ -609,6 +609,7 @@
 db.saveDoc(doc, {
   success: function(resp) {
 page.isDirty = false;
+page.storedViewCode = viewDef;
 $(#viewcode button.revert, #viewcode button.save)
   .attr(disabled, disabled);
   }

[2/2] git commit: Fixing COUCHDB-1383: update the in memory state of the view on save.

[randall]

Fixing COUCHDB-1383: update the in memory state of the view on save.


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

Branch: refs/heads/1.2.x
Commit: ea01eaafa15169e17afda2b059bf8be12f2f6472
Parents: 851e041
Author: Sam Bisbee s...@sbisbee.com
Authored: Wed Jan 18 11:02:43 2012 -0500
Committer: Randall Leeds rand...@apache.org
Committed: Mon Jan 23 20:26:36 2012 -0800

--
 share/www/script/futon.browse.js |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ea01eaaf/share/www/script/futon.browse.js
--
diff --git a/share/www/script/futon.browse.js b/share/www/script/futon.browse.js
index b24840e..6df0568 100644
--- a/share/www/script/futon.browse.js
+++ b/share/www/script/futon.browse.js
@@ -577,6 +577,7 @@
 db.saveDoc(doc, {
   success: function(resp) {
 page.isDirty = false;
+page.storedViewCode = viewDef;
 $(#viewcode button.revert, #viewcode button.save)
   .attr(disabled, disabled);
   }

[1/2] git commit: Update NEWS and CHANGES

[randall]

Updated Branches:
  refs/heads/1.2.x ea01eaafa - 32c702572
  refs/heads/master ce483428d - fb3f2ae8b


Update NEWS and CHANGES


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

Branch: refs/heads/master
Commit: fb3f2ae8bbf2e85af4c1660ca06aad5a40f92456
Parents: ce48342
Author: Randall Leeds rand...@apache.org
Authored: Mon Jan 23 20:36:43 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Mon Jan 23 20:38:15 2012 -0800

--
 CHANGES |5 +
 NEWS|2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/fb3f2ae8/CHANGES
--
diff --git a/CHANGES b/CHANGES
index 17d1ce1..1831178 100644
--- a/CHANGES
+++ b/CHANGES
@@ -56,6 +56,7 @@ HTTP Interface:
  * Fixes to the `_changes` feed heartbeat option which caused
heartbeats to be missed when used with a filter. This caused
timeouts of continuous pull replications with a filter.
+ * Properly restart the SSL socket on configuration changes.
 
 Replicator:
 
@@ -91,6 +92,8 @@ Storage System:
 View Server:
 
  * Fixed old index file descriptor leaks after a view cleanup.
+ * The requested_path property keeps the pre-rewrite path even when no VHost
+   configuration is matched.
 
 OAuth:
 
@@ -100,6 +103,8 @@ Futon:
 
  * The `Status` screen (active tasks) now displays two new task status
fields: `Started on` and `Updated on`.
+ * Futon remembers view code every time it is saved, allowing to save an
+   edit that amounts to a revert.
 
 Version 1.1.2
 -

http://git-wip-us.apache.org/repos/asf/couchdb/blob/fb3f2ae8/NEWS
--
diff --git a/NEWS b/NEWS
index 458f7cd..f70abd8 100644
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,8 @@ This version has not been released yet.
  * Fix use of OAuth with VHosts and URL rewriting.
  * OAuth secrets can now be stored in the users system database.
  * Allow persistent authentication cookies.
+ * The requested_path property of query server request objects now has
+   the path requested by clients before VHosts and rewriting.
 
 Version 1.1.2
 -

[2/2] git commit: Update NEWS and CHANGES

[randall]

Update NEWS and CHANGES


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

Branch: refs/heads/1.2.x
Commit: 32c70257270b578bf1e33772468771777da217bf
Parents: ea01eaa
Author: Randall Leeds rand...@apache.org
Authored: Mon Jan 23 20:36:43 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Mon Jan 23 20:36:43 2012 -0800

--
 CHANGES |5 +
 NEWS|2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/32c70257/CHANGES
--
diff --git a/CHANGES b/CHANGES
index bbce5d3..a5c46f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,7 @@ HTTP Interface:
  * Fixes to the `_changes` feed heartbeat option which caused
heartbeats to be missed when used with a filter. This caused
timeouts of continuous pull replications with a filter.
+ * Properly restart the SSL socket on configuration changes.
 
 Replicator:
 
@@ -77,6 +78,8 @@ View Server:
  * Add CoffeeScript (http://coffeescript.org/) as a first class view server
language.
  * Fixed old index file descriptor leaks after a view cleanup.
+ * The requested_path property keeps the pre-rewrite path even when no VHost
+   configuration is matched.
 
 OAuth:
 
@@ -86,6 +89,8 @@ Futon:
 
  * The `Status` screen (active tasks) now displays two new task status
fields: `Started on` and `Updated on`.
+ * Futon remembers view code every time it is saved, allowing to save an
+   edit that amounts to a revert.
 
 Version 1.1.2
 -

http://git-wip-us.apache.org/repos/asf/couchdb/blob/32c70257/NEWS
--
diff --git a/NEWS b/NEWS
index 72a8bc6..bc862eb 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,8 @@ This version has not been released yet.
  * Password hashes are now calculated by CouchDB instead of the
client.
  * Allow persistent authentication cookies.
+ * The requested_path property of query server request objects now has
+   the path requested by clients before VHosts and rewriting.
 
 Version 1.1.2
 -

[2/2] git commit: fix show/list/external requested_path for rewrites

[randall]

fix show/list/external requested_path for rewrites

Since we're using the x-couchdb-requested-path header to track the
requested path we should expose it in the request object we pass to
the view server. Currently this object has a `requested_path` key which
has the pre-vhost path. However, when there is no virtual host it will
have the post-rewrite path. With this change it always presents the path
which was requested by the client, whether or not virtual hosts were
matched.

This should make the lives of app authors easier by giving them a
reliable source for constructing relative paths and redirects that
works with and without virtual hosts.


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

Branch: refs/heads/master
Commit: 879a1bc19b145e126b9386aed2023f9cd1df8b31
Parents: 572b561
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 21 19:05:48 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sun Jan 22 17:45:46 2012 -0800

--
 src/couchdb/couch_httpd.erl |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/879a1bc1/src/couchdb/couch_httpd.erl
--
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 9b59f71..11dc45a 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -237,7 +237,11 @@ handle_request_int(MochiReq, DefaultFun,
 
 % get requested path
 RequestedPath = case MochiReq:get_header_value(x-couchdb-vhost-path) of
-undefined - RawUri;
+undefined -
+case MochiReq:get_header_value(x-couchdb-requested-path) of
+undefined - RawUri;
+R - R
+end;
 P - P
 end,
 

[1/2] git commit: fix show/list/external requested_path for rewrites

[randall]

Updated Branches:
  refs/heads/1.2.x 0fcb84463 - 384a75b65
  refs/heads/master 572b561ad - 879a1bc19


fix show/list/external requested_path for rewrites

Since we're using the x-couchdb-requested-path header to track the
requested path we should expose it in the request object we pass to
the view server. Currently this object has a `requested_path` key which
has the pre-vhost path. However, when there is no virtual host it will
have the post-rewrite path. With this change it always presents the path
which was requested by the client, whether or not virtual hosts were
matched.

This should make the lives of app authors easier by giving them a
reliable source for constructing relative paths and redirects that
works with and without virtual hosts.


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

Branch: refs/heads/1.2.x
Commit: 384a75b65fca44f6a491208c6fa40fbc25712199
Parents: 0fcb844
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 21 19:05:48 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sun Jan 22 17:48:19 2012 -0800

--
 src/couchdb/couch_httpd.erl |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/384a75b6/src/couchdb/couch_httpd.erl
--
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 192cb66..ea27bdf 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -236,7 +236,11 @@ handle_request_int(MochiReq, DefaultFun,
 
 % get requested path
 RequestedPath = case MochiReq:get_header_value(x-couchdb-vhost-path) of
-undefined - RawUri;
+undefined -
+case MochiReq:get_header_value(x-couchdb-requested-path) of
+undefined - RawUri;
+R - R
+end;
 P - P
 end,
 

git commit: Use the correct utility function to get the index directory path

[randall]

Updated Branches:
  refs/heads/master 879a1bc19 - 50ae62f71


Use the correct utility function to get the index directory path


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

Branch: refs/heads/master
Commit: 50ae62f712ec1661031ec9d39ff30c914fdcdd4c
Parents: 879a1bc
Author: Jason Smith (air) j...@iriscouch.com
Authored: Mon Jan 23 01:31:11 2012 +
Committer: Randall Leeds rand...@apache.org
Committed: Sun Jan 22 21:59:40 2012 -0800

--
 src/couch_index/src/couch_index_server.erl |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/50ae62f7/src/couch_index/src/couch_index_server.erl
--
diff --git a/src/couch_index/src/couch_index_server.erl 
b/src/couch_index/src/couch_index_server.erl
index 398c27d..3a0b436 100644
--- a/src/couch_index/src/couch_index_server.erl
+++ b/src/couch_index/src/couch_index_server.erl
@@ -164,7 +164,7 @@ reset_indexes(DbName, Root) -
 rem_from_ets(DbName, Sig, DDocId, Pid)
 end,
 lists:foreach(Fun, ets:lookup(?BY_DB, DbName)),
-Path = Root ++ /. ++ binary_to_list(DbName) ++ _design,
+Path = couch_index_util:index_dir(, DbName),
 couch_file:nuke_dir(Root, Path).
 
 

git commit: fix couch_httpd:host_for_request/1 for ssl

[randall]

Updated Branches:
  refs/heads/master 0ebfd2249 - 1e284b979


fix couch_httpd:host_for_request/1 for ssl


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

Branch: refs/heads/master
Commit: 1e284b979566a0bc4f5c002365b147c19f0b9efb
Parents: 0ebfd22
Author: Randall Leeds rand...@apache.org
Authored: Sun Jan 8 23:17:33 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sun Jan 8 23:21:21 2012 -0800

--
 src/couchdb/couch_httpd.erl |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1e284b97/src/couchdb/couch_httpd.erl
--
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index be121cb..9b59f71 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -473,7 +473,10 @@ host_for_request(#httpd{mochi_req=MochiReq}) -
 undefined -
 case MochiReq:get_header_value(Host) of
 undefined -
-{ok, {Address, Port}} = 
inet:sockname(MochiReq:get(socket)),
+{ok, {Address, Port}} = case MochiReq:get(socket) of
+{ssl, SslSocket} - ssl:sockname(SslSocket);
+Socket - inet:sockname(Socket)
+end,
 inet_parse:ntoa(Address) ++ : ++ integer_to_list(Port);
 Value1 -
 Value1

git commit: Add heartbeat parameter to all _changes requests

[randall]

Updated Branches:
  refs/heads/1.2.x 3587e084e - 08d8f89cc


Add heartbeat parameter to all _changes requests

Even non-continuous _changes requests, particularly filtered
ones, can cause long periods of inactivity.


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

Branch: refs/heads/1.2.x
Commit: 08d8f89cc07920b89b01145268a5b3453837fa82
Parents: 3587e08
Author: Filipe David Borba Manana fdman...@apache.org
Authored: Sat Jan 7 13:44:45 2012 +
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 7 12:54:02 2012 -0800

--
 src/couchdb/couch_api_wrap.erl |6 --
 1 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/08d8f89c/src/couchdb/couch_api_wrap.erl
--
diff --git a/src/couchdb/couch_api_wrap.erl b/src/couchdb/couch_api_wrap.erl
index 75436ff..0607d50 100644
--- a/src/couchdb/couch_api_wrap.erl
+++ b/src/couchdb/couch_api_wrap.erl
@@ -308,13 +308,15 @@ update_docs(Db, DocList, Options, UpdateType) -
 
 changes_since(#httpdb{headers = Headers1} = HttpDb, Style, StartSeq,
 UserFun, Options) -
+HeartBeat = erlang:max(1000, HttpDb#httpdb.timeout div 3),
 BaseQArgs = case get_value(continuous, Options, false) of
 false -
 [{feed, normal}];
 true -
-[{feed, continuous}, {heartbeat, 1}]
+[{feed, continuous}]
 end ++ [
-{style, atom_to_list(Style)}, {since, couch_util:to_list(StartSeq)}
+{style, atom_to_list(Style)}, {since, 
couch_util:to_list(StartSeq)},
+{heartbeat, integer_to_list(HeartBeat)}
 ],
 DocIds = get_value(doc_ids, Options),
 {QArgs, Method, Body, Headers} = case DocIds of

git commit: COUCHDB-1339 - stop couchdb on js cli exits

[randall]

Updated Branches:
  refs/heads/master 8f0b4e64f - 2921c7869


COUCHDB-1339 - stop couchdb on js cli exits


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

Branch: refs/heads/master
Commit: 2921c7869411f338da036f893f5937178d1e823c
Parents: 8f0b4e6
Author: Randall Leeds rand...@apache.org
Authored: Wed Nov 30 22:40:41 2011 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 7 13:56:24 2012 -0800

--
 test/javascript/run.tpl |   14 --
 1 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/2921c786/test/javascript/run.tpl
--
diff --git a/test/javascript/run.tpl b/test/javascript/run.tpl
index 593f9ed..caffe49 100644
--- a/test/javascript/run.tpl
+++ b/test/javascript/run.tpl
@@ -36,10 +36,19 @@ else
 fi
 
 make dev
+
+# stop CouchDB on exit from various signals
+abort() {
+   trap - 0
+   ./utils/run -d
+   exit 2
+}
+
 # start CouchDB
 if [ -z $COUCHDB_NO_START ]; then
-  ./utils/run -b -r 1
-  sleep 1 # give it a sec
+   trap 'abort' 0 1 2 3 4 6 8 15
+   ./utils/run -b -r 1
+   sleep 1 # give it a sec
 fi
 
 cat $SCRIPT_DIR/json2.js \
@@ -56,4 +65,5 @@ cat $SCRIPT_DIR/json2.js \
 if [ -z $COUCHDB_NO_START ]; then
# stop CouchDB
./utils/run -d
+   trap - 0
 fi

[1/2] git commit: implement couch_readfile in couchjs utils

[randall]

Updated Branches:
  refs/heads/master 2e6049271 - bcd5039af


implement couch_readfile in couchjs utils


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

Branch: refs/heads/master
Commit: bcd5039afa00952635c44a9c7e0406032366755d
Parents: 74d4c91
Author: Randall Leeds rand...@apache.org
Authored: Sat Jan 7 19:43:52 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 7 19:43:52 2012 -0800

--
 src/couchdb/priv/couch_js/util.c |   14 --
 src/couchdb/priv/couch_js/util.h |1 +
 2 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/bcd5039a/src/couchdb/priv/couch_js/util.c
--
diff --git a/src/couchdb/priv/couch_js/util.c b/src/couchdb/priv/couch_js/util.c
index f45ee38..d95151c 100644
--- a/src/couchdb/priv/couch_js/util.c
+++ b/src/couchdb/priv/couch_js/util.c
@@ -200,9 +200,19 @@ couch_readline(JSContext* cx, FILE* fp)
 }
 
 
-JSObject*
-couch_readfile(JSContext* cx, FILE* fp)
+JSString*
+couch_readfile(JSContext* cx, const char* filename)
 {
+JSString *string;
+size_t byteslen;
+char *bytes;
+
+if((byteslen = slurp_file(filename, bytes))) {
+string = dec_string(cx, bytes, byteslen);
+
+free(bytes);
+return string;
+}
 return NULL;
 }
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/bcd5039a/src/couchdb/priv/couch_js/util.h
--
diff --git a/src/couchdb/priv/couch_js/util.h b/src/couchdb/priv/couch_js/util.h
index 380ff84..d58f276 100644
--- a/src/couchdb/priv/couch_js/util.h
+++ b/src/couchdb/priv/couch_js/util.h
@@ -25,6 +25,7 @@ typedef struct {
 couch_args* couch_parse_args(int argc, const char* argv[]);
 int couch_fgets(char* buf, int size, FILE* fp);
 JSString* couch_readline(JSContext* cx, FILE* fp);
+JSString* couch_readfile(JSContext* cx, const char* filename);
 void couch_print(JSContext* cx, uintN argc, jsval* argv);
 void couch_error(JSContext* cx, const char* mesg, JSErrorReport* report);
 JSBool couch_load_funcs(JSContext* cx, JSObject* obj, JSFunctionSpec* funcs);

[2/2] git commit: avoid unneccesary calls to strlen

[randall]

avoid unneccesary calls to strlen


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

Branch: refs/heads/master
Commit: 74d4c91f0dcbfbb9772f7f8b71df9628ad242f53
Parents: 2e60492
Author: Randall Leeds rand...@apache.org
Authored: Wed Nov 30 02:20:27 2011 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Sat Jan 7 19:42:56 2012 -0800

--
 src/couchdb/priv/couch_js/util.c |   18 +-
 1 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/74d4c91f/src/couchdb/priv/couch_js/util.c
--
diff --git a/src/couchdb/priv/couch_js/util.c b/src/couchdb/priv/couch_js/util.c
index 3076856..f45ee38 100644
--- a/src/couchdb/priv/couch_js/util.c
+++ b/src/couchdb/priv/couch_js/util.c
@@ -20,11 +20,12 @@
 #include utf8.h
 
 
-char*
-slurp_file(char* buf, const char* file)
+size_t
+slurp_file(const char* file, char** outbuf_p)
 {
 FILE* fp;
 char fbuf[16384];
+char *buf = NULL;
 char* tmp;
 size_t nread = 0;
 size_t buflen = 0;
@@ -41,16 +42,13 @@ slurp_file(char* buf, const char* file)
 
 while((nread = fread(fbuf, 1, 16384, fp))  0) {
 if(buf == NULL) {
-buflen = nread;
 buf = (char*) malloc(nread + 1);
 if(buf == NULL) {
 fprintf(stderr, Out of memory.\n);
 exit(3);
 }
-memcpy(buf, fbuf, buflen);
-buf[buflen] = '\0';
+memcpy(buf, fbuf, nread);
 } else {
-buflen = strlen(buf);
 tmp = (char*) malloc(buflen + nread + 1);
 if(tmp == NULL) {
 fprintf(stderr, Out of memory.\n);
@@ -58,12 +56,14 @@ slurp_file(char* buf, const char* file)
 }
 memcpy(tmp, buf, buflen);
 memcpy(tmp+buflen, fbuf, nread);
-tmp[buflen+nread] = '\0';
 free(buf);
 buf = tmp;
 }
+buflen += nread;
+buf[buflen] = '\0';
 }
-return buf;
+*outbuf_p = buf;
+return buflen + 1;
 }
 
 couch_args*
@@ -104,7 +104,7 @@ couch_parse_args(int argc, const char* argv[])
 }
 
 while(i  argc) {
-args-script = slurp_file(args-script, argv[i]);
+slurp_file(argv[i], args-script);
 if(args-script_name == NULL) {
 if(strcmp(argv[i], -) == 0) {
 args-script_name = stdin;

git commit: COUCHDB-1042 - restore libcurl as soft dependency

[randall]

Updated Branches:
  refs/heads/master 39d81d5a0 - bf7c74edb


COUCHDB-1042 - restore libcurl as soft dependency


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

Branch: refs/heads/master
Commit: bf7c74edb0f645154412fa8df9f092e052ee6f61
Parents: 39d81d5
Author: Randall Leeds rand...@apache.org
Authored: Fri Jan 6 13:35:40 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Fri Jan 6 13:35:40 2012 -0800

--
 Makefile.am |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/bf7c74ed/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index de9d4af..b03e580 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,9 @@ THANKS.gz: $(top_srcdir)/THANKS
 
 check: dev
$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
+if USE_CURL
$(top_builddir)/test/javascript/run
+endif
 
 cover: dev
rm -f cover/*.coverdata

git commit: Use ICU_CPPFLAGS instead of _CFLAGS

[randall]

Updated Branches:
  refs/heads/1.2.x 0f13ff553 - 312c7f402


Use ICU_CPPFLAGS instead of _CFLAGS

This removes the need for c4f6ff9c6cf5512546d5799f05dd445a4da979b3
which was made in response to -ansi coming from icu-config on my
system. Instead, it's more sensible to use the preprocessor flags from
icu-config which provides the -I header locations and -D definitions
but doesn't add a bunch of excessive warning flags or ansi conformance.

This reverts commit c4f6ff9c6cf5512546d5799f05dd445a4da979b3.


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

Branch: refs/heads/1.2.x
Commit: 312c7f402b4bef13a0feb31140abb40ee5aa2f47
Parents: 0f13ff5
Author: Randall Leeds rand...@apache.org
Authored: Tue Jan 3 14:14:55 2012 -0500
Committer: Randall Leeds rand...@apache.org
Committed: Fri Jan 6 13:43:38 2012 -0800

--
 configure.ac |3 ++-
 src/couchdb/priv/Makefile.am |4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/312c7f40/configure.ac
--
diff --git a/configure.ac b/configure.ac
index eb763c0..d4de2d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -323,7 +323,7 @@ CPPFLAGS=$OLD_CPPFLAGS
 
 AC_ARG_WITH([win32-icu-binaries], 
[AC_HELP_STRING([--with-win32-icu-binaries=PATH],
 [set PATH to the Win32 native ICU binaries directory])], [
-ICU_CFLAGS=-I$withval/include
+ICU_CPPFLAGS=-I$withval/include
 ICU_LIBS=-L$withval/lib -licuuc -licudt -licuin
 ICU_BIN=$withval/bin
 ], [
@@ -332,6 +332,7 @@ AC_ARG_WITH([win32-icu-binaries], 
[AC_HELP_STRING([--with-win32-icu-binaries=PAT
 ])
 
 AC_SUBST(ICU_CFLAGS)
+AC_SUBST(ICU_CPPFLAGS)
 AC_SUBST(ICU_LIBS)
 AC_SUBST(ICU_BIN)
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/312c7f40/src/couchdb/priv/Makefile.am
--
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 1080b01..02f7a7f 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -32,7 +32,7 @@ couchprivlib_LTLIBRARIES = couch_icu_driver.la
 if USE_EJSON_COMPARE_NIF
 couchprivlib_LTLIBRARIES += couch_ejson_compare.la
 couch_ejson_compare_la_SOURCES = couch_ejson_compare/couch_ejson_compare.c
-couch_ejson_compare_la_CFLAGS = -D_BSD_SOURCE $(ICU_CFLAGS) $(ERLANG_FLAGS)
+couch_ejson_compare_la_CPPFLAGS = -D_BSD_SOURCE $(ICU_CPPFLAGS) $(ERLANG_FLAGS)
 couch_ejson_compare_la_LDFLAGS = -module -avoid-version
 couch_ejson_compare_la_LIBADD = $(ICU_LIBS)
 if WINDOWS
@@ -41,7 +41,7 @@ endif
 endif
 couch_icu_driver_la_SOURCES = icu_driver/couch_icu_driver.c
 couch_icu_driver_la_LDFLAGS = -module -avoid-version
-couch_icu_driver_la_CFLAGS = $(ICU_CFLAGS) $(ERLANG_FLAGS)
+couch_icu_driver_la_CPPFLAGS = $(ICU_CPPFLAGS) $(ERLANG_FLAGS)
 couch_icu_driver_la_LIBADD = $(ICU_LIBS)
 
 if WINDOWS

git commit: be nice to the poor http parsers

[randall]

Updated Branches:
  refs/heads/1.2.x 0f5e1f4d0 - 351fe793a


be nice to the poor http parsers

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1177162 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/1.2.x
Commit: 351fe793a9c99c62f1b62ad71425dac4971d3bd8
Parents: 0f5e1f4
Author: Randall Leeds rand...@apache.org
Authored: Thu Sep 29 04:46:20 2011 +
Committer: Randall Leeds rand...@apache.org
Committed: Fri Jan 6 14:32:39 2012 -0800

--
 src/couchdb/couch_httpd.erl |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/351fe793/src/couchdb/couch_httpd.erl
--
diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl
index 2d4c38d..192cb66 100644
--- a/src/couchdb/couch_httpd.erl
+++ b/src/couchdb/couch_httpd.erl
@@ -915,7 +915,7 @@ negotiate_content_type1(#httpd{mochi_req=MochiReq}) -
 end,
 case lists:member(application/json, AcceptedTypes) of
 true  - application/json;
-false - text/plain;charset=utf-8
+false - text/plain; charset=utf-8
 end.
 
 server_header() -

[2/3] git commit: don't ln the couchjs install target on windows

[randall]

don't ln the couchjs install target on windows

On windows we install binaries directly into $(prefix)/bin rather than
a local bin directory hidden away in the erlang module. Therefore, when
building this way, don't try to create a symbolic link into the final
location since the final location has the output binary already.


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

Branch: refs/heads/1.2.x
Commit: 7c303b9c57b4ccd347489eddfc66d1998202dade
Parents: f7b2fa9
Author: Randall Leeds rand...@apache.org
Authored: Fri Jan 6 15:29:51 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Fri Jan 6 15:40:58 2012 -0800

--
 bin/Makefile.am |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/7c303b9c/bin/Makefile.am
--
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 320c8a7..f391154 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -48,9 +48,11 @@ couchdb: couchdb.tpl
$@  $
chmod +x $@
 
+if !WINDOWS
 install-exec-hook:
$(LN_S) -f $(locallibbindir)/$(couchjs_command_name) \
$(DESTDIR)$(bindir)/$(couchjs_command_name)
+endif
 
 couchjs_dev:
$(LN_S) -f $(abs_top_builddir)/src/couchdb/priv/couchjs $@

[1/3] git commit: don't ln the couchjs install target on windows

[randall]

Updated Branches:
  refs/heads/1.1.x 7d1dab7d0 - de0f784cd
  refs/heads/1.2.x f7b2fa97c - 7c303b9c5
  refs/heads/master 5c2c11f26 - e3651ec5d


don't ln the couchjs install target on windows

On windows we install binaries directly into $(prefix)/bin rather than
a local bin directory hidden away in the erlang module. Therefore, when
building this way, don't try to create a symbolic link into the final
location since the final location has the output binary already.


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

Branch: refs/heads/1.1.x
Commit: de0f784cdc90f4bb8c40ebf96644424c2ed96670
Parents: 7d1dab7
Author: Randall Leeds rand...@apache.org
Authored: Fri Jan 6 15:29:51 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Fri Jan 6 15:43:56 2012 -0800

--
 bin/Makefile.am |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/de0f784c/bin/Makefile.am
--
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 7d50d4e..a806a43 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -48,9 +48,11 @@ couchdb: couchdb.tpl
$@  $
chmod +x $@
 
+if !WINDOWS
 install-exec-hook:
$(LN_S) -f $(locallibbindir)/$(couchjs_command_name) \
$(DESTDIR)$(bindir)/$(couchjs_command_name)
+endif
 
 couchjs_dev:
$(LN_S) -f $(abs_top_builddir)/src/couchdb/priv/couchjs $@

[3/3] git commit: don't ln the couchjs install target on windows

[randall]

don't ln the couchjs install target on windows

On windows we install binaries directly into $(prefix)/bin rather than
a local bin directory hidden away in the erlang module. Therefore, when
building this way, don't try to create a symbolic link into the final
location since the final location has the output binary already.


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

Branch: refs/heads/master
Commit: e3651ec5d1c7e2ed75d9e70a2e71bb657eba751d
Parents: 5c2c11f
Author: Randall Leeds rand...@apache.org
Authored: Fri Jan 6 15:29:51 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Fri Jan 6 15:29:51 2012 -0800

--
 bin/Makefile.am |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e3651ec5/bin/Makefile.am
--
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 320c8a7..f391154 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -48,9 +48,11 @@ couchdb: couchdb.tpl
$@  $
chmod +x $@
 
+if !WINDOWS
 install-exec-hook:
$(LN_S) -f $(locallibbindir)/$(couchjs_command_name) \
$(DESTDIR)$(bindir)/$(couchjs_command_name)
+endif
 
 couchjs_dev:
$(LN_S) -f $(abs_top_builddir)/src/couchdb/priv/couchjs $@

[3/3] git commit: COUCHDB-1152 remove icu version dependency (win)

[randall]

COUCHDB-1152 remove icu version dependency (win)

Patch by Dave Cottlehuber.


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

Branch: refs/heads/master
Commit: 1054f9493f89311dd23939d669bd2370552f2f93
Parents: e3651ec
Author: Randall Leeds rand...@apache.org
Authored: Fri Jan 6 17:09:30 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Fri Jan 6 17:09:30 2012 -0800

--
 src/couchdb/priv/Makefile.am |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/1054f949/src/couchdb/priv/Makefile.am
--
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 02f7a7f..704e870 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -90,9 +90,9 @@ endif
 
 # libtool and automake have defeated markh.  For each of our executables
 # we end up with 2 copies - one directly in the 'target' folder (eg, 'priv')
-# and another - the correct one - in .libs.  The former doesn't work but is 
+# and another - the correct one - in .libs.  The former doesn't work but is
 # what gets installed for 'couchspawnkillable' - but the correct one for
-# couchjs.exe *does* get copied.  *shrug*  So just clobber it with the 
+# couchjs.exe *does* get copied.  *shrug*  So just clobber it with the
 # correct one as the last step. See bug COUCHDB-439
 install-data-hook:
if test -f $(DESTDIR)$(couchprivlibdir)/couch_icu_driver; then \
@@ -106,9 +106,9 @@ install-data-hook:
$(LN_S) couch_ejson_compare_nif couch_ejson_compare_nif.so; \
fi
 if WINDOWS
-   $(INSTALL) $(ICU_BIN)/icuuc44.dll $(bindir)
-   $(INSTALL) $(ICU_BIN)/icudt44.dll $(bindir)
-   $(INSTALL) $(ICU_BIN)/icuin44.dll $(bindir)
+   $(INSTALL) $(ICU_BIN)/icuuc*.dll $(bindir)
+   $(INSTALL) $(ICU_BIN)/icudt*.dll $(bindir)
+   $(INSTALL) $(ICU_BIN)/icuin*.dll $(bindir)
$(INSTALL) $(JS_LIB_BINARY) $(bindir)
$(INSTALL) .libs/couchspawnkillable.exe \
$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe

[2/3] git commit: COUCHDB-1152 remove icu version dependency (win)

[randall]

COUCHDB-1152 remove icu version dependency (win)

Patch by Dave Cottlehuber.


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

Branch: refs/heads/1.2.x
Commit: 4f2a0794a65f6518089ac3667425a2a17b30bc9c
Parents: 7c303b9
Author: Randall Leeds rand...@apache.org
Authored: Fri Jan 6 17:09:30 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Fri Jan 6 17:11:05 2012 -0800

--
 src/couchdb/priv/Makefile.am |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/4f2a0794/src/couchdb/priv/Makefile.am
--
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 02f7a7f..704e870 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -90,9 +90,9 @@ endif
 
 # libtool and automake have defeated markh.  For each of our executables
 # we end up with 2 copies - one directly in the 'target' folder (eg, 'priv')
-# and another - the correct one - in .libs.  The former doesn't work but is 
+# and another - the correct one - in .libs.  The former doesn't work but is
 # what gets installed for 'couchspawnkillable' - but the correct one for
-# couchjs.exe *does* get copied.  *shrug*  So just clobber it with the 
+# couchjs.exe *does* get copied.  *shrug*  So just clobber it with the
 # correct one as the last step. See bug COUCHDB-439
 install-data-hook:
if test -f $(DESTDIR)$(couchprivlibdir)/couch_icu_driver; then \
@@ -106,9 +106,9 @@ install-data-hook:
$(LN_S) couch_ejson_compare_nif couch_ejson_compare_nif.so; \
fi
 if WINDOWS
-   $(INSTALL) $(ICU_BIN)/icuuc44.dll $(bindir)
-   $(INSTALL) $(ICU_BIN)/icudt44.dll $(bindir)
-   $(INSTALL) $(ICU_BIN)/icuin44.dll $(bindir)
+   $(INSTALL) $(ICU_BIN)/icuuc*.dll $(bindir)
+   $(INSTALL) $(ICU_BIN)/icudt*.dll $(bindir)
+   $(INSTALL) $(ICU_BIN)/icuin*.dll $(bindir)
$(INSTALL) $(JS_LIB_BINARY) $(bindir)
$(INSTALL) .libs/couchspawnkillable.exe \
$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe

[1/3] git commit: COUCHDB-1152 remove icu version dependency (win)

[randall]

Updated Branches:
  refs/heads/1.1.x de0f784cd - d59d1c08d
  refs/heads/1.2.x 7c303b9c5 - 4f2a0794a
  refs/heads/master e3651ec5d - 1054f9493


COUCHDB-1152 remove icu version dependency (win)

Patch by Dave Cottlehuber.


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

Branch: refs/heads/1.1.x
Commit: d59d1c08df1cea2efd9cdb072a8a8c3210aa89a5
Parents: de0f784
Author: Randall Leeds rand...@apache.org
Authored: Fri Jan 6 17:09:30 2012 -0800
Committer: Randall Leeds rand...@apache.org
Committed: Fri Jan 6 17:11:23 2012 -0800

--
 src/couchdb/priv/Makefile.am |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/couchdb/blob/d59d1c08/src/couchdb/priv/Makefile.am
--
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index b55b590..b7b7241 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -87,9 +87,9 @@ endif
 
 # libtool and automake have defeated markh.  For each of our executables
 # we end up with 2 copies - one directly in the 'target' folder (eg, 'priv')
-# and another - the correct one - in .libs.  The former doesn't work but is 
+# and another - the correct one - in .libs.  The former doesn't work but is
 # what gets installed for 'couchspawnkillable' - but the correct one for
-# couchjs.exe *does* get copied.  *shrug*  So just clobber it with the 
+# couchjs.exe *does* get copied.  *shrug*  So just clobber it with the
 # correct one as the last step. See bug COUCHDB-439
 install-data-hook:
if test -f $(DESTDIR)$(couchprivlibdir)/couch_icu_driver; then \
@@ -98,9 +98,9 @@ install-data-hook:
$(LN_S) couch_icu_driver couch_icu_driver.so; \
fi
 if WINDOWS
-   $(INSTALL) $(ICU_LOCAL_BIN)/icuuc44.dll $(bindir)
-   $(INSTALL) $(ICU_LOCAL_BIN)/icudt44.dll $(bindir)
-   $(INSTALL) $(ICU_LOCAL_BIN)/icuin44.dll $(bindir)
+   $(INSTALL) $(ICU_LOCAL_BIN)/icuuc*.dll $(bindir)
+   $(INSTALL) $(ICU_LOCAL_BIN)/icudt*.dll $(bindir)
+   $(INSTALL) $(ICU_LOCAL_BIN)/icuin*.dll $(bindir)
$(INSTALL) $(JS_LIB_BINARY) $(bindir)
$(INSTALL) .libs/couchspawnkillable.exe \
$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe