diff --git a/modules/lua/config.m4 b/modules/lua/config.m4

index 29fd563..abeba1c 100644

--- a/modules/lua/config.m4

+++ b/modules/lua/config.m4

@@ -34,7 +34,7 @@ AC_DEFUN([CHECK_LUA_PATH], [dnl

     fi

 ])

-dnl Check for Lua 5.3/5.2/5.1 Libraries

+dnl Check for Lua Libraries

 dnl CHECK_LUA(ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND])

 dnl Sets:

 dnl  LUA_CFLAGS

@@ -44,7 +44,7 @@ AC_DEFUN([CHECK_LUA],

 AC_ARG_WITH(

     lua,

-    [AC_HELP_STRING([--with-lua=PATH],[Path to the Lua 5.3/5.2/5.1 prefix])],

+    [AC_HELP_STRING([--with-lua=PATH],[Path to the Lua installation prefix])],

     lua_path="$withval",

     :)

diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c

index 05f1e44..18b628c 100644

--- a/modules/lua/mod_lua.c

+++ b/modules/lua/mod_lua.c

@@ -342,7 +342,7 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil

 {

     apr_pool_t *pool;

     ap_lua_vm_spec *spec;

-    int n, rc;

+    int n, rc, nres;

     lua_State *L;

     lua_filter_ctx *ctx;    

     ap_lua_server_cfg *server_cfg = ap_get_module_config(r->server->module_config,

@@ -410,7 +410,7 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil

             /* If a Lua filter is interested in filtering a request, it must first do a yield, 

              * otherwise we'll assume that it's not interested and pretend we didn't find it.

              */

-            rc = lua_resume(L, 1);

+            rc = lua_resume(L, 1, &nres);

             if (rc == LUA_YIELD) {

                 if (f->frec->providers == NULL) { 

                     /* Not wired by mod_filter */

@@ -432,7 +432,7 @@ static apr_status_t lua_setup_filter_ctx(ap_filter_t* f, request_rec* r, lua_fil

 static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade *pbbIn)

 {

     request_rec *r = f->r;

-    int rc;

+    int rc, nres;

     lua_State *L;

     lua_filter_ctx* ctx;

     conn_rec *c = r->connection;

@@ -492,7 +492,7 @@ static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade

             lua_setglobal(L, "bucket");

             /* If Lua yielded, it means we have something to pass on */

-            if (lua_resume(L, 0) == LUA_YIELD) {

+            if (lua_resume(L, 0, &nres) == LUA_YIELD && nres == 1) {

                 size_t olen;

                 const char* output = lua_tolstring(L, 1, &olen);

                 if (olen > 0) { 

@@ -524,7 +524,7 @@ static apr_status_t lua_output_filter_handle(ap_filter_t *f, apr_bucket_brigade

             apr_bucket *pbktEOS;

             lua_pushnil(L);

             lua_setglobal(L, "bucket");

-            if (lua_resume(L, 0) == LUA_YIELD) {

+            if (lua_resume(L, 0, &nres) == LUA_YIELD && nres == 1) {

                 apr_bucket *pbktOut;

                 size_t olen;

                 const char* output = lua_tolstring(L, 1, &olen);

@@ -558,7 +558,7 @@ static apr_status_t lua_input_filter_handle(ap_filter_t *f,

                                        apr_off_t nBytes) 

 {

     request_rec *r = f->r;

-    int rc, lastCall = 0;

+    int rc, lastCall = 0, nres;

     lua_State *L;

     lua_filter_ctx* ctx;

     conn_rec *c = r->connection;

@@ -621,7 +621,7 @@ static apr_status_t lua_input_filter_handle(ap_filter_t *f,

             lua_setglobal(L, "bucket");

             /* If Lua yielded, it means we have something to pass on */

-            if (lua_resume(L, 0) == LUA_YIELD) {

+            if (lua_resume(L, 0, &nres) == LUA_YIELD && nres == 1) {

                 size_t olen;

                 const char* output = lua_tolstring(L, 1, &olen);

                 pbktOut = apr_bucket_heap_create(output, olen, 0, c->bucket_alloc);

@@ -643,7 +643,7 @@ static apr_status_t lua_input_filter_handle(ap_filter_t *f,

             apr_bucket *pbktEOS = apr_bucket_eos_create(c->bucket_alloc);

             lua_pushnil(L);

             lua_setglobal(L, "bucket");

-            if (lua_resume(L, 0) == LUA_YIELD) {

+            if (lua_resume(L, 0, &nres) == LUA_YIELD && nres == 1) {

                 apr_bucket *pbktOut;

                 size_t olen;

                 const char* output = lua_tolstring(L, 1, &olen);

diff --git a/modules/lua/mod_lua.h b/modules/lua/mod_lua.h

index 0e49cdc..72b4de7 100644

--- a/modules/lua/mod_lua.h

+++ b/modules/lua/mod_lua.h

@@ -48,7 +48,15 @@

 #if LUA_VERSION_NUM > 501

 /* Load mode for lua_load() */

 #define lua_load(a,b,c,d)  lua_load(a,b,c,d,NULL)

-#define lua_resume(a,b)    lua_resume(a, NULL, b)

+

+#if LUA_VERSION_NUM > 503

+#define lua_resume(a,b,c)    lua_resume(a, NULL, b, c)

+#else

+/* ### For version < 5.4, assume that exactly one stack item is on the

+ * stack, which is what the code did before but seems dubious. */

+#define lua_resume(a,b,c)    (*(c) = 1, lua_resume(a, NULL, b))

+#endif

+

 #define luaL_setfuncs_compat(a,b) luaL_setfuncs(a,b,0)

 #else

 #define lua_rawlen(L,i)    lua_objlen(L, (i))