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 d25a767982a595e2ada94ec1559dded50e0c0175..be533c7253dca2d3f6f8a88fd3d5ef7a3e584952 100644 (file)
--- 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 4c71a1783471e606720ff5310b6e3098d1bc5241..350ec2474b5a7c49590e5964c701b870445c9097 100644 (file)
--- 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;