You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2013/02/02 13:20:03 UTC
svn commit: r1441739 - in /httpd/httpd/branches/2.4.x: STATUS
modules/lua/lua_dbd.c
Author: humbedooh
Date: Sat Feb 2 12:20:02 2013
New Revision: 1441739
URL: http://svn.apache.org/viewvc?rev=1441739&view=rev
Log:
backported r1439208 to 2.4
Modified:
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/lua/lua_dbd.c
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1441739&r1=1441738&r2=1441739&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Feb 2 12:20:02 2013
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/modules/lua/lua_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/lua_dbd.c?rev=1441739&r1=1441738&r2=1441739&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/lua/lua_dbd.c (original)
+++ httpd/httpd/branches/2.4.x/modules/lua/lua_dbd.c Sat Feb 2 12:20:02 2013
@@ -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;