Skip to content

Commit 9c12612

Browse files
fix: patch error (#81)
1 parent f66d3f8 commit 9c12612

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

patch/1.21.4/nginx-client_max_body_size.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git src/http/ngx_http_core_module.c src/http/ngx_http_core_module.c
2-
index 6388140..b900467 100644
2+
index fe1da4576..9beba971e 100644
33
--- src/http/ngx_http_core_module.c
44
+++ src/http/ngx_http_core_module.c
55
@@ -8,6 +8,9 @@
@@ -12,7 +12,7 @@ index 6388140..b900467 100644
1212

1313

1414
typedef struct {
15-
@@ -985,7 +988,12 @@ ngx_http_core_find_config_phase(ngx_http_request_t *r,
15+
@@ -982,7 +985,12 @@ ngx_http_core_find_config_phase(ngx_http_request_t *r,
1616
"http cl:%O max:%O",
1717
r->headers_in.content_length_n, clcf->client_max_body_size);
1818

@@ -26,7 +26,7 @@ index 6388140..b900467 100644
2626
&& clcf->client_max_body_size
2727
&& clcf->client_max_body_size < r->headers_in.content_length_n)
2828
diff --git src/http/ngx_http_request_body.c src/http/ngx_http_request_body.c
29-
index 71d7e9a..99fcbad 100644
29+
index ad3549f98..20a5ec500 100644
3030
--- src/http/ngx_http_request_body.c
3131
+++ src/http/ngx_http_request_body.c
3232
@@ -8,6 +8,9 @@
@@ -65,7 +65,7 @@ index 71d7e9a..99fcbad 100644
6565
if (ngx_http_test_expect(r) != NGX_OK) {
6666
rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
6767
goto done;
68-
@@ -1025,6 +1047,10 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
68+
@@ -1072,6 +1094,10 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
6969
out = NULL;
7070
ll = &out;
7171

@@ -74,9 +74,9 @@ index 71d7e9a..99fcbad 100644
7474
+#endif
7575
+
7676
if (rb->rest == -1) {
77-
77+
7878
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
79-
@@ -1048,8 +1074,15 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
79+
@@ -1111,8 +1137,15 @@ ngx_http_request_body_chunked_filter(ngx_http_request_t *r, ngx_chain_t *in)
8080

8181
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
8282

@@ -93,7 +93,7 @@ index 71d7e9a..99fcbad 100644
9393
{
9494
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
9595
diff --git src/http/v2/ngx_http_v2.c src/http/v2/ngx_http_v2.c
96-
index 43a4fde..43c78f9 100644
96+
index 3afa8b638..c31b98b35 100644
9797
--- src/http/v2/ngx_http_v2.c
9898
+++ src/http/v2/ngx_http_v2.c
9999
@@ -9,6 +9,9 @@
@@ -106,7 +106,7 @@ index 43a4fde..43c78f9 100644
106106

107107

108108
typedef struct {
109-
@@ -4211,10 +4214,18 @@ ngx_http_v2_filter_request_body(ngx_http_request_t *r)
109+
@@ -4324,10 +4327,18 @@ ngx_http_v2_filter_request_body(ngx_http_request_t *r)
110110
}
111111

112112
} else {

0 commit comments

Comments
 (0)