From: Guenter Knauf <fuankg@apache.org>
Date: Wed, 16 Mar 2011 02:47:58 +0000 (+0000)
Subject: Fixed mod_lua - 2nd trial.
X-Git-Tag: 2.3.12~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55fdc6fee796aeccb23f5f8af3b5d3838361f7f4;p=thirdparty%2Fapache%2Fhttpd.git

Fixed mod_lua - 2nd trial.

Reverted changed vm_release call from r1082026;
fixed cleanup_lua call.


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

diff --git a/modules/lua/lua_vmprep.c b/modules/lua/lua_vmprep.c
index 837680833bf..03c26054bfa 100644
--- a/modules/lua/lua_vmprep.c
+++ b/modules/lua/lua_vmprep.c
@@ -412,7 +412,7 @@ AP_LUA_DECLARE(lua_State*)ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
             lua_pushlightuserdata(L, L);
             lua_pushlightuserdata(L, reslist);
             lua_rawset(L,LUA_REGISTRYINDEX);
-            apr_pool_userdata_set(L, spec->file, &vm_release, lifecycle_pool);
+            apr_pool_userdata_set(L, spec->file, vm_release, lifecycle_pool);
         }
     } else {
         if (apr_pool_userdata_get((void **)&L, spec->file,
@@ -420,11 +420,12 @@ AP_LUA_DECLARE(lua_State*)ap_lua_get_lua_state(apr_pool_t *lifecycle_pool,
 
             if(L==NULL) {
                 ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, lifecycle_pool,
-                    "creating lua_State with file %s", spec->file);
+                              "creating lua_State with file %s", spec->file);
                 /* not available, so create */
 
                 if(!vm_construct((void **)&L, spec, lifecycle_pool))
-                    apr_pool_userdata_set(L, spec->file, &cleanup_lua, lifecycle_pool);
+                    apr_pool_userdata_set(L, spec->file, cleanup_lua,
+                                          lifecycle_pool);
             }
         }
     }