From: Daniel Gruno <humbedooh@apache.org>
Date: Sat, 2 Feb 2013 12:20:02 +0000 (+0000)
Subject: backported r1439208 to 2.4
X-Git-Tag: 2.4.4~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5f73bf85b556a31d9f5f5b9817bb31261606649;p=apache

backported r1439208 to 2.4

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1441739 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index d25a767982..be533c7253 100644
--- a/STATUS
+++ b/STATUS
@@ -91,12 +91,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_lua: fix handle releasing function (mod dbd and apr dbd got mixed up)
-    This bug causes mod dbd to lose its connections, which is not intended.
-    trunk patch:  http://svn.apache.org/r1439208
-    2.4.x patch:  trunk patch works.
-    +1: humbedooh, covener, jailletc36
-
     
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/lua/lua_dbd.c b/modules/lua/lua_dbd.c
index 4c71a17834..350ec2474b 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;