You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2005/11/09 22:12:49 UTC
svn commit: r332142 - /httpd/httpd/trunk/modules/database/mod_dbd.c
Author: niq
Date: Wed Nov 9 13:12:45 2005
New Revision: 332142
URL: http://svn.apache.org/viewcvs?rev=332142&view=rev
Log:
Work if check_conn is NOTIMPL in a driver
Modified:
httpd/httpd/trunk/modules/database/mod_dbd.c
Modified: httpd/httpd/trunk/modules/database/mod_dbd.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/database/mod_dbd.c?rev=332142&r1=332141&r2=332142&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/database/mod_dbd.c (original)
+++ httpd/httpd/trunk/modules/database/mod_dbd.c Wed Nov 9 13:12:45 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)";