split nginx patches and add aws-lc-ech patch and patch to force enable mptcp

Author: Zoey2936

Dockerfile

@@ -49,7 +49,11 @@ RUN git clone --depth 1 https://github.com/nginx/nginx --branch "$NGINX_VER" /sr
     git apply /src/nginx/3.patch && \
     wget -q https://raw.githubusercontent.com/zlib-ng/patches/refs/heads/master/nginx/"$ZNP_VER"-zlib-ng.patch -O /src/nginx/4.patch && \
     git apply /src/nginx/4.patch && \
-    git apply /src/nginx.patch && \
+    git apply /src/nginx-footer.patch && \
+    git apply /src/nginx-buffer-log.patch && \
+#    git apply /src/nginx-multipath-tcp.patch && \
+    git apply /src/nginx-cert-compression-brotli-zlib-ng.patch && \
+    git apply /src/nginx-ech-boringssl-awslc.patch && \
     \
     git clone --depth 1 https://github.com/google/ngx_brotli --branch "$NB_VER" /src/ngx_brotli && \
     cd /src/ngx_brotli && \

patches/nginx-buffer-log.patch

@@ -0,0 +1,26 @@
+diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
+index c75ddb849..0d6f2f0f1 100644
+--- a/src/http/ngx_http_core_module.c
++++ b/src/http/ngx_http_core_module.c
+@@ -1346,7 +1346,7 @@ ngx_http_update_location_config(ngx_http_request_t *r)
+         r->request_body_file_log_level = NGX_LOG_NOTICE;
+ 
+     } else {
+-        r->request_body_file_log_level = NGX_LOG_WARN;
++        r->request_body_file_log_level = NGX_LOG_NOTICE;
+     }
+ 
+     r->request_body_in_single_buf = clcf->client_body_in_single_buffer;
+diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
+index 74042b5ec..ae9ed01d7 100644
+--- a/src/http/ngx_http_upstream.c
++++ b/src/http/ngx_http_upstream.c
+@@ -3496,7 +3496,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
+ #endif
+ 
+     } else {
+-        p->temp_file->log_level = NGX_LOG_WARN;
++        p->temp_file->log_level = NGX_LOG_NOTICE;
+         p->temp_file->warn = "an upstream response is buffered "
+                              "to a temporary file";
+     }

patches/nginx.patch …nx-cert-compression-brotli-zlib-ng.patchpatches/nginx.patch renamed to patches/nginx-cert-compression-brotli-zlib-ng.patch patches/nginx.patch renamed to patches/nginx-cert-compression-brotli-zlib-ng.patch

@@ -254,58 +254,3 @@ index d86ffb8da..fb1bae4bd 100644
  extern int  ngx_ssl_client_hello_arg_index;
 
 
-diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
-index c75ddb849..0d6f2f0f1 100644
---- a/src/http/ngx_http_core_module.c
-+++ b/src/http/ngx_http_core_module.c
-@@ -1346,7 +1346,7 @@ ngx_http_update_location_config(ngx_http_request_t *r)
-         r->request_body_file_log_level = NGX_LOG_NOTICE;
- 
-     } else {
--        r->request_body_file_log_level = NGX_LOG_WARN;
-+        r->request_body_file_log_level = NGX_LOG_NOTICE;
-     }
- 
-     r->request_body_in_single_buf = clcf->client_body_in_single_buffer;
-diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
-index eaf42e399..67a6bf375 100644
---- a/src/http/ngx_http_special_response.c
-+++ b/src/http/ngx_http_special_response.c
-@@ -19,21 +19,21 @@ static ngx_int_t ngx_http_send_refresh(ngx_http_request_t *r);
- 
- 
- static u_char ngx_http_error_full_tail[] =
--"<hr><center>" NGINX_VER "</center>" CRLF
-+"<hr>" CRLF
- "</body>" CRLF
- "</html>" CRLF
- ;
- 
- 
- static u_char ngx_http_error_build_tail[] =
--"<hr><center>" NGINX_VER_BUILD "</center>" CRLF
-+"<hr>" CRLF
- "</body>" CRLF
- "</html>" CRLF
- ;
- 
- 
- static u_char ngx_http_error_tail[] =
--"<hr><center>nginx</center>" CRLF
-+"<hr>" CRLF
- "</body>" CRLF
- "</html>" CRLF
- ;
-diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
-index 74042b5ec..ae9ed01d7 100644
---- a/src/http/ngx_http_upstream.c
-+++ b/src/http/ngx_http_upstream.c
-@@ -3496,7 +3496,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
- #endif
- 
-     } else {
--        p->temp_file->log_level = NGX_LOG_WARN;
-+        p->temp_file->log_level = NGX_LOG_NOTICE;
-         p->temp_file->warn = "an upstream response is buffered "
-                              "to a temporary file";
-     }