0d69dc951a
include patch for CVE-2019-20372 (rhbz#1790280) rework patches to work with %%autosetup
32 lines
956 B
Diff
32 lines
956 B
Diff
From b0e0114ed7d127e38b50fd1c2827eb959bd9a18f Mon Sep 17 00:00:00 2001
|
|
From: Ruslan Ermilov <ru@nginx.com>
|
|
Date: Mon, 23 Dec 2019 15:45:46 +0300
|
|
Subject: [PATCH 3/3] Discard request body when redirecting to a URL via
|
|
error_page.
|
|
|
|
Reported by Bert JW Regeer and Francisco Oca Gonzalez.
|
|
---
|
|
src/http/ngx_http_special_response.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
|
|
index 4ffb2cc..76e6705 100644
|
|
--- a/src/http/ngx_http_special_response.c
|
|
+++ b/src/http/ngx_http_special_response.c
|
|
@@ -623,6 +623,12 @@ ngx_http_send_error_page(ngx_http_request_t *r, ngx_http_err_page_t *err_page)
|
|
return ngx_http_named_location(r, &uri);
|
|
}
|
|
|
|
+ r->expect_tested = 1;
|
|
+
|
|
+ if (ngx_http_discard_request_body(r) != NGX_OK) {
|
|
+ r->keepalive = 0;
|
|
+ }
|
|
+
|
|
location = ngx_list_push(&r->headers_out.headers);
|
|
|
|
if (location == NULL) {
|
|
--
|
|
2.26.2
|
|
|