httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r333102 - /httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c
Date Sun, 13 Nov 2005 18:50:19 GMT
Author: niq
Date: Sun Nov 13 10:50:16 2005
New Revision: 333102

URL: http://svn.apache.org/viewcvs?rev=333102&view=rev
Log:
Work OK if check_conn is NOTIMPL in a driver

Modified:
    httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c

Modified: httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c?rev=333102&r1=333101&r2=333102&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c (original)
+++ httpd/httpd/branches/2.2.x/modules/database/mod_dbd.c Sun Nov 13 10:50:16 2005
@@ -322,7 +322,8 @@
                       "Failed to acquire DBD connection from pool!");
         return NULL;
     }
-    if (apr_dbd_check_conn(arec->driver, pool, arec->handle) != APR_SUCCESS) {
+    rv = apr_dbd_check_conn(arec->driver, pool, arec->handle);
+    if ((rv != APR_SUCCESS) && (rv != APR_ENOTIMPL)) {
         errmsg = apr_dbd_error(arec->driver, arec->handle, rv);
         if (!errmsg) {
             errmsg = "(unknown)";
@@ -351,7 +352,8 @@
 /* since we're in nothread-land, we can mess with svr->conn with impunity */
 /* If we have a persistent connection and it's good, we'll use it */
     if (svr->conn) {
-        if (apr_dbd_check_conn(svr->conn->driver, pool, svr->conn->handle) !=
0){
+        rv = apr_dbd_check_conn(svr->conn->driver, pool, svr->conn->handle);
+        if ((rv != APR_SUCCESS) && (rv != APR_ENOTIMPL)) {
             errmsg = apr_dbd_error(arec->driver, arec->handle, rv);
             if (!errmsg) {
                 errmsg = "(unknown)";



Mime
View raw message