Merge 3839690b77 into d52d5b4b99

patches/nginx/1.27.1/nginx-1.27.1-http2_subreq_error_wakeup.patch

@@ -0,0 +1,20 @@
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+index 9593b7f..dbc23ff 100644
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -2560,8 +2560,15 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
+             return;
+         }
+ 
++#if (NGX_HTTP_V2)
++        if (r->http_version < NGX_HTTP_VERSION_20 || r == r->main) {
++            ngx_http_terminate_request(r, rc);
++            return;
++        }
++#else
+         ngx_http_terminate_request(r, rc);
+         return;
++#endif
+     }
+ 
+     if (rc >= NGX_HTTP_SPECIAL_RESPONSE

patches/nginx/1.29.2/nginx-1.29.2-http2_subreq_error_wakeup.patch

@@ -0,0 +1,20 @@
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+index 16d79c4..760e0e5 100644
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -2559,8 +2559,15 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
+             return;
+         }
+ 
++#if (NGX_HTTP_V2)
++        if (r->http_version < NGX_HTTP_VERSION_20 || r == r->main) {
++            ngx_http_terminate_request(r, rc);
++            return;
++        }
++#else
+         ngx_http_terminate_request(r, rc);
+         return;
++#endif
+     }
+ 
+     if (rc >= NGX_HTTP_SPECIAL_RESPONSE

util/mirror-tarballs

@@ -576,6 +576,12 @@ if [ "$answer" = "Y" ]; then
     patch -p1 < $root/patches/nginx/$main_ver/nginx-$main_ver-quic_ssl_lua_yield.patch || exit 1
 fi
 
+answer=`$root/util/ver-ge "$main_ver" 1.27.1`
+if [ "$answer" = "Y" ]; then
+    echo "$info_txt applying nginx-$main_ver-http2_subreq_error_wakeup patch for nginx"
+    patch -p1 < $root/patches/nginx/$main_ver/nginx-$main_ver-http2_subreq_error_wakeup.patch || exit 1
+fi
+
 cp $root/html/index.html docs/html/ || exit 1
 cp $root/html/50x.html docs/html/ || exit 1