123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195 |
- --- a/lua-nginx/src/ngx_http_lua_module.c
- +++ b/lua-nginx/src/ngx_http_lua_module.c
- @@ -157,14 +157,14 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- offsetof(ngx_http_lua_loc_conf_t, log_socket_errors),
- NULL },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- { ngx_string("init_by_lua_block"),
- NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
- ngx_http_lua_init_by_lua_block,
- NGX_HTTP_MAIN_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_init_by_inline },
- -
- +#endif
- { ngx_string("init_by_lua"),
- NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
- ngx_http_lua_init_by_lua,
- @@ -178,14 +178,14 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_MAIN_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_init_by_file },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- { ngx_string("init_worker_by_lua_block"),
- NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
- ngx_http_lua_init_worker_by_lua_block,
- NGX_HTTP_MAIN_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_init_worker_by_inline },
- -
- +#endif
- { ngx_string("init_worker_by_lua"),
- NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
- ngx_http_lua_init_worker_by_lua,
- @@ -201,6 +201,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- (void *) ngx_http_lua_init_worker_by_file },
-
- #if defined(NDK) && NDK
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- /* set_by_lua $res { inline Lua code } [$arg1 [$arg2 [...]]] */
- { ngx_string("set_by_lua_block"),
- NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- @@ -209,7 +210,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_filter_set_by_lua_inline },
- -
- +#endif
- /* set_by_lua $res <inline script> [$arg1 [$arg2 [...]]] */
- { ngx_string("set_by_lua"),
- NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- @@ -237,7 +238,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_rewrite_handler_inline },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- /* rewrite_by_lua_block { <inline script> } */
- { ngx_string("rewrite_by_lua_block"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- @@ -246,7 +247,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_rewrite_handler_inline },
- -
- +#endif
- /* access_by_lua "<inline script>" */
- { ngx_string("access_by_lua"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- @@ -255,7 +256,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_access_handler_inline },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- /* access_by_lua_block { <inline script> } */
- { ngx_string("access_by_lua_block"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- @@ -264,7 +265,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_access_handler_inline },
- -
- +#endif
- /* content_by_lua "<inline script>" */
- { ngx_string("content_by_lua"),
- NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
- @@ -272,7 +273,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_content_handler_inline },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- /* content_by_lua_block { <inline script> } */
- { ngx_string("content_by_lua_block"),
- NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
- @@ -280,7 +281,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_content_handler_inline },
- -
- +#endif
- /* log_by_lua <inline script> */
- { ngx_string("log_by_lua"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- @@ -289,7 +290,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_log_handler_inline },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- /* log_by_lua_block { <inline script> } */
- { ngx_string("log_by_lua_block"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- @@ -298,7 +299,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_log_handler_inline },
- -
- +#endif
- { ngx_string("rewrite_by_lua_file"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- |NGX_CONF_TAKE1,
- @@ -353,7 +354,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_header_filter_inline },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- /* header_filter_by_lua_block { <inline script> } */
- { ngx_string("header_filter_by_lua_block"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- @@ -362,7 +363,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_header_filter_inline },
- -
- +#endif
- { ngx_string("header_filter_by_lua_file"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- |NGX_CONF_TAKE1,
- @@ -378,7 +379,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_body_filter_inline },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- /* body_filter_by_lua_block { <inline script> } */
- { ngx_string("body_filter_by_lua_block"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- @@ -387,7 +388,7 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_body_filter_inline },
- -
- +#endif
- { ngx_string("body_filter_by_lua_file"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
- |NGX_CONF_TAKE1,
- @@ -395,14 +396,14 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_body_filter_file },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- { ngx_string("balancer_by_lua_block"),
- NGX_HTTP_UPS_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
- ngx_http_lua_balancer_by_lua_block,
- NGX_HTTP_SRV_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_balancer_handler_inline },
- -
- +#endif
- { ngx_string("balancer_by_lua_file"),
- NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
- ngx_http_lua_balancer_by_lua,
- @@ -509,14 +510,14 @@ static ngx_command_t ngx_http_lua_cmds[]
- NGX_HTTP_LOC_CONF_OFFSET,
- offsetof(ngx_http_lua_loc_conf_t, ssl_ciphers),
- NULL },
- -
- +#ifndef NGX_LUA_NO_BY_LUA_BLOCK
- { ngx_string("ssl_certificate_by_lua_block"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
- ngx_http_lua_ssl_cert_by_lua_block,
- NGX_HTTP_SRV_CONF_OFFSET,
- 0,
- (void *) ngx_http_lua_ssl_cert_handler_inline },
- -
- +#endif
- { ngx_string("ssl_certificate_by_lua_file"),
- NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
- ngx_http_lua_ssl_cert_by_lua,
|