From 465a5ff18b4c0d937d7226586dd8f78dceeae58b Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 21 Dec 2007 17:50:49 +0000 Subject: [PATCH] tree.init_handler is never called --- src/http/modules/ngx_http_dav_module.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c index e1533e867..2d555c556 100644 --- a/src/http/modules/ngx_http_dav_module.c +++ b/src/http/modules/ngx_http_dav_module.c @@ -37,7 +37,6 @@ static ngx_int_t ngx_http_dav_handler(ngx_http_request_t *r); static void ngx_http_dav_put_handler(ngx_http_request_t *r); static ngx_int_t ngx_http_dav_delete_handler(ngx_http_request_t *r); -static ngx_int_t ngx_http_dav_no_init(void *ctx, void *prev); static ngx_int_t ngx_http_dav_noop(ngx_tree_ctx_t *ctx, ngx_str_t *path); static ngx_int_t ngx_http_dav_delete_dir(ngx_tree_ctx_t *ctx, ngx_str_t *path); static ngx_int_t ngx_http_dav_delete_file(ngx_tree_ctx_t *ctx, ngx_str_t *path); @@ -408,13 +407,6 @@ ngx_http_dav_delete_handler(ngx_http_request_t *r) } -static ngx_int_t -ngx_http_dav_no_init(void *ctx, void *prev) -{ - return NGX_OK; -} - - static ngx_int_t ngx_http_dav_noop(ngx_tree_ctx_t *ctx, ngx_str_t *path) { @@ -710,7 +702,7 @@ overwrite_done: copy.len = path.len; - tree.init_handler = ngx_http_dav_no_init; + tree.init_handler = NULL; tree.file_handler = ngx_http_dav_copy_file; tree.pre_tree_handler = ngx_http_dav_copy_dir; tree.post_tree_handler = ngx_http_dav_copy_dir_time; @@ -960,7 +952,7 @@ ngx_http_dav_delete_path(ngx_http_request_t *r, ngx_str_t *path, ngx_uint_t dir) if (dir) { - tree.init_handler = ngx_http_dav_no_init; + tree.init_handler = NULL; tree.file_handler = ngx_http_dav_delete_file; tree.pre_tree_handler = ngx_http_dav_noop; tree.post_tree_handler = ngx_http_dav_delete_dir;