httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject svn commit: r1439208 - /httpd/httpd/trunk/modules/lua/lua_dbd.c
Date Sun, 27 Jan 2013 23:26:43 GMT
Author: humbedooh
Date: Sun Jan 27 23:26:43 2013
New Revision: 1439208

URL: http://svn.apache.org/viewvc?rev=1439208&view=rev
Log:
apr dbd and mod dbd have been mixed up in the handle closing function, so let's sort it out.

Modified:
    httpd/httpd/trunk/modules/lua/lua_dbd.c

Modified: httpd/httpd/trunk/modules/lua/lua_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_dbd.c?rev=1439208&r1=1439207&r2=1439208&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/lua_dbd.c (original)
+++ httpd/httpd/trunk/modules/lua/lua_dbd.c Sun Jan 27 23:26:43 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;



Mime
View raw message