nginx: correct errors from previous merge

Signed-off-by: heil <heil@terminal-consulting.de>
2025-12-23 12:24:32 +04:00 · 2016-05-09 14:25:18 +02:00
parent 3ac53e4ee2
commit f3c7cc6e24
4 changed files with 109 additions and 69 deletions
--- a/net/nginx/patches-lua-nginx/100-dont_export_symbols.patch
+++ b/net/nginx/patches-lua-nginx/100-dont_export_symbols.patch
@@ -0,0 +1,65 @@
+--- a/lua-nginx/config
+++ b/lua-nginx/config
+@@ -409,35 +409,35 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
+ 
+ CFLAGS="$CFLAGS -DNDK_SET_VAR"
+ 
+-ngx_feature="export symbols by default (-E)"
+-ngx_feature_libs="-Wl,-E"
+-ngx_feature_name=
+-ngx_feature_run=no
+-ngx_feature_incs="#include <stdio.h>"
+-ngx_feature_path=
+-ngx_feature_test='printf("hello");'
+-
+-. auto/feature
+-
+-if [ $ngx_found = yes ]; then
+-    CORE_LIBS="-Wl,-E $CORE_LIBS"
+-fi
+#ngx_feature="export symbols by default (-E)"
+#ngx_feature_libs="-Wl,-E"
+#ngx_feature_name=
+#ngx_feature_run=no
+#ngx_feature_incs="#include <stdio.h>"
+#ngx_feature_path=
+#ngx_feature_test='printf("hello");'
+#
+#. auto/feature
+#
+#if [ $ngx_found = yes ]; then
+#    CORE_LIBS="-Wl,-E $CORE_LIBS"
+#fi
+ 
+ # for Cygwin
+-ngx_feature="export symbols by default (--export-all-symbols)"
+-ngx_feature_libs="-Wl,--export-all-symbols"
+-ngx_feature_name=
+-ngx_feature_run=no
+-ngx_feature_incs="#include <stdio.h>"
+-ngx_feature_path=
+-ngx_feature_test='printf("hello");'
+-
+-. auto/feature
+-
+-if [ $ngx_found = yes ]; then
+-    CORE_LIBS="-Wl,--export-all-symbols $CORE_LIBS"
+-fi
+-
+#ngx_feature="export symbols by default (--export-all-symbols)"
+#ngx_feature_libs="-Wl,--export-all-symbols"
+#ngx_feature_name=
+#ngx_feature_run=no
+#ngx_feature_incs="#include <stdio.h>"
+#ngx_feature_path=
+#ngx_feature_test='printf("hello");'
+#
+#. auto/feature
+#
+#if [ $ngx_found = yes ]; then
+#    CORE_LIBS="-Wl,--export-all-symbols $CORE_LIBS"
+#fi
+#
+ NGX_DTRACE_PROVIDERS="$NGX_DTRACE_PROVIDERS $ngx_addon_dir/dtrace/ngx_lua_provider.d"
+ NGX_TAPSET_SRCS="$NGX_TAPSET_SRCS $ngx_addon_dir/tapset/ngx_lua.stp"
+ 
--- a/net/nginx/patches-lua-nginx/101-no_by_lua_block.patch
+++ b/net/nginx/patches-lua-nginx/101-no_by_lua_block.patch
@@ -1,6 +1,6 @@
 --- a/lua-nginx/src/ngx_http_lua_module.c
 +++ b/lua-nginx/src/ngx_http_lua_module.c
-@@ -150,14 +150,14 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -148,14 +148,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 },
@@ -17,7 +17,7 @@
     { ngx_string("init_by_lua"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_http_lua_init_by_lua,
-@@ -171,14 +171,14 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -169,14 +169,14 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_MAIN_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_init_by_file },
@@ -34,24 +34,7 @@
     { ngx_string("init_worker_by_lua"),
       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
       ngx_http_lua_init_worker_by_lua,
-@@ -194,6 +194,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
-@@ -202,7 +203,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
-@@ -230,7 +231,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -228,7 +228,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_rewrite_handler_inline },
@@ -60,7 +43,7 @@
     /* 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
-@@ -239,7 +240,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -237,7 +237,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_rewrite_handler_inline },
@@ -69,7 +52,7 @@
     /* 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
-@@ -248,7 +249,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -246,7 +246,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_access_handler_inline },
@@ -78,7 +61,7 @@
     /* 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
-@@ -257,7 +258,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -255,7 +255,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_access_handler_inline },
@@ -87,7 +70,7 @@
     /* content_by_lua "<inline script>" */
     { ngx_string("content_by_lua"),
       NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
-@@ -265,7 +266,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -263,7 +263,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_content_handler_inline },
@@ -96,7 +79,7 @@
     /* 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,
-@@ -273,7 +274,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -271,7 +271,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_content_handler_inline },
@@ -105,7 +88,7 @@
     /* 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
-@@ -282,7 +283,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -280,7 +280,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_log_handler_inline },
@@ -114,7 +97,7 @@
     /* 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
-@@ -291,7 +292,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -289,7 +289,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_log_handler_inline },
@@ -123,7 +106,7 @@
     { 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,
-@@ -346,7 +347,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -337,7 +337,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_header_filter_inline },
@@ -132,7 +115,7 @@
     /* 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
-@@ -355,7 +356,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -346,7 +346,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_header_filter_inline },
@@ -141,7 +124,7 @@
     { 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,
-@@ -371,7 +372,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -362,7 +362,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_body_filter_inline },
@@ -150,7 +133,7 @@
     /* 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
-@@ -380,7 +381,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+@@ -371,7 +371,7 @@ static ngx_command_t ngx_http_lua_cmds[]
       NGX_HTTP_LOC_CONF_OFFSET,
       0,
       (void *) ngx_http_lua_body_filter_inline },
@@ -159,37 +142,3 @@
     { 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,
-@@ -388,14 +389,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,
-@@ -502,14 +503,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,