Update nginx to 1.27.4

Also update: * OpenResty LuaJIT 2.1-20250117 * Update modules * fb678c5b4456c733e011d4bd6ad0888baca8c124 modules/ModSecurity-nginx (v1.0.3-27-gfb678c5) * 84a65d68687c9de5166fd49ddbbd68c6962234eb modules/headers-more-nginx-module (v0.38) * 5bd471a4bce6c02dd68b1ca72fbabb09fb2041d8 modules/lua-nginx-module (v0.10.16-380-g5bd471a4) * cb7264da6d94c259c4ad01ee5c61b5f65e3c7eb4 modules/lua-resty-core (v0.1.18-162-gcb7264d) * e901ea8c98f6e159482611952891d3418ab893e0 modules/lua-resty-openssl (0.4.0-443-ge901ea8) * 72d8eed53af4c2cd6f3e30a2efe0e38d66f5e176 modules/nginx-otel (v0.1.1-28-g72d8eed) * 6c7719d0ba32e00b563ec70bd43dad11960fa9c4 modules/nginx-rtmp-module (v1.2.2-4-g6c7719d) * 2d97e80486d7d2554e58cdaca4f2389b836600c8 modules/njs (0.8.6-70-g2d97e804) * 4169f1ba16860e30403372693a85171bebf1994d modules/stream-lua-nginx-module (v0.0.8-117-g4169f1b)
hnakamur · Feb 6, 2025 · 0a7d3c5 · 0a7d3c5
1 parent 0e04436
commit 0a7d3c5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
-PKG_VERSION=1.27.3+mod.2
+PKG_VERSION=1.27.4+mod.1
 PKG_REL_PREFIX=1hn1
 ifdef NO_CACHE
 DOCKER_NO_CACHE=--no-cache
 endif
-LUAJIT_DEB_VERSION=2.1.20241113-1hn1
+LUAJIT_DEB_VERSION=2.1.20250117-1hn1
 MODSECURITY_DEB_VERSION=3.0.13-1hn1
 
 LOGUNLIMITED_BUILDER=logunlimited

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,20 @@
+nginx (1.27.4+mod.1-1hn1DebRelDistrib) UNRELEASED; urgency=medium
+
+  * 1.27.4
+  * OpenResty LuaJIT 2.1-20250117
+  * Update modules
+  * fb678c5b4456c733e011d4bd6ad0888baca8c124 modules/ModSecurity-nginx (v1.0.3-27-gfb678c5)
+  * 84a65d68687c9de5166fd49ddbbd68c6962234eb modules/headers-more-nginx-module (v0.38)
+  * 5bd471a4bce6c02dd68b1ca72fbabb09fb2041d8 modules/lua-nginx-module (v0.10.16-380-g5bd471a4)
+  * cb7264da6d94c259c4ad01ee5c61b5f65e3c7eb4 modules/lua-resty-core (v0.1.18-162-gcb7264d)
+  * e901ea8c98f6e159482611952891d3418ab893e0 modules/lua-resty-openssl (0.4.0-443-ge901ea8)
+  * 72d8eed53af4c2cd6f3e30a2efe0e38d66f5e176 modules/nginx-otel (v0.1.1-28-g72d8eed)
+  * 6c7719d0ba32e00b563ec70bd43dad11960fa9c4 modules/nginx-rtmp-module (v1.2.2-4-g6c7719d)
+  * 2d97e80486d7d2554e58cdaca4f2389b836600c8 modules/njs (0.8.6-70-g2d97e804)
+  * 4169f1ba16860e30403372693a85171bebf1994d modules/stream-lua-nginx-module (v0.0.8-117-g4169f1b)
+
+ -- Hiroaki Nakamura <hnakamur@gmail.com>  Thu, 06 Feb 2025 09:44:22 +0900
+
 nginx (1.27.3+mod.2-1hn1DebRelDistrib) UNRELEASED; urgency=medium
 
   * Add NGINX Native OpenTelemetry (OTel) Module

diff --git a/debian/patches/freenginx-upstream-age.patch b/debian/patches/freenginx-upstream-age.patch
@@ -62,7 +62,7 @@ cache validity time.
      { ngx_null_string, 0 }
  };
 
-@@ -4924,13 +4938,14 @@
+@@ -4925,13 +4939,14 @@
              return NGX_OK;
          }
 
@@ -79,23 +79,23 @@ cache validity time.
      }
 
  extensions:
-@@ -5094,6 +5109,7 @@
+@@ -5095,6 +5110,7 @@
              r->cache->valid_sec = ngx_time() + n;
              u->headers_in.no_cache = 0;
              u->headers_in.expired = 0;
 +            u->headers_in.max_age = 0;
              return NGX_OK;
          }
      }
-@@ -5107,6 +5123,7 @@
+@@ -5108,6 +5124,7 @@
          r->cache->valid_sec = n;
          u->headers_in.no_cache = 0;
          u->headers_in.expired = 0;
 +        u->headers_in.max_age = 0;
      }
      }
  #endif
-@@ -5358,6 +5375,61 @@
+@@ -5359,6 +5376,61 @@
 
 
  static ngx_int_t
@@ -157,7 +157,7 @@ cache validity time.
  ngx_http_upstream_copy_header_line(ngx_http_request_t *r, ngx_table_elt_t *h,
      ngx_uint_t offset)
  {
-@@ -6087,6 +6159,60 @@
+@@ -6088,6 +6160,60 @@
 
      return NGX_OK;
  }
@@ -228,7 +228,7 @@ cache validity time.
 
 
  typedef struct {
-@@ -295,14 +296,17 @@
+@@ -296,14 +297,17 @@
 
      ngx_table_elt_t                 *cache_control;
      ngx_table_elt_t                 *set_cookie;

diff --git a/debian/patches/nginx-1.11.2-ssl_cert_cb_yield.patch b/debian/patches/nginx-1.11.2-ssl_cert_cb_yield.patch
@@ -16,7 +16,7 @@ Origin: https://raw.githubusercontent.com/openresty/openresty/dbccee1418ddb24a2a
 
 --- a/src/event/ngx_event_openssl.c
 +++ b/src/event/ngx_event_openssl.c
-@@ -1943,6 +1943,23 @@
+@@ -1966,6 +1966,23 @@
          return NGX_AGAIN;
      }
 

diff --git a/debian/patches/nginx-1.17.3-cache_manager.patch b/debian/patches/nginx-1.17.3-cache_manager.patch
@@ -1,6 +1,6 @@
 --- a/src/http/modules/ngx_http_proxy_module.c
 +++ b/src/http/modules/ngx_http_proxy_module.c
-@@ -247,6 +247,8 @@
+@@ -249,6 +249,8 @@
  #endif
  static void ngx_http_proxy_set_vars(ngx_url_t *u, ngx_http_proxy_vars_t *v);
 
@@ -9,7 +9,7 @@
 
  static ngx_conf_post_t  ngx_http_proxy_lowat_post =
      { ngx_http_proxy_lowat_check };
-@@ -624,6 +626,12 @@
+@@ -626,6 +628,12 @@
        offsetof(ngx_http_proxy_loc_conf_t, upstream.cache_background_update),
        NULL },
 
@@ -22,7 +22,7 @@
  #endif
 
      { ngx_string("proxy_temp_path"),
-@@ -5323,3 +5331,103 @@
+@@ -5429,3 +5437,103 @@
 
      v->uri = u->uri;
  }

diff --git a/nginx b/nginx
+1 −1		LICENSE
+1 −2		SECURITY.md
+2 −2		auto/lib/libatomic/conf
+8 −3		auto/lib/libatomic/make
+104 −0		docs/xml/nginx/changes.xml
+3 −0		misc/GNUmakefile
+2 −2		src/core/nginx.h
+1 −0		src/core/ngx_core.h
+29 −6		src/event/ngx_event_openssl.c
+9 −4		src/event/ngx_event_openssl.h
+383 −34		src/event/ngx_event_openssl_cache.c
+1 −1		src/event/quic/ngx_event_quic.c
+2 −2		src/event/quic/ngx_event_quic_output.c
+13 −5		src/event/quic/ngx_event_quic_streams.c
+5 −0		src/event/quic/ngx_event_quic_transport.c
+106 −0		src/http/modules/ngx_http_grpc_module.c
+5 −3		src/http/modules/ngx_http_gzip_filter_module.c
+106 −0		src/http/modules/ngx_http_proxy_module.c
+2 −2		src/http/modules/ngx_http_slice_filter_module.c
+106 −0		src/http/modules/ngx_http_ssl_module.c
+2 −0		src/http/modules/ngx_http_ssl_module.h
+106 −0		src/http/modules/ngx_http_uwsgi_module.c
+10 −0		src/http/ngx_http_core_module.c
+1 −0		src/http/ngx_http_core_module.h
+69 −9		src/http/ngx_http_request.c
+2 −0		src/http/ngx_http_request.h
+1 −0		src/http/ngx_http_upstream.c
+1 −0		src/http/ngx_http_upstream.h
+109 −0		src/stream/ngx_stream_proxy_module.c
+132 −2		src/stream/ngx_stream_ssl_module.c
+34 −32		src/stream/ngx_stream_ssl_module.h