diff options
| author | kim <kim@pkgsrc.org> | 2020-01-19 07:28:36 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2020-01-19 07:28:36 +0000 |
| commit | 85a62c0000345897d69934fa411154203eeb412f (patch) | |
| tree | b6d6d70ef5b3a5bf57054a2c60f4e5675a5bae07 | |
| parent | 4a93d7c3907a12fafd9329d29db46a08d290c254 (diff) | |
| download | pkgsrc-85a62c0000345897d69934fa411154203eeb412f.tar.gz | |
Add patch from upstream to address CVE-2019-20372. Bump revision.
| -rw-r--r-- | www/nginx/Makefile | 4 | ||||
| -rw-r--r-- | www/nginx/distinfo | 3 | ||||
| -rw-r--r-- | www/nginx/patches/patch-src_http_ngx__http__special__response.c | 21 |
3 files changed, 25 insertions, 3 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 9b4429f165b..dae095f65cd 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.86 2020/01/18 21:51:09 jperkin Exp $ +# $NetBSD: Makefile,v 1.87 2020/01/19 07:28:36 kim Exp $ DISTNAME= nginx-1.16.1 MAINTAINER= joerg@NetBSD.org -PKGREVISION= 1 +PKGREVISION= 2 .include "../../www/nginx/Makefile.common" diff --git a/www/nginx/distinfo b/www/nginx/distinfo index c81acd97888..67c68f0c194 100644 --- a/www/nginx/distinfo +++ b/www/nginx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.70 2019/08/15 08:06:29 adam Exp $ +$NetBSD: distinfo,v 1.71 2020/01/19 07:28:36 kim Exp $ SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26 RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733 @@ -53,3 +53,4 @@ SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763 SHA1 (patch-auto_cc_conf) = 5e6a479ba419cd16dedeb3b4c47dc685d126ef6a SHA1 (patch-auto_lib_pcre_conf) = 8cf03fe38e7f75ef6892cc8b93be5cb18c381e97 SHA1 (patch-src_event_modules_ngx__eventport__module.c) = c8e919f48d68bd5bffc4ad11d9c79dc6da3a0de2 +SHA1 (patch-src_http_ngx__http__special__response.c) = ab1fcd9727d13b3d8697bc16a7bacce7718e8b4c diff --git a/www/nginx/patches/patch-src_http_ngx__http__special__response.c b/www/nginx/patches/patch-src_http_ngx__http__special__response.c new file mode 100644 index 00000000000..55926988fa3 --- /dev/null +++ b/www/nginx/patches/patch-src_http_ngx__http__special__response.c @@ -0,0 +1,21 @@ +$NetBSD$ + +Discard request body when redirecting to a URL via error_page. + +https://github.com/nginx/nginx/commit/c1be55f97211d38b69ac0c2027e6812ab8b1b94e.patch + +--- src/http/ngx_http_special_response.c ++++ 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) { |