diff --git a/Makefile b/Makefile index 72a882d..14e3ef1 100644 --- 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 index 8b105c1..06378bc 100644 --- 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 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 index 31019b5..ae0bf18 100644 --- 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,7 +54,7 @@ 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 }, @@ -62,7 +62,7 @@ cache validity time. { ngx_null_string, 0 } }; -@@ -4878,13 +4892,14 @@ +@@ -4924,13 +4938,14 @@ return NGX_OK; } @@ -79,7 +79,7 @@ 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; @@ -87,7 +87,7 @@ cache validity time. 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; @@ -95,7 +95,7 @@ cache validity time. } } #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 index a78a818..0d58a0c 100644 --- 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 index e24f7cc..e7bd255 160000 --- a/nginx +++ b/nginx @@ -1 +1 @@ -Subproject commit e24f7ccc161f1a2a759eb27263ec9af4fc7c8e96 +Subproject commit e7bd2557458c26839da89e694067017eeb214348