Date: Mon, 7 Dec 2020 20:06:32 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557244 - in head/www/nginx-devel: . files Message-ID: <202012072006.0B7K6WUL040526@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Mon Dec 7 20:06:32 2020 New Revision: 557244 URL: https://svnweb.freebsd.org/changeset/ports/557244 Log: Fix a worker process issue by adding the vendor's patch. Bump PORTREVISION. Reported by: Peter Putzer <freebsd@mnd.sc> <ChangeLog> SSL: fixed SSL shutdown on lingering close. Ensure c->recv is properly reset to ngx_recv if SSL_shutdown() blocks on writing. The bug had appeared in 554c6ae25ffc. </ChangeLog> PR: 251664 Added: head/www/nginx-devel/files/PR-251664.patch (contents, props changed) Modified: head/www/nginx-devel/Makefile Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Mon Dec 7 19:33:18 2020 (r557243) +++ head/www/nginx-devel/Makefile Mon Dec 7 20:06:32 2020 (r557244) @@ -3,12 +3,14 @@ PORTNAME?= nginx PORTVERSION= 1.19.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa PKGNAMESUFFIX?= -devel DISTFILES= ${DISTNAME}${EXTRACT_SUFX} + +EXTRA_PATCHES+= ${FILESDIR}/PR-251664.patch:-p1 MAINTAINER?= osa@FreeBSD.org COMMENT?= Robust and small WWW server Added: head/www/nginx-devel/files/PR-251664.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/PR-251664.patch Mon Dec 7 20:06:32 2020 (r557244) @@ -0,0 +1,72 @@ +# HG changeset patch +# User Ruslan Ermilov <ru@nginx.com> +# Date 1607367150 -10800 +# Mon Dec 07 21:52:30 2020 +0300 +# Node ID 9cad062c593037ada10c2e50ff503a4d4ce19a8f +# Parent 2522d789afbaa1d79105a08c35c46e52984cee68 +SSL: fixed SSL shutdown on lingering close. + +Ensure c->recv is properly reset to ngx_recv if SSL_shutdown() +blocks on writing. + +The bug had appeared in 554c6ae25ffc. + +diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c +--- a/src/event/ngx_event_openssl.c ++++ b/src/event/ngx_event_openssl.c +@@ -2880,6 +2880,7 @@ ngx_ssl_shutdown(ngx_connection_t *c) + + SSL_free(c->ssl->connection); + c->ssl = NULL; ++ c->recv = ngx_recv; + + return NGX_OK; + } +@@ -2925,6 +2926,7 @@ ngx_ssl_shutdown(ngx_connection_t *c) + if (n == 1) { + SSL_free(c->ssl->connection); + c->ssl = NULL; ++ c->recv = ngx_recv; + + return NGX_OK; + } +@@ -2967,6 +2969,7 @@ ngx_ssl_shutdown(ngx_connection_t *c) + if (sslerr == SSL_ERROR_ZERO_RETURN || ERR_peek_error() == 0) { + SSL_free(c->ssl->connection); + c->ssl = NULL; ++ c->recv = ngx_recv; + + return NGX_OK; + } +@@ -2977,6 +2980,7 @@ ngx_ssl_shutdown(ngx_connection_t *c) + + SSL_free(c->ssl->connection); + c->ssl = NULL; ++ c->recv = ngx_recv; + + return NGX_ERROR; + } +diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c +--- a/src/http/ngx_http_request.c ++++ b/src/http/ngx_http_request.c +@@ -3397,8 +3397,6 @@ ngx_http_set_lingering_close(ngx_connect + c->ssl->handler = ngx_http_set_lingering_close; + return; + } +- +- c->recv = ngx_recv; + } + #endif + +diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c +--- a/src/http/v2/ngx_http_v2.c ++++ b/src/http/v2/ngx_http_v2.c +@@ -739,8 +739,6 @@ ngx_http_v2_lingering_close(ngx_connecti + c->ssl->handler = ngx_http_v2_lingering_close; + return; + } +- +- c->recv = ngx_recv; + } + #endif +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012072006.0B7K6WUL040526>