Return-Path: 
 <commits-return-4384-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org>
Delivered-To: apmail-couchdb-commits-archive@www.apache.org
Received: (qmail 23935 invoked from network); 2 Jun 2010 12:25:17 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 2 Jun 2010 12:25:17 -0000
Received: (qmail 20792 invoked by uid 500); 2 Jun 2010 12:25:17 -0000
Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org
Received: (qmail 20757 invoked by uid 500); 2 Jun 2010 12:25:17 -0000
Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@couchdb.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@couchdb.apache.org>
List-Post: <mailto:commits@couchdb.apache.org>
List-Id: <commits.couchdb.apache.org>
Reply-To: dev@couchdb.apache.org
Delivered-To: mailing list commits@couchdb.apache.org
Received: (qmail 20750 invoked by uid 99); 2 Jun 2010 12:25:17 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 12:25:17 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 12:25:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 07E7F2388A6B; Wed,  2 Jun 2010 12:24:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r950531 - in /couchdb/branches/0.11.x:
 share/www/custom_test.html share/www/script/couch_test_runner.js
 share/www/script/couch_tests.js src/couchdb/couch_httpd_auth.erl
Date: Wed, 02 Jun 2010 12:24:53 -0000
To: commits@couchdb.apache.org
From: jan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100602122454.07E7F2388A6B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jan
Date: Wed Jun  2 12:24:53 2010
New Revision: 950531

URL: http://svn.apache.org/viewvc?rev=950531&view=rev
Log:
Merge r935737 from trunk:

Fix to close users db immediately after authentication.

Modified:
    couchdb/branches/0.11.x/share/www/custom_test.html
    couchdb/branches/0.11.x/share/www/script/couch_test_runner.js
    couchdb/branches/0.11.x/share/www/script/couch_tests.js
    couchdb/branches/0.11.x/src/couchdb/couch_httpd_auth.erl

Modified: couchdb/branches/0.11.x/share/www/custom_test.html
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/custom_test.html?rev=950531&r1=950530&r2=950531&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/custom_test.html (original)
+++ couchdb/branches/0.11.x/share/www/custom_test.html Wed Jun  2 12:24:53 2010
@@ -26,6 +26,8 @@ specific language governing permissions 
     <script src="script/futon.js?0.11.0"></script>
     <script src="script/jquery.resizer.js?0.11.0"></script>
     <script src="script/couch.js?0.11.0"></script>
+    <script src="script/couch_test_runner.js?0.11.0"></script>
+    
     <script>
       function T(arg, desc) {
         if(!arg) {

Modified: couchdb/branches/0.11.x/share/www/script/couch_test_runner.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/script/couch_test_runner.js?rev=950531&r1=950530&r2=950531&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/script/couch_test_runner.js (original)
+++ couchdb/branches/0.11.x/share/www/script/couch_test_runner.js Wed Jun  2 12:24:53 2010
@@ -328,3 +328,96 @@ function repr(val) {
   }
 }
 
+function makeDocs(start, end, templateDoc) {
+  var templateDocSrc = templateDoc ? JSON.stringify(templateDoc) : "{}"
+  if (end === undefined) {
+    end = start;
+    start = 0;
+  }
+  var docs = []
+  for (var i = start; i < end; i++) {
+    var newDoc = eval("(" + templateDocSrc + ")");
+    newDoc._id = (i).toString();
+    newDoc.integer = i;
+    newDoc.string = (i).toString();
+    docs.push(newDoc)
+  }
+  return docs;
+}
+
+function run_on_modified_server(settings, fun) {
+  try {
+    // set the settings
+    for(var i=0; i < settings.length; i++) {
+      var s = settings[i];
+      var xhr = CouchDB.request("PUT", "/_config/" + s.section + "/" + s.key, {
+        body: JSON.stringify(s.value),
+        headers: {"X-Couch-Persist": "false"}
+      });
+      CouchDB.maybeThrowError(xhr);
+      s.oldValue = xhr.responseText;
+    }
+    // run the thing
+    fun();
+  } finally {
+    // unset the settings
+    for(var j=0; j < i; j++) {
+      var s = settings[j];
+      if(s.oldValue == "\"\"\n") { // unset value
+        CouchDB.request("DELETE", "/_config/" + s.section + "/" + s.key, {
+          headers: {"X-Couch-Persist": "false"}
+        });
+      } else {
+        CouchDB.request("PUT", "/_config/" + s.section + "/" + s.key, {
+          body: s.oldValue,
+          headers: {"X-Couch-Persist": "false"}
+        });
+      }
+    }
+  }
+}
+
+function stringFun(fun) {
+  var string = fun.toSource ? fun.toSource() : "(" + fun.toString() + ")";
+  return string;
+}
+
+function waitForSuccess(fun, tag) {
+  var start = new Date();
+  while(true) {
+    if (new Date() - start > 5000) {
+      throw("timeout: "+tag);
+    } else {
+      try {
+        fun();
+        break;
+      } catch (e) {}
+      // sync http req allow async req to happen
+      CouchDB.request("GET", "/test_suite_db/?tag="+encodeURIComponent(tag));
+    }
+  }
+}
+
+function waitForRestart() {
+  var waiting = true;
+  while (waiting) {
+    try {
+      CouchDB.request("GET", "/");
+      CouchDB.request("GET", "/");
+      waiting = false;
+    } catch(e) {
+      // the request will fail until restart completes
+    }
+  }
+};
+
+function restartServer() {
+  var xhr;
+  try {
+    CouchDB.request("POST", "/_restart");
+  } catch(e) {
+    // this request may sometimes fail
+  }
+  waitForRestart();
+}
+

Modified: couchdb/branches/0.11.x/share/www/script/couch_tests.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/script/couch_tests.js?rev=950531&r1=950530&r2=950531&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/script/couch_tests.js [utf-8] (original)
+++ couchdb/branches/0.11.x/share/www/script/couch_tests.js [utf-8] Wed Jun  2 12:24:53 2010
@@ -93,62 +93,3 @@ loadTest("view_pagination.js");
 loadTest("view_sandboxing.js");
 loadTest("view_xml.js");
 // keep sorted
-
-
-function makeDocs(start, end, templateDoc) {
-  var templateDocSrc = templateDoc ? JSON.stringify(templateDoc) : "{}"
-  if (end === undefined) {
-    end = start;
-    start = 0;
-  }
-  var docs = []
-  for (var i = start; i < end; i++) {
-    var newDoc = eval("(" + templateDocSrc + ")");
-    newDoc._id = (i).toString();
-    newDoc.integer = i;
-    newDoc.string = (i).toString();
-    docs.push(newDoc)
-  }
-  return docs;
-}
-
-function run_on_modified_server(settings, fun) {
-  try {
-    // set the settings
-    for(var i=0; i < settings.length; i++) {
-      var s = settings[i];
-      var xhr = CouchDB.request("PUT", "/_config/" + s.section + "/" + s.key, {
-        body: JSON.stringify(s.value),
-        headers: {"X-Couch-Persist": "false"}
-      });
-      CouchDB.maybeThrowError(xhr);
-      s.oldValue = xhr.responseText;
-    }
-    // run the thing
-    fun();
-  } finally {
-    // unset the settings
-    for(var j=0; j < i; j++) {
-      var s = settings[j];
-      if(s.oldValue == "\"\"\n") { // unset value
-        CouchDB.request("DELETE", "/_config/" + s.section + "/" + s.key, {
-          headers: {"X-Couch-Persist": "false"}
-        });
-      } else {
-        CouchDB.request("PUT", "/_config/" + s.section + "/" + s.key, {
-          body: s.oldValue,
-          headers: {"X-Couch-Persist": "false"}
-        });
-      }
-    }
-  }
-}
-
-function stringFun(fun) {
-  var string = fun.toSource ? fun.toSource() : "(" + fun.toString() + ")";
-  return string;
-}
-
-function restartServer() {
-  CouchDB.request("POST", "/_restart");
-}

Modified: couchdb/branches/0.11.x/src/couchdb/couch_httpd_auth.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_httpd_auth.erl?rev=950531&r1=950530&r2=950531&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch_httpd_auth.erl (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch_httpd_auth.erl Wed Jun  2 12:24:53 2010
@@ -202,6 +202,8 @@ get_user_props_from_db(UserName) ->
     catch
         throw:_Throw ->
             nil
+    after
+        couch_db:close(Db)
     end.
 
 % this should handle creating the ddoc