From ce09e85e724a930cf9b52f69af4ed8209a02ba00 Mon Sep 17 00:00:00 2001 From: Nick Kew Date: Sun, 13 Nov 2005 18:50:16 +0000 Subject: [PATCH] Work OK if check_conn is NOTIMPL in a driver git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@333102 13f79535-47bb-0310-9956-ffa450edef68 --- modules/database/mod_dbd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c index fff0e4b2cb5..ed09108e967 100644 --- a/modules/database/mod_dbd.c +++ b/modules/database/mod_dbd.c @@ -322,7 +322,8 @@ ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s) "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 @@ ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s) /* 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)"; -- 2.47.2