bugfix: the return value sizes of the C functions ngx_http_lua_init_by_inline and ngx_http_lua_init_by_file were wrong.

Author: agentzh

src/ngx_http_lua_initby.c

@@ -13,7 +13,7 @@
 #include "ngx_http_lua_util.h"
 
 
-int
+ngx_int_t
 ngx_http_lua_init_by_inline(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
     lua_State *L)
 {
@@ -27,7 +27,7 @@ ngx_http_lua_init_by_inline(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
 }
 
 
-int
+ngx_int_t
 ngx_http_lua_init_by_file(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
     lua_State *L)
 {

src/ngx_http_lua_initby.h

@@ -11,11 +11,11 @@
 #include "ngx_http_lua_common.h"
 
 
-int ngx_http_lua_init_by_inline(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
-        lua_State *L);
+ngx_int_t ngx_http_lua_init_by_inline(ngx_log_t *log,
+    ngx_http_lua_main_conf_t *lmcf, lua_State *L);
 
-int ngx_http_lua_init_by_file(ngx_log_t *log, ngx_http_lua_main_conf_t *lmcf,
-        lua_State *L);
+ngx_int_t ngx_http_lua_init_by_file(ngx_log_t *log,
+    ngx_http_lua_main_conf_t *lmcf, lua_State *L);
 
 
 #endif /* _NGX_HTTP_LUA_INITBY_H_INCLUDED_ */

src/ngx_http_lua_shdict.c

@@ -103,7 +103,7 @@ ngx_http_lua_shdict_init_zone(ngx_shm_zone_t *shm_zone, void *data)
     if (lmcf->shm_zones_inited == lmcf->shm_zones->nelts
         && lmcf->init_handler)
     {
-        if (lmcf->init_handler(ctx->log, lmcf, lmcf->lua) != 0) {
+        if (lmcf->init_handler(ctx->log, lmcf, lmcf->lua) != NGX_OK) {
             /* an error happened */
             return NGX_ERROR;
         }

src/ngx_http_lua_util.c

@@ -3941,7 +3941,7 @@ ngx_http_lua_create_fake_request(ngx_connection_t *c)
 }
 
 
-int
+ngx_int_t
 ngx_http_lua_report(ngx_log_t *log, lua_State *L, int status)
 {
     const char      *msg;
@@ -3960,7 +3960,7 @@ ngx_http_lua_report(ngx_log_t *log, lua_State *L, int status)
     /* force a full garbage-collection cycle */
     lua_gc(L, LUA_GCCOLLECT, 0);
 
-    return status;
+    return status == 0 ? NGX_OK : NGX_ERROR;
 }
 
 

src/ngx_http_lua_util.h

@@ -218,7 +218,7 @@ ngx_connection_t * ngx_http_lua_create_fake_connection(void);
 
 ngx_http_request_t * ngx_http_lua_create_fake_request(ngx_connection_t *c);
 
-int ngx_http_lua_report(ngx_log_t *log, lua_State *L, int status);
+ngx_int_t ngx_http_lua_report(ngx_log_t *log, lua_State *L, int status);
 
 int ngx_http_lua_do_call(ngx_log_t *log, lua_State *L);