Merge CouchDB 1.0.2 release candidate

Conflicts:
	Makefile.am
	acinclude.m4.in
	apps/couch/src/couch_db.erl
	apps/couch/src/couch_db_updater.erl
	apps/couch/src/couch_rep.erl
	apps/couch/src/couch_rep_reader.erl
	apps/couch/src/couch_view.erl
	apps/couch/src/couch_view_group.erl
	rel/overlay/etc/default.ini
	share/Makefile.am
	src/couchdb/couch_query_servers.erl
	src/ibrowse/Makefile.am
	src/ibrowse/ibrowse.app.in
	src/ibrowse/ibrowse.erl
	src/ibrowse/ibrowse_app.erl
	src/ibrowse/ibrowse_http_client.erl
	src/ibrowse/ibrowse_lb.erl
	src/ibrowse/ibrowse_lib.erl
	src/ibrowse/ibrowse_sup.erl
	src/ibrowse/ibrowse_test.erl
	src/mochiweb/mochijson2.erl
	test/etap/112-replication-missing-revs.t
	test/etap/113-replication-attachment-comp.t
	test/etap/140-attachment-comp.t

1 files changed, 10 insertions, 10 deletions

diff --git a/rel/overlay/share/www/script/test/cookie_auth.js b/rel/overlay/share/www/script/test/cookie_auth.js
index 68ec882d..ef915602 100644
--- a/rel/overlay/share/www/script/test/cookie_auth.js
+++ b/rel/overlay/share/www/script/test/cookie_auth.js
@@ -65,7 +65,7 @@ couchTests.cookie_auth = function(debug) {
       }, "eh, Boo-Boo?");
 
       try {
-        usersDb.save(duplicateJchrisDoc)
+        usersDb.save(duplicateJchrisDoc);
         T(false && "Can't create duplicate user names. Should have thrown an error.");
       } catch (e) {
         T(e.error == "conflict");
@@ -78,7 +78,7 @@ couchTests.cookie_auth = function(debug) {
       }, "copperfield");
 
       try {
-        usersDb.save(underscoreUserDoc)
+        usersDb.save(underscoreUserDoc);
         T(false && "Can't create underscore user names. Should have thrown an error.");
       } catch (e) {
         T(e.error == "forbidden");
@@ -93,7 +93,7 @@ couchTests.cookie_auth = function(debug) {
       badIdDoc._id = "org.apache.couchdb:w00x";
 
       try {
-        usersDb.save(badIdDoc)
+        usersDb.save(badIdDoc);
         T(false && "Can't create malformed docids. Should have thrown an error.");
       } catch (e) {
         T(e.error == "forbidden");
@@ -125,7 +125,7 @@ couchTests.cookie_auth = function(debug) {
        T(CouchDB.session().userCtx.name != 'Jason Davies');
 
        // test redirect
-       xhr = CouchDB.request("POST", "/_session?next=/", {
+       var xhr = CouchDB.request("POST", "/_session?next=/", {
          headers: {"Content-Type": "application/x-www-form-urlencoded"},
          body: "name=Jason%20Davies&password="+encodeURIComponent(password)
        });
@@ -135,10 +135,10 @@ couchTests.cookie_auth = function(debug) {
        // to follow the redirect, ie, the browser follows and does a
        // GET on the returned Location
        if (xhr.status == 200) {
-         T(/Welcome/.test(xhr.responseText))
+         T(/Welcome/.test(xhr.responseText));
        } else {
-         T(xhr.status == 302)
-         T(xhr.getResponseHeader("Location"))
+         T(xhr.status == 302);
+         T(xhr.getResponseHeader("Location"));
        }
 
       // test users db validations
@@ -151,7 +151,7 @@ couchTests.cookie_auth = function(debug) {
       jasonUserDoc.foo=3;
 
       try {
-        usersDb.save(jasonUserDoc)
+        usersDb.save(jasonUserDoc);
         T(false && "Can't update someone else's user doc. Should have thrown an error.");
       } catch (e) {
         T(e.error == "forbidden");
@@ -162,7 +162,7 @@ couchTests.cookie_auth = function(debug) {
       jchrisUserDoc.roles = ["foo"];
       
       try {
-        usersDb.save(jchrisUserDoc)
+        usersDb.save(jchrisUserDoc);
         T(false && "Can't set roles unless you are admin. Should have thrown an error.");
       } catch (e) {
         T(e.error == "forbidden");
@@ -179,7 +179,7 @@ couchTests.cookie_auth = function(debug) {
       jchrisUserDoc.roles = ["_bar"];
       
       try {
-        usersDb.save(jchrisUserDoc)
+        usersDb.save(jchrisUserDoc);
         T(false && "Can't add system roles to user's db. Should have thrown an error.");
       } catch (e) {
         T(e.error == "forbidden");