Update to nginx 1.27.3

hnakamur · Nov 27, 2024 · 3d7e025 · 3d7e025
1 parent 838d20e
commit 3d7e025
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-PKG_VERSION=1.27.2+mod.3
+PKG_VERSION=1.27.3+mod.1
 PKG_REL_PREFIX=1hn1
 ifdef NO_CACHE
 DOCKER_NO_CACHE=--no-cache

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+nginx (1.27.3+mod.1-1hn1DebRelDistrib) UNRELEASED; urgency=medium
+
+  * nginx 1.27.3
+
+ -- Hiroaki Nakamura <hnakamur@gmail.com>  Wed, 27 Nov 2024 20:02:55 +0900
+
 nginx (1.27.2+mod.3-1hn1DebRelDistrib) UNRELEASED; urgency=medium
 
   * add module

diff --git a/debian/patches/freenginx-upstream-age.patch b/debian/patches/freenginx-upstream-age.patch
@@ -31,7 +31,7 @@ cache validity time.
  static ngx_int_t ngx_http_upstream_copy_header_line(ngx_http_request_t *r,
      ngx_table_elt_t *h, ngx_uint_t offset);
  static ngx_int_t
-@@ -289,6 +293,11 @@
+@@ -293,6 +297,11 @@
                   ngx_http_upstream_copy_multi_header_lines,
                   offsetof(ngx_http_headers_out_t, link), 0 },
 
@@ -43,7 +43,7 @@ cache validity time.
      { ngx_string("X-Accel-Expires"),
                   ngx_http_upstream_process_accel_expires, 0,
                   ngx_http_upstream_copy_header_line, 0, 0 },
-@@ -422,6 +431,10 @@
+@@ -444,6 +453,10 @@
        ngx_http_upstream_cache_etag, 0,
        NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
 
@@ -54,15 +54,15 @@ cache validity time.
  #endif
 
      { ngx_string("upstream_http_"), NULL, ngx_http_upstream_header_variable,
-@@ -467,6 +480,7 @@
+@@ -489,6 +502,7 @@
      { ngx_string("Cache-Control"), NGX_HTTP_UPSTREAM_IGN_CACHE_CONTROL },
      { ngx_string("Set-Cookie"), NGX_HTTP_UPSTREAM_IGN_SET_COOKIE },
      { ngx_string("Vary"), NGX_HTTP_UPSTREAM_IGN_VARY },
 +    { ngx_string("Age"), NGX_HTTP_UPSTREAM_IGN_AGE },
      { ngx_null_string, 0 }
  };
 
-@@ -4878,13 +4892,14 @@
+@@ -4924,13 +4938,14 @@
              return NGX_OK;
          }
 
@@ -79,23 +79,23 @@ cache validity time.
      }
 
  extensions:
-@@ -5048,6 +5063,7 @@
+@@ -5094,6 +5109,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;
          }
      }
-@@ -5061,6 +5077,7 @@
+@@ -5107,6 +5123,7 @@
          r->cache->valid_sec = n;
          u->headers_in.no_cache = 0;
          u->headers_in.expired = 0;
 +        u->headers_in.max_age = 0;
      }
      }
  #endif
-@@ -5312,6 +5329,61 @@
+@@ -5358,6 +5375,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)
  {
-@@ -6041,6 +6113,60 @@
+@@ -6087,6 +6159,60 @@
 
      return NGX_OK;
  }
@@ -228,7 +228,7 @@ cache validity time.
 
 
  typedef struct {
-@@ -287,14 +288,17 @@
+@@ -295,14 +296,17 @@
 
      ngx_table_elt_t                 *cache_control;
      ngx_table_elt_t                 *set_cookie;

diff --git a/debian/patches/nginx-1.17.3-cache_manager.patch b/debian/patches/nginx-1.17.3-cache_manager.patch
@@ -22,7 +22,7 @@
  #endif
 
      { ngx_string("proxy_temp_path"),
-@@ -5320,3 +5328,103 @@
+@@ -5323,3 +5331,103 @@
 
      v->uri = u->uri;
  }

diff --git a/nginx b/nginx
+2 −2		.github/pull_request_template.md
+89 −5		SECURITY.md
+2 −1		auto/lib/pcre/make
+93 −0		docs/xml/nginx/changes.xml
+2 −2		src/core/nginx.h
+10 −4		src/core/ngx_cycle.c
+5 −1		src/core/ngx_inet.c
+1 −1		src/event/ngx_event_openssl.c
+7 −0		src/event/ngx_event_openssl.h
+4 −0		src/event/ngx_event_openssl_cache.c
+6 −7		src/event/quic/ngx_event_quic_ack.c
+1 −0		src/event/quic/ngx_event_quic_openssl_compat.c
+15 −14		src/event/quic/ngx_event_quic_protection.c
+1 −1		src/event/quic/ngx_event_quic_protection.h
+6 −1		src/http/modules/ngx_http_fastcgi_module.c
+1 −3		src/http/modules/ngx_http_grpc_module.c
+17 −1		src/http/modules/ngx_http_mp4_module.c
+6 −3		src/http/modules/ngx_http_proxy_module.c
+20 −0		src/http/modules/ngx_http_scgi_module.c
+1 −3		src/http/modules/ngx_http_ssl_module.c
+79 −9		src/http/modules/ngx_http_upstream_hash_module.c
+11 −1		src/http/modules/ngx_http_upstream_ip_hash_module.c
+12 −0		src/http/modules/ngx_http_upstream_least_conn_module.c
+32 −3		src/http/modules/ngx_http_upstream_random_module.c
+690 −8		src/http/modules/ngx_http_upstream_zone_module.c
+28 −3		src/http/modules/ngx_http_uwsgi_module.c
+171 −0		src/http/ngx_http_upstream.c
+9 −1		src/http/ngx_http_upstream.h
+203 −10		src/http/ngx_http_upstream_round_robin.c
+85 −3		src/http/ngx_http_upstream_round_robin.h
+24 −0		src/mail/ngx_mail_proxy_module.c
+1 −3		src/mail/ngx_mail_ssl_module.c
+1 −1		src/os/unix/ngx_freebsd_config.h
+20 −3		src/stream/ngx_stream_proxy_module.c
+1 −3		src/stream/ngx_stream_ssl_module.c
+154 −1		src/stream/ngx_stream_upstream.c
+7 −2		src/stream/ngx_stream_upstream.h
+80 −10		src/stream/ngx_stream_upstream_hash_module.c
+12 −0		src/stream/ngx_stream_upstream_least_conn_module.c
+32 −3		src/stream/ngx_stream_upstream_random_module.c
+204 −10		src/stream/ngx_stream_upstream_round_robin.c
+85 −3		src/stream/ngx_stream_upstream_round_robin.h
+691 −8		src/stream/ngx_stream_upstream_zone_module.c