39 lines
1 KiB
Diff
39 lines
1 KiB
Diff
|
--- src/mod_cml_lua.c.orig 2012-10-22 06:17:17.418886286 -0700
|
||
|
|
+++ src/mod_cml_lua.c 2012-10-22 06:25:50.289753316 -0700
|
||
|
|
@@ -28,6 +28,10 @@
|
||
|
|
#include <lualib.h>
|
||
|
|
#include <lauxlib.h>
|
||
|
|
|
||
|
|
+#if LUA_VERSION_NUM >= 502
|
||
|
|
+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
typedef struct {
|
||
|
|
stream st;
|
||
|
|
int done;
|
||
|
|
@@ -285,7 +285,11 @@
|
||
|
|
lua_settable(L, LUA_GLOBALSINDEX);
|
||
|
|
|
||
|
|
/* load lua program */
|
||
|
|
+#if LUA_VERSION_NUM >= 502
|
||
|
|
+ if (lua_load(L, load_file, &rm, fn->ptr, NULL) || lua_pcall(L,0,1,0)) {
|
||
|
|
+#else
|
||
|
|
if (lua_load(L, load_file, &rm, fn->ptr) || lua_pcall(L,0,1,0)) {
|
||
|
|
+#endif
|
||
|
|
log_error_write(srv, __FILE__, __LINE__, "s",
|
||
|
|
lua_tostring(L,-1));
|
||
|
|
|
||
|
|
--- src/mod_magnet.c 2011-06-13 04:17:01.000000000 -0700
|
||
|
|
+++ src/mod_magnet.c2 2013-10-01 06:39:18.771549986 -0700
|
||
|
|
@@ -24,6 +24,10 @@
|
||
|
|
#define MAGNET_CONFIG_PHYSICAL_PATH "magnet.attract-physical-path-to"
|
||
|
|
#define MAGNET_RESTART_REQUEST 99
|
||
|
|
|
||
|
|
+#if LUA_VERSION_NUM >= 502
|
||
|
|
+#define LUA_GLOBALSINDEX LUA_REGISTRYINDEX
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
/* plugin config for all request/connections */
|
||
|
|
|
||
|
|
static jmp_buf exceptionjmp;
|