From: Daniel Gruno <humbedooh@apache.org>
Date: Sun, 27 Jan 2013 23:26:43 +0000 (+0000)
Subject: apr dbd and mod dbd have been mixed up in the handle closing function, so let's sort... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80b58107be49ba522eedc11eecdc283b3dc6baba;p=thirdparty%2Fapache%2Fhttpd.git

apr dbd and mod dbd have been mixed up in the handle closing function, so let's sort it out.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439208 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/lua/lua_dbd.c b/modules/lua/lua_dbd.c
index 4c71a178347..350ec2474b5 100644
--- a/modules/lua/lua_dbd.c
+++ b/modules/lua/lua_dbd.c
@@ -65,14 +65,14 @@ int lua_db_close(lua_State *L)
     
     db = lua_get_db_handle(L);
     if (db && db->alive) {
-        if (db->type == LUA_DBTYPE_MOD_DBD) {
+        if (db->type == LUA_DBTYPE_APR_DBD) {
             rc = apr_dbd_close(db->driver, db->handle);
+            if (db->pool) apr_pool_destroy(db->pool);
         }
         else {
             lua_ap_dbd_close = APR_RETRIEVE_OPTIONAL_FN(ap_dbd_close);
             if (lua_ap_dbd_close != NULL)
                 if (db->dbdhandle) lua_ap_dbd_close(db->server, db->dbdhandle);
-            if (db->pool) apr_pool_destroy(db->pool);
         }
 
         db->driver = NULL;