Downgrade nginx to v1.19 (#7639)

Signed-off-by: Jintao Zhang <[email protected]>
kubernetes · Sep 15, 2021 · 4988925 · 4988925
1 parent 0dbaadf
commit 4988925
Show file tree

Hide file tree

Showing 21 changed files with 85 additions and 58 deletions.
diff --git 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
diff --git a/...s/nginx-1.19.3-balancer_status_code.patch → ...s/nginx-1.19.9-balancer_status_code.patch b/...s/nginx-1.19.3-balancer_status_code.patch → ...s/nginx-1.19.9-balancer_status_code.patch
diff --git a/...hes/nginx-1.19.3-cache_manager_exit.patch → ...hes/nginx-1.19.9-cache_manager_exit.patch b/...hes/nginx-1.19.3-cache_manager_exit.patch → ...hes/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/.../nginx-1.19.3-delayed_posted_events.patch → .../nginx-1.19.9-delayed_posted_events.patch b/.../nginx-1.19.3-delayed_posted_events.patch → .../nginx-1.19.9-delayed_posted_events.patch
diff --git a/.../patches/nginx-1.19.3-hash_overflow.patch → .../patches/nginx-1.19.9-hash_overflow.patch b/.../patches/nginx-1.19.3-hash_overflow.patch → .../patches/nginx-1.19.9-hash_overflow.patch
diff --git a/...ginx-1.19.3-init_cycle_pool_release.patch → ...ginx-1.19.9-init_cycle_pool_release.patch b/...ginx-1.19.3-init_cycle_pool_release.patch → ...ginx-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,19 +18,19 @@ 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
 
 +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/...s/nginx-1.19.3-larger_max_error_str.patch → ...s/nginx-1.19.9-larger_max_error_str.patch b/...s/nginx-1.19.3-larger_max_error_str.patch → ...s/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
@@ -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/...s/nginx-1.19.3-proxy_host_port_vars.patch → ...s/nginx-1.19.9-proxy_host_port_vars.patch b/...s/nginx-1.19.3-proxy_host_port_vars.patch → ...s/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/.../nginx-1.19.3-resolver_conf_parsing.patch → .../nginx-1.19.9-resolver_conf_parsing.patch b/.../nginx-1.19.3-resolver_conf_parsing.patch → .../nginx-1.19.9-resolver_conf_parsing.patch
diff --git a/...x-1.19.3-reuseport_close_unused_fds.patch → ...x-1.19.9-reuseport_close_unused_fds.patch b/...x-1.19.3-reuseport_close_unused_fds.patch → ...x-1.19.9-reuseport_close_unused_fds.patch
diff --git a/...1.19.3-single_process_graceful_exit.patch → ...1.19.9-single_process_graceful_exit.patch b/...1.19.3-single_process_graceful_exit.patch → ...1.19.9-single_process_graceful_exit.patch
diff --git a/...patches/nginx-1.19.3-socket_cloexec.patch → ...patches/nginx-1.19.9-socket_cloexec.patch b/...patches/nginx-1.19.3-socket_cloexec.patch → ...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/...ches/nginx-1.19.3-ssl_cert_cb_yield.patch → ...ches/nginx-1.19.9-ssl_cert_cb_yield.patch b/...ches/nginx-1.19.3-ssl_cert_cb_yield.patch → ...ches/nginx-1.19.9-ssl_cert_cb_yield.patch
diff --git a/...ches/nginx-1.19.3-ssl_sess_cb_yield.patch → ...ches/nginx-1.19.9-ssl_sess_cb_yield.patch b/...ches/nginx-1.19.3-ssl_sess_cb_yield.patch → ...ches/nginx-1.19.9-ssl_sess_cb_yield.patch
diff --git a/...tream_proxy_get_next_upstream_tries.patch → ...tream_proxy_get_next_upstream_tries.patch b/...tream_proxy_get_next_upstream_tries.patch → ...tream_proxy_get_next_upstream_tries.patch
diff --git a/...x-1.19.3-stream_ssl_preread_no_skip.patch → ...x-1.19.9-stream_ssl_preread_no_skip.patch b/...x-1.19.3-stream_ssl_preread_no_skip.patch → ...x-1.19.9-stream_ssl_preread_no_skip.patch
diff --git a/...es/nginx-1.19.3-upstream_pipelining.patch → ...es/nginx-1.19.9-upstream_pipelining.patch b/...es/nginx-1.19.3-upstream_pipelining.patch → ...es/nginx-1.19.9-upstream_pipelining.patch
diff --git a/...ginx-1.19.3-upstream_timeout_fields.patch → ...ginx-1.19.9-upstream_timeout_fields.patch b/...ginx-1.19.3-upstream_timeout_fields.patch → ...ginx-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
@@ -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) {