svn commit: r559626 - in head/www/nginx: . files
Jochen Neumeister
joneum at FreeBSD.org
Tue Dec 29 22:33:42 UTC 2020
Author: joneum
Date: Tue Dec 29 22:33:41 2020
New Revision: 559626
URL: https://svnweb.freebsd.org/changeset/ports/559626
Log:
merge r559454 from www/nginx-devel:
Fix PROPFIND fail with 500 on simlinks to non exist file/dir
when nginx compiled with the third-party http_dav_ext module.
PR: 220871
Sponsored by: Netzkommune GmbH
Added:
head/www/nginx/files/extra-patch-ngx_http_dav_ext_module.c (contents, props changed)
Modified:
head/www/nginx/Makefile
head/www/nginx/Makefile.extmod
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Tue Dec 29 22:28:14 2020 (r559625)
+++ head/www/nginx/Makefile Tue Dec 29 22:33:41 2020 (r559626)
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.18.0
-PORTREVISION?= 43
+PORTREVISION?= 44
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod Tue Dec 29 22:28:14 2020 (r559625)
+++ head/www/nginx/Makefile.extmod Tue Dec 29 22:33:41 2020 (r559626)
@@ -93,6 +93,7 @@ HTTP_DAV_EXT_IMPLIES= HTTP_DAV
HTTP_DAV_EXT_LIB_DEPENDS= libexpat.so:textproc/expat2
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/files/extra-patch-ngx_http_dav_ext_module.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-ngx_http_dav_ext_module.c Tue Dec 29 22:33:41 2020 (r559626)
@@ -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;
+ }
+ }
+
More information about the svn-ports-head
mailing list