summaryrefslogtreecommitdiff
path: root/httpd-2.4.57-davenoent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'httpd-2.4.57-davenoent.patch')
-rw-r--r--httpd-2.4.57-davenoent.patch51
1 files changed, 51 insertions, 0 deletions
diff --git a/httpd-2.4.57-davenoent.patch b/httpd-2.4.57-davenoent.patch
new file mode 100644
index 0000000..874f766
--- /dev/null
+++ b/httpd-2.4.57-davenoent.patch
@@ -0,0 +1,51 @@
+--- httpd-2.4.57/modules/dav/fs/repos.c.davenoent
++++ httpd-2.4.57/modules/dav/fs/repos.c
+@@ -35,6 +35,7 @@
+ #include "mod_dav.h"
+ #include "repos.h"
+
++APLOG_USE_MODULE(dav_fs);
+
+ /* to assist in debugging mod_dav's GET handling */
+ #define DEBUG_GET_HANDLER 0
+@@ -1586,6 +1587,19 @@
+ status = apr_stat(&fsctx->info1.finfo, fsctx->path1.buf,
+ DAV_FINFO_MASK, pool);
+ if (status != APR_SUCCESS && status != APR_INCOMPLETE) {
++ dav_resource_private *ctx = params->root->info;
++
++ ap_log_rerror(APLOG_MARK, APLOG_ERR, status, ctx->r,
++ APLOGNO(10472) "could not access file (%s) during directory walk",
++ fsctx->path1.buf);
++
++ /* If being tolerant, ignore failure due to losing a race
++ * with some other process deleting files out from under
++ * the directory walk. */
++ if ((params->walk_type & DAV_WALKTYPE_TOLERANT)
++ && APR_STATUS_IS_ENOENT(status)) {
++ continue;
++ }
+ /* woah! where'd it go? */
+ /* ### should have a better error here */
+ err = dav_new_error(pool, HTTP_NOT_FOUND, 0, status, NULL);
+--- httpd-2.4.57/modules/dav/main/mod_dav.c.davenoent
++++ httpd-2.4.57/modules/dav/main/mod_dav.c
+@@ -2187,7 +2187,7 @@
+ return HTTP_BAD_REQUEST;
+ }
+
+- ctx.w.walk_type = DAV_WALKTYPE_NORMAL | DAV_WALKTYPE_AUTH;
++ ctx.w.walk_type = DAV_WALKTYPE_NORMAL | DAV_WALKTYPE_AUTH | DAV_WALKTYPE_TOLERANT;
+ ctx.w.func = dav_propfind_walker;
+ ctx.w.walk_ctx = &ctx;
+ ctx.w.pool = r->pool;
+--- httpd-2.4.57/modules/dav/main/mod_dav.h.davenoent
++++ httpd-2.4.57/modules/dav/main/mod_dav.h
+@@ -1823,6 +1823,7 @@
+ #define DAV_WALKTYPE_AUTH 0x0001 /* limit to authorized files */
+ #define DAV_WALKTYPE_NORMAL 0x0002 /* walk normal files */
+ #define DAV_WALKTYPE_LOCKNULL 0x0004 /* walk locknull resources */
++#define DAV_WALKTYPE_TOLERANT 0x0008 /* tolerate non-fatal errors */
+
+ /* callback function and a client context for the walk */
+ dav_error * (*func)(dav_walk_resource *wres, int calltype);