Mercurial > hg > nginx

changeset 1909:cbd321d1e1b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
C++ compatibility
author Igor Sysoev <igor@sysoev.ru>
date Mon, 03 Mar 2008 16:32:16 +0000
parents f2953601ed3c
children 8c64532e4875
files src/core/ngx_file.c src/core/ngx_file.h src/http/modules/ngx_http_dav_module.c
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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;
--- 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) {