From 1648bec9f5b5199057f9e218a1b9f4715c6cc50b Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Wed, 23 Dec 2020 02:38:14 +0300 Subject: [PATCH] www/nginx-devel: Fix PROPFIND fail with 500 on simlinks to non exist file/dir Private patch: not reported to FreeBSD. https://github.com/arut/nginx-dav-ext-module/pull/56 --- www/nginx-devel/Makefile.extmod | 1 + .../files/extra-patch-ngx_http_dav_ext_module.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 www/nginx-devel/files/extra-patch-ngx_http_dav_ext_module.c diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index efcb7a72bc0be..975bf881ac851 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -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 diff --git a/www/nginx-devel/files/extra-patch-ngx_http_dav_ext_module.c b/www/nginx-devel/files/extra-patch-ngx_http_dav_ext_module.c new file mode 100644 index 0000000000000..cf66be99de49f --- /dev/null +++ b/www/nginx-devel/files/extra-patch-ngx_http_dav_ext_module.c @@ -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; + } + } +