From 498892514deba821d6751253f783a6f383f3b784 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Thu, 16 Sep 2021 02:08:11 +0800 Subject: [PATCH] Downgrade nginx to v1.19 (#7639) Signed-off-by: Jintao Zhang --- images/nginx/rootfs/build.sh | 10 ++++-- .../patches/nginx-1.19.3-no_Werror.patch | 36 ------------------- ...> nginx-1.19.9-balancer_status_code.patch} | 0 ... => nginx-1.19.9-cache_manager_exit.patch} | 2 +- ... nginx-1.19.9-delayed_posted_events.patch} | 0 ...patch => nginx-1.19.9-hash_overflow.patch} | 0 ...ginx-1.19.9-init_cycle_pool_release.patch} | 26 +++++++------- ...> nginx-1.19.9-larger_max_error_str.patch} | 4 +-- .../patches/nginx-1.19.9-no_Werror.patch | 36 +++++++++++++++++++ ...> nginx-1.19.9-proxy_host_port_vars.patch} | 4 +-- ... nginx-1.19.9-resolver_conf_parsing.patch} | 0 ...x-1.19.9-reuseport_close_unused_fds.patch} | 0 ...1.19.9-single_process_graceful_exit.patch} | 0 ...atch => nginx-1.19.9-socket_cloexec.patch} | 2 +- ...h => nginx-1.19.9-ssl_cert_cb_yield.patch} | 0 ...h => nginx-1.19.9-ssl_sess_cb_yield.patch} | 0 ...tream_proxy_get_next_upstream_tries.patch} | 0 ...x-1.19.9-stream_ssl_preread_no_skip.patch} | 0 ...=> nginx-1.19.9-upstream_pipelining.patch} | 0 ...ginx-1.19.9-upstream_timeout_fields.patch} | 0 .../rootfs/patches/patch.2021.resolver.txt | 23 ++++++++++++ 21 files changed, 85 insertions(+), 58 deletions(-) delete mode 100644 images/nginx/rootfs/patches/nginx-1.19.3-no_Werror.patch rename images/nginx/rootfs/patches/{nginx-1.19.3-balancer_status_code.patch => nginx-1.19.9-balancer_status_code.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-cache_manager_exit.patch => nginx-1.19.9-cache_manager_exit.patch} (96%) rename images/nginx/rootfs/patches/{nginx-1.19.3-delayed_posted_events.patch => nginx-1.19.9-delayed_posted_events.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-hash_overflow.patch => nginx-1.19.9-hash_overflow.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-init_cycle_pool_release.patch => nginx-1.19.9-init_cycle_pool_release.patch} (62%) rename images/nginx/rootfs/patches/{nginx-1.19.3-larger_max_error_str.patch => nginx-1.19.9-larger_max_error_str.patch} (62%) create mode 100644 images/nginx/rootfs/patches/nginx-1.19.9-no_Werror.patch rename images/nginx/rootfs/patches/{nginx-1.19.3-proxy_host_port_vars.patch => nginx-1.19.9-proxy_host_port_vars.patch} (87%) rename images/nginx/rootfs/patches/{nginx-1.19.3-resolver_conf_parsing.patch => nginx-1.19.9-resolver_conf_parsing.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-reuseport_close_unused_fds.patch => nginx-1.19.9-reuseport_close_unused_fds.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-single_process_graceful_exit.patch => nginx-1.19.9-single_process_graceful_exit.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-socket_cloexec.patch => nginx-1.19.9-socket_cloexec.patch} (98%) rename images/nginx/rootfs/patches/{nginx-1.19.3-ssl_cert_cb_yield.patch => nginx-1.19.9-ssl_cert_cb_yield.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-ssl_sess_cb_yield.patch => nginx-1.19.9-ssl_sess_cb_yield.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-stream_proxy_get_next_upstream_tries.patch => nginx-1.19.9-stream_proxy_get_next_upstream_tries.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-stream_ssl_preread_no_skip.patch => nginx-1.19.9-stream_ssl_preread_no_skip.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-upstream_pipelining.patch => nginx-1.19.9-upstream_pipelining.patch} (100%) rename images/nginx/rootfs/patches/{nginx-1.19.3-upstream_timeout_fields.patch => nginx-1.19.9-upstream_timeout_fields.patch} (100%) create mode 100644 images/nginx/rootfs/patches/patch.2021.resolver.txt diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index d8d57bafea..46daf5d5fd 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -18,7 +18,7 @@ set -o errexit set -o nounset set -o pipefail -export NGINX_VERSION=1.20.1 +export NGINX_VERSION=1.19.9 # Check for recent changes: https://github.com/vision5/ngx_devel_kit/compare/v0.3.1...master export NDK_VERSION=0.3.1 @@ -197,7 +197,7 @@ mkdir --verbose -p "$BUILD_PATH" cd "$BUILD_PATH" # download, verify and extract the source files -get_src e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49 \ +get_src 2e35dff06a9826e8aca940e9e8be46b7e4b12c19a48d55bfc2dc28fc9cc7d841 \ "https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz" get_src 0e971105e210d272a497567fa2e2c256f4e39b845a5ba80d373e26ba1abfbd85 \ @@ -568,7 +568,11 @@ cd "$BUILD_PATH/nginx-$NGINX_VERSION" # apply nginx patches for PATCH in `ls /patches`;do echo "Patch: $PATCH" - patch -p1 < /patches/$PATCH + if [[ "$PATCH" == *.txt ]]; then + patch -p0 < /patches/$PATCH + else + patch -p1 < /patches/$PATCH + fi done WITH_FLAGS="--with-debug \ diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-no_Werror.patch b/images/nginx/rootfs/patches/nginx-1.19.3-no_Werror.patch deleted file mode 100644 index 2cf7cd9c7f..0000000000 --- a/images/nginx/rootfs/patches/nginx-1.19.3-no_Werror.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urp nginx-1.19.3/auto/cc/clang nginx-1.19.3-patched/auto/cc/clang ---- nginx-1.19.3/auto/cc/clang 2014-03-04 03:39:24.000000000 -0800 -+++ nginx-1.19.3-patched/auto/cc/clang 2014-03-13 20:54:26.241413360 -0700 -@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali - CFLAGS="$CFLAGS -Wno-unused-parameter" - - # stop on warning --CFLAGS="$CFLAGS -Werror" -+#CFLAGS="$CFLAGS -Werror" - - # debug - CFLAGS="$CFLAGS -g" -diff -urp nginx-1.19.3/auto/cc/gcc nginx-1.19.3-patched/auto/cc/gcc ---- nginx-1.19.3/auto/cc/gcc 2014-03-04 03:39:24.000000000 -0800 -+++ nginx-1.19.3-patched/auto/cc/gcc 2014-03-13 20:54:13.301355329 -0700 -@@ -168,7 +168,7 @@ esac - - - # stop on warning --CFLAGS="$CFLAGS -Werror" -+#CFLAGS="$CFLAGS -Werror" - - # debug - CFLAGS="$CFLAGS -g" -diff -urp nginx-1.19.3/auto/cc/icc nginx-1.19.3-patched/auto/cc/icc ---- nginx-1.19.3/auto/cc/icc 2014-03-04 03:39:24.000000000 -0800 -+++ nginx-1.19.3-patched/auto/cc/icc 2014-03-13 20:54:13.301355329 -0700 -@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in - esac - - # stop on warning --CFLAGS="$CFLAGS -Werror" -+#CFLAGS="$CFLAGS -Werror" - - # debug - CFLAGS="$CFLAGS -g" diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-balancer_status_code.patch b/images/nginx/rootfs/patches/nginx-1.19.9-balancer_status_code.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-balancer_status_code.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-balancer_status_code.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-cache_manager_exit.patch b/images/nginx/rootfs/patches/nginx-1.19.9-cache_manager_exit.patch similarity index 96% rename from images/nginx/rootfs/patches/nginx-1.19.3-cache_manager_exit.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-cache_manager_exit.patch index f1f81da2ca..91ee63a262 100644 --- a/images/nginx/rootfs/patches/nginx-1.19.3-cache_manager_exit.patch +++ b/images/nginx/rootfs/patches/nginx-1.19.9-cache_manager_exit.patch @@ -8,7 +8,7 @@ Cache: gracefully exit the cache manager process. diff -r dea321e5c021 -r f64218e1ac96 src/os/unix/ngx_process_cycle.c --- a/src/os/unix/ngx_process_cycle.c Thu Oct 31 18:23:49 2013 +0400 +++ b/src/os/unix/ngx_process_cycle.c Mon Nov 04 12:48:50 2013 -0800 -@@ -1335,7 +1335,7 @@ +@@ -1134,7 +1134,7 @@ if (ngx_terminate || ngx_quit) { ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting"); diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-delayed_posted_events.patch b/images/nginx/rootfs/patches/nginx-1.19.9-delayed_posted_events.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-delayed_posted_events.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-delayed_posted_events.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-hash_overflow.patch b/images/nginx/rootfs/patches/nginx-1.19.9-hash_overflow.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-hash_overflow.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-hash_overflow.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-init_cycle_pool_release.patch b/images/nginx/rootfs/patches/nginx-1.19.9-init_cycle_pool_release.patch similarity index 62% rename from images/nginx/rootfs/patches/nginx-1.19.3-init_cycle_pool_release.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-init_cycle_pool_release.patch index b6f46674f6..aa2df4660e 100644 --- a/images/nginx/rootfs/patches/nginx-1.19.3-init_cycle_pool_release.patch +++ b/images/nginx/rootfs/patches/nginx-1.19.9-init_cycle_pool_release.patch @@ -1,6 +1,6 @@ -diff -rup nginx-1.19.3/src/core/nginx.c nginx-1.19.3-patched/src/core/nginx.c ---- nginx-1.19.3/src/core/nginx.c 2017-12-17 00:00:38.136470108 -0800 -+++ nginx-1.19.3-patched/src/core/nginx.c 2017-12-16 23:59:51.680958322 -0800 +diff -rup nginx-1.19.9/src/core/nginx.c nginx-1.19.9-patched/src/core/nginx.c +--- nginx-1.19.9/src/core/nginx.c 2017-12-17 00:00:38.136470108 -0800 ++++ nginx-1.19.9-patched/src/core/nginx.c 2017-12-16 23:59:51.680958322 -0800 @@ -186,6 +186,7 @@ static u_char *ngx_prefix; static u_char *ngx_conf_file; static u_char *ngx_conf_params; @@ -18,9 +18,9 @@ diff -rup nginx-1.19.3/src/core/nginx.c nginx-1.19.3-patched/src/core/nginx.c if (ngx_save_argv(&init_cycle, argc, argv) != NGX_OK) { return 1; } -diff -rup nginx-1.19.3/src/core/ngx_core.h nginx-1.19.3-patched/src/core/ngx_core.h ---- nginx-1.19.3/src/core/ngx_core.h 2017-10-10 08:22:51.000000000 -0700 -+++ nginx-1.19.3-patched/src/core/ngx_core.h 2017-12-16 23:59:51.679958370 -0800 +diff -rup nginx-1.19.9/src/core/ngx_core.h nginx-1.19.9-patched/src/core/ngx_core.h +--- nginx-1.19.9/src/core/ngx_core.h 2017-10-10 08:22:51.000000000 -0700 ++++ nginx-1.19.9-patched/src/core/ngx_core.h 2017-12-16 23:59:51.679958370 -0800 @@ -108,4 +108,6 @@ void ngx_cpuinfo(void); #define NGX_DISABLE_SYMLINKS_NOTOWNER 2 #endif @@ -28,9 +28,9 @@ diff -rup nginx-1.19.3/src/core/ngx_core.h nginx-1.19.3-patched/src/core/ngx_cor +extern ngx_pool_t *saved_init_cycle_pool; + #endif /* _NGX_CORE_H_INCLUDED_ */ -diff -rup nginx-1.19.3/src/core/ngx_cycle.c nginx-1.19.3-patched/src/core/ngx_cycle.c ---- nginx-1.19.3/src/core/ngx_cycle.c 2017-10-10 08:22:51.000000000 -0700 -+++ nginx-1.19.3-patched/src/core/ngx_cycle.c 2017-12-16 23:59:51.678958419 -0800 +diff -rup nginx-1.19.9/src/core/ngx_cycle.c nginx-1.19.9-patched/src/core/ngx_cycle.c +--- nginx-1.19.9/src/core/ngx_cycle.c 2017-10-10 08:22:51.000000000 -0700 ++++ nginx-1.19.9-patched/src/core/ngx_cycle.c 2017-12-16 23:59:51.678958419 -0800 @@ -748,6 +748,10 @@ old_shm_zone_done: if (ngx_process == NGX_PROCESS_MASTER || ngx_is_init_cycle(old_cycle)) { @@ -42,10 +42,10 @@ diff -rup nginx-1.19.3/src/core/ngx_cycle.c nginx-1.19.3-patched/src/core/ngx_cy ngx_destroy_pool(old_cycle->pool); cycle->old_cycle = NULL; -diff -rup nginx-1.19.3/src/os/unix/ngx_process_cycle.c nginx-1.19.3-patched/src/os/unix/ngx_process_cycle.c ---- nginx-1.19.3/src/os/unix/ngx_process_cycle.c 2017-12-17 00:00:38.142469762 -0800 -+++ nginx-1.19.3-patched/src/os/unix/ngx_process_cycle.c 2017-12-16 23:59:51.691957791 -0800 -@@ -783,6 +783,11 @@ ngx_master_process_exit(ngx_cycle_t *cyc +diff -rup nginx-1.19.9/src/os/unix/ngx_process_cycle.c nginx-1.19.9-patched/src/os/unix/ngx_process_cycle.c +--- nginx-1.19.9/src/os/unix/ngx_process_cycle.c 2017-12-17 00:00:38.142469762 -0800 ++++ nginx-1.19.9-patched/src/os/unix/ngx_process_cycle.c 2017-12-16 23:59:51.691957791 -0800 +@@ -687,6 +692,11 @@ ngx_master_process_exit(ngx_cycle_t *cyc ngx_exit_cycle.files_n = ngx_cycle->files_n; ngx_cycle = &ngx_exit_cycle; diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-larger_max_error_str.patch b/images/nginx/rootfs/patches/nginx-1.19.9-larger_max_error_str.patch similarity index 62% rename from images/nginx/rootfs/patches/nginx-1.19.3-larger_max_error_str.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-larger_max_error_str.patch index c7013e05d7..0628d3abb5 100644 --- a/images/nginx/rootfs/patches/nginx-1.19.3-larger_max_error_str.patch +++ b/images/nginx/rootfs/patches/nginx-1.19.9-larger_max_error_str.patch @@ -1,5 +1,5 @@ ---- nginx-1.19.3/src/core/ngx_log.h 2013-10-08 05:07:14.000000000 -0700 -+++ nginx-1.19.3-patched/src/core/ngx_log.h 2013-12-05 20:35:35.996236720 -0800 +--- nginx-1.19.9/src/core/ngx_log.h 2013-10-08 05:07:14.000000000 -0700 ++++ nginx-1.19.9-patched/src/core/ngx_log.h 2013-12-05 20:35:35.996236720 -0800 @@ -64,7 +64,9 @@ struct ngx_log_s { }; diff --git a/images/nginx/rootfs/patches/nginx-1.19.9-no_Werror.patch b/images/nginx/rootfs/patches/nginx-1.19.9-no_Werror.patch new file mode 100644 index 0000000000..7bb0ac902e --- /dev/null +++ b/images/nginx/rootfs/patches/nginx-1.19.9-no_Werror.patch @@ -0,0 +1,36 @@ +diff -urp nginx-1.19.9/auto/cc/clang nginx-1.19.9-patched/auto/cc/clang +--- nginx-1.19.9/auto/cc/clang 2014-03-04 03:39:24.000000000 -0800 ++++ nginx-1.19.9-patched/auto/cc/clang 2014-03-13 20:54:26.241413360 -0700 +@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali + CFLAGS="$CFLAGS -Wno-unused-parameter" + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" +diff -urp nginx-1.19.9/auto/cc/gcc nginx-1.19.9-patched/auto/cc/gcc +--- nginx-1.19.9/auto/cc/gcc 2014-03-04 03:39:24.000000000 -0800 ++++ nginx-1.19.9-patched/auto/cc/gcc 2014-03-13 20:54:13.301355329 -0700 +@@ -168,7 +168,7 @@ esac + + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" +diff -urp nginx-1.19.9/auto/cc/icc nginx-1.19.9-patched/auto/cc/icc +--- nginx-1.19.9/auto/cc/icc 2014-03-04 03:39:24.000000000 -0800 ++++ nginx-1.19.9-patched/auto/cc/icc 2014-03-13 20:54:13.301355329 -0700 +@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in + esac + + # stop on warning +-CFLAGS="$CFLAGS -Werror" ++#CFLAGS="$CFLAGS -Werror" + + # debug + CFLAGS="$CFLAGS -g" diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-proxy_host_port_vars.patch b/images/nginx/rootfs/patches/nginx-1.19.9-proxy_host_port_vars.patch similarity index 87% rename from images/nginx/rootfs/patches/nginx-1.19.3-proxy_host_port_vars.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-proxy_host_port_vars.patch index 63eaf0ca7c..25282bda39 100644 --- a/images/nginx/rootfs/patches/nginx-1.19.3-proxy_host_port_vars.patch +++ b/images/nginx/rootfs/patches/nginx-1.19.9-proxy_host_port_vars.patch @@ -1,5 +1,5 @@ ---- nginx-1.19.3/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800 -+++ nginx-1.19.3-patched/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800 +--- nginx-1.19.9/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800 ++++ nginx-1.19.9-patched/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800 @@ -793,13 +793,13 @@ static ngx_keyval_t ngx_http_proxy_cach static ngx_http_variable_t ngx_http_proxy_vars[] = { diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-resolver_conf_parsing.patch b/images/nginx/rootfs/patches/nginx-1.19.9-resolver_conf_parsing.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-resolver_conf_parsing.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-resolver_conf_parsing.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-reuseport_close_unused_fds.patch b/images/nginx/rootfs/patches/nginx-1.19.9-reuseport_close_unused_fds.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-reuseport_close_unused_fds.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-reuseport_close_unused_fds.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-single_process_graceful_exit.patch b/images/nginx/rootfs/patches/nginx-1.19.9-single_process_graceful_exit.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-single_process_graceful_exit.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-single_process_graceful_exit.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-socket_cloexec.patch b/images/nginx/rootfs/patches/nginx-1.19.9-socket_cloexec.patch similarity index 98% rename from images/nginx/rootfs/patches/nginx-1.19.3-socket_cloexec.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-socket_cloexec.patch index 985ce573b5..8ffe4c1676 100644 --- a/images/nginx/rootfs/patches/nginx-1.19.3-socket_cloexec.patch +++ b/images/nginx/rootfs/patches/nginx-1.19.9-socket_cloexec.patch @@ -151,7 +151,7 @@ diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index c4376a5..48e8fa8 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c -@@ -1032,6 +1032,9 @@ ngx_worker_process_exit(ngx_cycle_t *cycle) +@@ -960,6 +1029,9 @@ ngx_worker_process_exit(ngx_cycle_t *cycle) for (i = 0; i < cycle->connection_n; i++) { if (c[i].fd != -1 && c[i].read diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-ssl_cert_cb_yield.patch b/images/nginx/rootfs/patches/nginx-1.19.9-ssl_cert_cb_yield.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-ssl_cert_cb_yield.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-ssl_cert_cb_yield.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-ssl_sess_cb_yield.patch b/images/nginx/rootfs/patches/nginx-1.19.9-ssl_sess_cb_yield.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-ssl_sess_cb_yield.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-ssl_sess_cb_yield.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-stream_proxy_get_next_upstream_tries.patch b/images/nginx/rootfs/patches/nginx-1.19.9-stream_proxy_get_next_upstream_tries.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-stream_proxy_get_next_upstream_tries.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-stream_proxy_get_next_upstream_tries.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-stream_ssl_preread_no_skip.patch b/images/nginx/rootfs/patches/nginx-1.19.9-stream_ssl_preread_no_skip.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-stream_ssl_preread_no_skip.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-stream_ssl_preread_no_skip.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-upstream_pipelining.patch b/images/nginx/rootfs/patches/nginx-1.19.9-upstream_pipelining.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-upstream_pipelining.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-upstream_pipelining.patch diff --git a/images/nginx/rootfs/patches/nginx-1.19.3-upstream_timeout_fields.patch b/images/nginx/rootfs/patches/nginx-1.19.9-upstream_timeout_fields.patch similarity index 100% rename from images/nginx/rootfs/patches/nginx-1.19.3-upstream_timeout_fields.patch rename to images/nginx/rootfs/patches/nginx-1.19.9-upstream_timeout_fields.patch diff --git a/images/nginx/rootfs/patches/patch.2021.resolver.txt b/images/nginx/rootfs/patches/patch.2021.resolver.txt new file mode 100644 index 0000000000..6c895e61c6 --- /dev/null +++ b/images/nginx/rootfs/patches/patch.2021.resolver.txt @@ -0,0 +1,23 @@ +diff --git src/core/ngx_resolver.c src/core/ngx_resolver.c +--- src/core/ngx_resolver.c ++++ src/core/ngx_resolver.c +@@ -4008,15 +4008,15 @@ done: + n = *src++; + + } else { ++ if (dst != name->data) { ++ *dst++ = '.'; ++ } ++ + ngx_strlow(dst, src, n); + dst += n; + src += n; + + n = *src++; +- +- if (n != 0) { +- *dst++ = '.'; +- } + } + + if (n == 0) {