svn commit: r559454 - in head/www/nginx-devel: . files

[Sergey A. Osokin]

Author: osa
Date: Mon Dec 28 10:14:48 2020
New Revision: 559454
URL: https://svnweb.freebsd.org/changeset/ports/559454

Log:
  Fix PROPFIND fail with 500 on simlinks to non exist file/dir
  when nginx compiled with the third-party http_dav_ext module.
  
  Bump PORTREVISION.
  
  PR:	220871

Added:
  head/www/nginx-devel/files/extra-patch-ngx_http_dav_ext_module.c   (contents, props changed)
Modified:
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/Makefile.extmod

Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile	Mon Dec 28 10:14:37 2020	(r559453)
+++ head/www/nginx-devel/Makefile	Mon Dec 28 10:14:48 2020	(r559454)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	nginx
 PORTVERSION=	1.19.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa

Modified: head/www/nginx-devel/Makefile.extmod
==============================================================================
--- head/www/nginx-devel/Makefile.extmod	Mon Dec 28 10:14:37 2020	(r559453)
+++ head/www/nginx-devel/Makefile.extmod	Mon Dec 28 10:14:48 2020	(r559454)
@@ -90,6 +90,7 @@ HTTP_DAV_EXT_IMPLIES=		HTTP_DAV
 HTTP_DAV_EXT_USE=		GNOME=libxml2,libxslt
 HTTP_DAV_EXT_GH_TUPLE=		arut:nginx-dav-ext-module:v3.0.0:dav_ext
 HTTP_DAV_EXT_VARS=		DSO_EXTMODS+=dav_ext
+HTTP_DAV_EXT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-ngx_http_dav_ext_module.c
 
 HTTP_EVAL_GH_TUPLE=		openresty:nginx-eval-module:582bd25:eval
 HTTP_EVAL_VARS=			DSO_EXTMODS+=eval

Added: head/www/nginx-devel/files/extra-patch-ngx_http_dav_ext_module.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-ngx_http_dav_ext_module.c	Mon Dec 28 10:14:48 2020	(r559454)
@@ -0,0 +1,15 @@
+--- ../nginx-dav-ext-module-3.0.0/ngx_http_dav_ext_module.c	2018-12-17 11:45:12.000000000 +0300
++++ ../nginx-dav-ext-module-3.0.0/ngx_http_dav_ext_module.c	2020-03-13 01:20:47.498199000 +0300
+@@ -896,10 +896,9 @@
+             ngx_cpystrn(last, name.data, name.len + 1);
+ 
+             if (ngx_de_info(filename, &dir) == NGX_FILE_ERROR) {
+-                ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno,
++                ngx_log_error(NGX_LOG_ERR, r->connection->log, ngx_errno,
+                               ngx_de_info_n " \"%s\" failed", filename);
+-                rc = NGX_HTTP_INTERNAL_SERVER_ERROR;
+-                break;
++                continue;
+             }
+         }
+