# HG changeset patch # User Igor Sysoev # Date 1204561936 0 # Node ID cbd321d1e1b3f248c33c5596ebf10c1959ef5fbd # Parent f2953601ed3c22e5fcb23f0b3a990dd994a36d8c C++ compatibility diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -554,7 +554,7 @@ ngx_ext_rename_file(ngx_str_t *src, ngx_ failed: - if (ext->delete) { + if (ext->delete_file) { if (ngx_delete_file(src->data) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno, ngx_delete_file_n " \"%s\" failed", src->data); diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h --- a/src/core/ngx_file.h +++ b/src/core/ngx_file.h @@ -63,7 +63,7 @@ typedef struct { ngx_fd_t fd; unsigned create_path:1; - unsigned delete:1; + unsigned delete_file:1; ngx_log_t *log; } ngx_ext_rename_file_t; diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c --- a/src/http/modules/ngx_http_dav_module.c +++ b/src/http/modules/ngx_http_dav_module.c @@ -248,7 +248,7 @@ ngx_http_dav_put_handler(ngx_http_reques ext.access = dlcf->access; ext.time = -1; ext.create_path = dlcf->create_full_put_path; - ext.delete = 1; + ext.delete_file = 1; ext.log = r->connection->log; if (r->headers_in.date) {