synchronized with meta-lua-module #da938b5.

thibaultcha · thibaultcha · commit 34e6952e1d90 · 2019-08-26T16:20:46.000-07:00
diff --git a/src/ngx_stream_lua_common.h b/src/ngx_stream_lua_common.h
@@ -63,6 +63,11 @@
 #endif
 
 
+#if !defined(LUAJIT_VERSION_NUM) || (LUAJIT_VERSION_NUM < 20000)
+#   error unsupported LuaJIT version
+#endif
+
+
 #if (!defined OPENSSL_NO_OCSP && defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB)
 #   define NGX_STREAM_LUA_USE_OCSP 1
 #endif
@@ -178,8 +183,6 @@ struct ngx_stream_lua_main_conf_s {
     ngx_cycle_t         *cycle;
     ngx_pool_t          *pool;
 
-    ngx_flag_t           load_resty_core;
-
     ngx_int_t            max_pending_timers;
     ngx_int_t            pending_timers;
 
diff --git a/src/ngx_stream_lua_directive.c b/src/ngx_stream_lua_directive.c
@@ -177,6 +177,19 @@ ngx_stream_lua_code_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 }
 
 
+char *
+ngx_stream_lua_load_resty_core(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf)
+{
+    ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
+                       "lua_load_resty_core is deprecated (the lua-resty-core "
+                       "library is required since "
+                       "ngx_stream_lua v0.0.8)");
+
+    return NGX_CONF_OK;
+}
+
+
 char *
 ngx_stream_lua_package_cpath(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
diff --git a/src/ngx_stream_lua_directive.h b/src/ngx_stream_lua_directive.h
@@ -45,6 +45,8 @@ char *ngx_stream_lua_init_worker_by_lua_block(ngx_conf_t *cf,
 char *ngx_stream_lua_init_worker_by_lua(ngx_conf_t *cf, ngx_command_t *cmd,
     void *conf);
 char *ngx_stream_lua_code_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
+char *ngx_stream_lua_load_resty_core(ngx_conf_t *cf, ngx_command_t *cmd,
+    void *conf);
 
 
 char *
diff --git a/src/ngx_stream_lua_initworkerby.c b/src/ngx_stream_lua_initworkerby.c
@@ -96,7 +96,6 @@ ngx_stream_lua_init_worker(ngx_cycle_t *cycle)
 
     conf_ctx = (ngx_stream_conf_ctx_t *)
                cycle->conf_ctx[ngx_stream_module.index];
-    stream_ctx.main_conf = conf_ctx->main_conf;
 
     top_clcf = conf_ctx->srv_conf[ngx_stream_core_module.ctx_index];
     top_llcf = conf_ctx->srv_conf[ngx_stream_lua_module.ctx_index];
@@ -209,6 +208,12 @@ ngx_stream_lua_init_worker(ngx_cycle_t *cycle)
         return NGX_ERROR;
     }
 
+    stream_ctx.main_conf = ngx_pcalloc(conf.pool,
+                                       sizeof(void *) * ngx_stream_max_module);
+    if (stream_ctx.main_conf == NULL) {
+        return NGX_ERROR;
+    }
+
 #if defined(nginx_version) && nginx_version >= 1009011
     modules = cycle->modules;
 #else
@@ -222,6 +227,21 @@ ngx_stream_lua_init_worker(ngx_cycle_t *cycle)
 
         module = modules[i]->ctx;
 
+        if (module->create_main_conf) {
+            cur = module->create_main_conf(&conf);
+            if (cur == NULL) {
+                return NGX_ERROR;
+            }
+
+            if (ngx_modules[i]->index == ngx_stream_lua_module.index) {
+                ngx_memcpy(cur,
+                           conf_ctx->main_conf[ngx_stream_lua_module.ctx_index],
+                           sizeof(ngx_stream_lua_main_conf_t));
+            }
+
+            stream_ctx.main_conf[modules[i]->ctx_index] = cur;
+        }
+
         if (module->create_srv_conf) {
             cur = module->create_srv_conf(&conf);
             if (cur == NULL) {
diff --git a/src/ngx_stream_lua_log.c b/src/ngx_stream_lua_log.c
@@ -203,7 +203,7 @@ log_wrapper(ngx_log_t *log, const char *ident, ngx_uint_t level,
     *p++ = ':';
 
     p = ngx_snprintf(p, NGX_INT_T_LEN, "%d",
-                     ar.currentline ? ar.currentline : ar.linedefined);
+                     ar.currentline > 0 ? ar.currentline : ar.linedefined);
 
     *p++ = ':'; *p++ = ' ';
 
diff --git a/src/ngx_stream_lua_module.c b/src/ngx_stream_lua_module.c
@@ -82,9 +82,9 @@ static ngx_command_t ngx_stream_lua_cmds[] = {
 
     { ngx_string("lua_load_resty_core"),
       NGX_STREAM_MAIN_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
+      ngx_stream_lua_load_resty_core,
       NGX_STREAM_MAIN_CONF_OFFSET,
-      offsetof(ngx_stream_lua_main_conf_t, load_resty_core),
+      0,
       NULL },
 
     { ngx_string("lua_max_running_timers"),
@@ -554,14 +554,33 @@ ngx_stream_lua_init(ngx_conf_t *cf)
 #endif
 
 
-        lmcf->lua = ngx_stream_lua_init_vm(NULL, cf->cycle, cf->pool, lmcf,
-                                           cf->log, NULL);
-        if (lmcf->lua == NULL) {
-            ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
-                               "failed to initialize Lua VM");
-            return NGX_ERROR;
+        rc = ngx_stream_lua_init_vm(&lmcf->lua, NULL, cf->cycle, cf->pool,
+                                    lmcf, cf->log, NULL);
+        if (rc != NGX_OK) {
+            if (rc == NGX_DECLINED) {
+                ngx_stream_lua_assert(lmcf->lua != NULL);
+
+                ngx_conf_log_error(NGX_LOG_ALERT, cf, 0,
+                                   "failed to load the 'resty.core' module "
+                                   "(https://github.com/openresty/lua-resty"
+                                   "-core); ensure you are using an OpenResty "
+                                   "release from https://openresty.org/en/"
+                                   "download.html (reason: %s)",
+                                   lua_tostring(lmcf->lua, -1));
+
+            } else {
+                /* rc == NGX_ERROR */
+                ngx_conf_log_error(NGX_LOG_ALERT, cf, 0,
+                                   "failed to initialize Lua VM");
+            }
+
+             return NGX_ERROR;
         }
 
+        /* rc == NGX_OK */
+
+        ngx_stream_lua_assert(lmcf->lua != NULL);
+
         if (!lmcf->requires_shm && lmcf->init_handler) {
             saved_cycle = ngx_cycle;
             ngx_cycle = cf->cycle;
@@ -649,7 +668,6 @@ ngx_stream_lua_create_main_conf(ngx_conf_t *cf)
      */
 
     lmcf->pool = cf->pool;
-    lmcf->load_resty_core = NGX_CONF_UNSET;
     lmcf->max_pending_timers = NGX_CONF_UNSET;
     lmcf->max_running_timers = NGX_CONF_UNSET;
 #if (NGX_PCRE)
@@ -681,10 +699,6 @@ ngx_stream_lua_init_main_conf(ngx_conf_t *cf, void *conf)
 {
     ngx_stream_lua_main_conf_t       *lmcf = conf;
 
-    if (lmcf->load_resty_core == NGX_CONF_UNSET) {
-        lmcf->load_resty_core = 1;
-    }
-
 #if (NGX_PCRE)
     if (lmcf->regex_cache_max_entries == NGX_CONF_UNSET) {
         lmcf->regex_cache_max_entries = 1024;
diff --git a/src/ngx_stream_lua_semaphore.c b/src/ngx_stream_lua_semaphore.c
@@ -93,6 +93,8 @@ ngx_stream_lua_alloc_sema(void)
     lmcf = ngx_stream_cycle_get_module_main_conf(ngx_cycle,
                                                  ngx_stream_lua_module);
 
+    ngx_stream_lua_assert(lmcf != NULL);
+
     mm = lmcf->sema_mm;
 
     if (!ngx_queue_empty(&mm->free_queue)) {
@@ -179,6 +181,8 @@ ngx_stream_lua_sema_mm_cleanup(void *data)
         sem = ngx_queue_data(q, ngx_stream_lua_sema_t, chain);
         block = sem->block;
 
+        ngx_stream_lua_assert(block != NULL);
+
         if (block->used == 0) {
             iter = (ngx_stream_lua_sema_t *) (block + 1);
 
diff --git a/src/ngx_stream_lua_util.c b/src/ngx_stream_lua_util.c
@@ -251,7 +251,6 @@ ngx_stream_lua_new_state(lua_State *parent_vm, ngx_cycle_t *cycle,
 
         lua_pushliteral(L, LUA_DEFAULT_PATH ";"); /* package default */
         lua_getfield(L, -2, "path"); /* package default old */
-        old_path = lua_tolstring(L, -1, &old_path_len);
         lua_concat(L, 2); /* package new */
         lua_setfield(L, -2, "path"); /* package */
 #endif
@@ -3267,9 +3266,10 @@ ngx_stream_lua_close_fake_connection(ngx_connection_t *c)
 }
 
 
-lua_State *
-ngx_stream_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
-    ngx_pool_t *pool, ngx_stream_lua_main_conf_t *lmcf, ngx_log_t *log,
+ngx_int_t
+ngx_stream_lua_init_vm(lua_State **new_vm, lua_State *parent_vm,
+    ngx_cycle_t *cycle, ngx_pool_t *pool,
+    ngx_stream_lua_main_conf_t *lmcf, ngx_log_t *log,
     ngx_pool_cleanup_t **pcln)
 {
     int                              rc;
@@ -3282,13 +3282,13 @@ ngx_stream_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
 
     cln = ngx_pool_cleanup_add(pool, 0);
     if (cln == NULL) {
-        return NULL;
+        return NGX_ERROR;
     }
 
     /* create new Lua VM instance */
     L = ngx_stream_lua_new_state(parent_vm, cycle, lmcf, log);
     if (L == NULL) {
-        return NULL;
+        return NGX_ERROR;
     }
 
     ngx_log_debug1(NGX_LOG_DEBUG_STREAM, log, 0, "lua initialize the "
@@ -3299,7 +3299,7 @@ ngx_stream_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
 
     state = ngx_alloc(sizeof(ngx_stream_lua_vm_state_t), log);
     if (state == NULL) {
-        return NULL;
+        return NGX_ERROR;
     }
     state->vm = L;
     state->count = 1;
@@ -3332,7 +3332,8 @@ ngx_stream_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
 
         for (i = 0; i < lmcf->preload_hooks->nelts; i++) {
 
-            ngx_stream_lua_probe_register_preload_package(L, hook[i].package);
+            ngx_stream_lua_probe_register_preload_package(L,
+                                                          hook[i].package);
 
             lua_pushcfunction(L, hook[i].loader);
             lua_setfield(L, -2, (char *) hook[i].package);
@@ -3341,22 +3342,17 @@ ngx_stream_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
         lua_pop(L, 2);
     }
 
-    if (lmcf->load_resty_core) {
-        lua_getglobal(L, "require");
-        lua_pushstring(L, "resty.core");
+    *new_vm = L;
 
-        rc = lua_pcall(L, 1, 1, 0);
-        if (rc != 0) {
-            ngx_log_error(NGX_LOG_ERR, log, 0,
-                          "lua_load_resty_core failed to load the resty.core "
-                          "module from https://github.com/openresty/lua-resty"
-                          "-core; ensure you are using an OpenResty release "
-                          "from https://openresty.org/en/download.html "
-                          "(rc: %i, reason: %s)", rc, lua_tostring(L, -1));
-        }
-    }
+    lua_getglobal(L, "require");
+    lua_pushstring(L, "resty.core");
 
-    return L;
+    rc = lua_pcall(L, 1, 1, 0);
+    if (rc != 0) {
+        return NGX_DECLINED;
+     }
+
+    return NGX_OK;
 }
 
 
diff --git a/src/ngx_stream_lua_util.h b/src/ngx_stream_lua_util.h
@@ -132,8 +132,9 @@ ngx_stream_lua_ffi_check_context(ngx_stream_lua_ctx_t *ctx,
     SSL_get_ex_data(ssl_conn, ngx_stream_lua_ssl_ctx_index)
 
 
-lua_State *ngx_stream_lua_init_vm(lua_State *parent_vm, ngx_cycle_t *cycle,
-    ngx_pool_t *pool, ngx_stream_lua_main_conf_t *lmcf, ngx_log_t *log,
+ngx_int_t ngx_stream_lua_init_vm(lua_State **new_vm, lua_State *parent_vm,
+    ngx_cycle_t *cycle, ngx_pool_t *pool,
+    ngx_stream_lua_main_conf_t *lmcf, ngx_log_t *log,
     ngx_pool_cleanup_t **pcln);
 
 lua_State *ngx_stream_lua_new_thread(ngx_stream_lua_request_t *r, lua_State *l,
@@ -272,7 +273,8 @@ ngx_stream_lua_init_ctx(ngx_stream_lua_request_t *r, ngx_stream_lua_ctx_t *ctx)
 static ngx_inline ngx_stream_lua_ctx_t *
 ngx_stream_lua_create_ctx(ngx_stream_session_t *r)
 {
-    lua_State                           *L;
+    ngx_int_t                            rc;
+    lua_State                           *L = NULL;
     ngx_stream_lua_ctx_t                *ctx;
     ngx_pool_cleanup_t                  *cln;
     ngx_stream_lua_loc_conf_t           *llcf;
@@ -311,8 +313,8 @@ ngx_stream_lua_create_ctx(ngx_stream_session_t *r)
          * the correct semantics.
          */
 
-        L = ngx_stream_lua_init_vm(lmcf->lua, lmcf->cycle, sreq->pool, lmcf,
-                                   r->connection->log, &cln);
+        rc = ngx_stream_lua_init_vm(&L, lmcf->lua, lmcf->cycle, sreq->pool,
+                                    lmcf, r->connection->log, &cln);
 
         while (cln->next != NULL) {
             cln = cln->next;
@@ -324,11 +326,30 @@ ngx_stream_lua_create_ctx(ngx_stream_session_t *r)
         sreq->pool->cleanup = cln->next;
         cln->next = NULL;
 
-        if (L == NULL) {
-            ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
-                          "failed to initialize Lua VM");
-            return NULL;
-        }
+        if (rc != NGX_OK) {
+            if (rc == NGX_DECLINED) {
+                ngx_stream_lua_assert(L != NULL);
+
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "failed to load the 'resty.core' module "
+                              "(https://github.com/openresty/lua-resty"
+                              "-core); ensure you are using an OpenResty "
+                              "release from https://openresty.org/en/"
+                              "download.html (reason: %s)",
+                              lua_tostring(L, -1));
+
+            } else {
+                /* rc == NGX_ERROR */
+                ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+                              "failed to initialize Lua VM");
+            }
+
+             return NULL;
+         }
+
+        /* rc == NGX_OK */
+
+        ngx_stream_lua_assert(L != NULL);
 
         if (lmcf->init_handler) {
             if (lmcf->init_handler(r->connection->log, lmcf, L) != NGX_OK) {
