diff --git a/src/ngx_stream_lua_common.h b/src/ngx_stream_lua_common.h index f76229e1..5eb9440a 100644 --- a/src/ngx_stream_lua_common.h +++ b/src/ngx_stream_lua_common.h @@ -277,33 +277,19 @@ struct ngx_stream_lua_srv_conf_s { code cache */ ngx_stream_lua_handler_pt preread_handler; + u_char *preread_chunkname; + ngx_stream_complex_value_t preread_src; + u_char *preread_src_key; ngx_stream_lua_handler_pt content_handler; - ngx_stream_lua_handler_pt log_handler; - - u_char *preread_chunkname; - ngx_stream_complex_value_t preread_src; /* access_by_lua - inline script/script - file path */ - - u_char *preread_src_key; /* cached key for access_src */ - - u_char *content_chunkname; + u_char *content_chunkname; + ngx_stream_complex_value_t content_src; + u_char *content_src_key; - ngx_stream_complex_value_t content_src; - /* content_by_lua - * inline script/script - * file path */ - - u_char *content_src_key; /* cached key for content_src */ - - u_char *log_chunkname; - ngx_stream_complex_value_t log_src; - /* log_by_lua inline script/script - * file path */ - - u_char *log_src_key; - /* cached key for log_src */ + ngx_stream_lua_handler_pt log_handler; + u_char *log_chunkname; + ngx_stream_complex_value_t log_src; + u_char *log_src_key; ngx_msec_t keepalive_timeout; diff --git a/src/ngx_stream_lua_module.c b/src/ngx_stream_lua_module.c index 5c9024e7..edb14227 100644 --- a/src/ngx_stream_lua_module.c +++ b/src/ngx_stream_lua_module.c @@ -718,6 +718,8 @@ ngx_stream_lua_create_main_conf(ngx_conf_t *cf) * lmcf->shm_zones = NULL; * lmcf->init_handler = NULL; * lmcf->init_src = { 0, NULL }; + * lmcf->init_worker_handler = NULL; + * lmcf->init_worker_src = { 0, NULL }; * lmcf->shm_zones_inited = 0; * lmcf->shdict_zones = NULL; * lmcf->preload_hooks = NULL; @@ -821,13 +823,20 @@ ngx_stream_lua_create_srv_conf(ngx_conf_t *cf) * lscf->srv.ssl_cert_src = { 0, NULL }; * lscf->srv.ssl_cert_src_key = NULL; * - * lscf->srv.ssl_session_store_handler = NULL; - * lscf->srv.ssl_session_store_src = { 0, NULL }; - * lscf->srv.ssl_session_store_src_key = NULL; + * lscf->preread_handler = NULL; + * lscf->preread_chunkname = NULL; + * lscf->preread_src = {{ 0, NULL }, NULL, NULL, NULL}; + * lscf->preread_src_key = NULL; * - * lscf->srv.ssl_session_fetch_handler = NULL; - * lscf->srv.ssl_session_fetch_src = { 0, NULL }; - * lscf->srv.ssl_session_fetch_src_key = NULL; + * lscf->content_handler = NULL; + * lscf->content_chunkname = NULL; + * lscf->content_src = {{ 0, NULL }, NULL, NULL, NULL}; + * lscf->content_src_key = NULL; + + * lscf->log_handler = NULL; + * lscf->log_chunkname = NULL; + * lscf->log_src = {{ 0, NULL }, NULL, NULL, NULL}; + * lscf->log_src_key = NULL; * * lscf->balancer.handler = NULL; * lscf->balancer.src = { 0, NULL };