diff options
| author | Nick Kew <niq@apache.org> | 2005-11-09 22:12:45 +0100 |
|---|---|---|
| committer | Nick Kew <niq@apache.org> | 2005-11-09 22:12:45 +0100 |
| commit | b87b4fa9a0d72477dae176c91c510ae7e4845a96 (patch) | |
| tree | d1308f0f61695a6458300ba4274c17d121b8a547 | |
| parent | Remove an unnecessary module reference to LLDAPX (diff) | |
| download | apache2-b87b4fa9a0d72477dae176c91c510ae7e4845a96.tar.xz apache2-b87b4fa9a0d72477dae176c91c510ae7e4845a96.zip | |
Work if check_conn is NOTIMPL in a driver
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332142 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/database/mod_dbd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c index fff0e4b2cb..ed09108e96 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)"; |