Mercurial > hg > nginx

changeset 5967:863d9de1e62b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Core: supported directory skipping in ngx_walk_tree(). If pre_tree_handler() returns NGX_DECLINED, the directory is ignored.
author Roman Arutyunyan <arut@nginx.com>
date Mon, 02 Feb 2015 19:38:32 +0300
parents bcdfc39bf44d
children 99639bfdfa2a
files src/core/ngx_file.c
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -1047,10 +1047,18 @@ ngx_walk_tree(ngx_tree_ctx_t *ctx, ngx_s
             ctx->access = ngx_de_access(&dir);
             ctx->mtime = ngx_de_mtime(&dir);
 
-            if (ctx->pre_tree_handler(ctx, &file) == NGX_ABORT) {
+            rc = ctx->pre_tree_handler(ctx, &file);
+
+            if (rc == NGX_ABORT) {
                 goto failed;
             }
 
+            if (rc == NGX_DECLINED) {
+                ngx_log_debug1(NGX_LOG_DEBUG_CORE, ctx->log, 0,
+                               "tree skip dir \"%s\"", file.data);
+                continue;
+            }
+
             if (ngx_walk_tree(ctx, &file) == NGX_ABORT) {
                 goto failed;
             }