From 27dd6a62bd76983e6bdc5c45e108aae816fac761 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 7 Dec 2007 19:57:13 +0000 Subject: use malloc() in ngx_win32_rename_file, set crit level instead of error --- src/http/modules/ngx_http_dav_module.c | 2 +- src/http/ngx_http_upstream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/http') diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c index 854627c78..b9d01f391 100644 --- a/src/http/modules/ngx_http_dav_module.c +++ b/src/http/modules/ngx_http_dav_module.c @@ -295,7 +295,7 @@ ngx_http_dav_put_handler(ngx_http_request_t *r) #if (NGX_WIN32) if (err == NGX_EEXIST) { - if (ngx_win32_rename_file(temp, &path, r->pool) != NGX_ERROR) { + if (ngx_win32_rename_file(temp, &path, r->connection->log) == NGX_OK) { if (ngx_rename_file(temp->data, path.data) != NGX_FILE_ERROR) { goto ok; diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index e51638b56..3d7249921 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -2224,7 +2224,7 @@ ngx_http_upstream_store(ngx_http_request_t *r, ngx_http_upstream_t *u) #if (NGX_WIN32) if (err == NGX_EEXIST) { - if (ngx_win32_rename_file(temp, &path, r->pool) != NGX_ERROR) { + if (ngx_win32_rename_file(temp, &path, r->connection->log) == NGX_OK) { if (ngx_rename_file(temp->data, path.data) != NGX_FILE_ERROR) { return; -- cgit