mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use malloc() in ngx_win32_rename_file, set crit level instead of error

Browse Source
This commit is contained in:
Igor Sysoev 2007-12-07 19:57:13 +00:00
parent 03df86a541
commit 27dd6a62bd
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/modules/ngx_http_dav_module.c
View File

@ -295,7 +295,7 @@ ngx_http_dav_put_handler(ngx_http_request_t *r)
#if (NGX_WIN32) #if (NGX_WIN32)
if (err == NGX_EEXIST) { 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) { if (ngx_rename_file(temp->data, path.data) != NGX_FILE_ERROR) {
goto ok; goto ok;

2
src/http/ngx_http_upstream.c
View File

@ -2224,7 +2224,7 @@ ngx_http_upstream_store(ngx_http_request_t *r, ngx_http_upstream_t *u)
#if (NGX_WIN32) #if (NGX_WIN32)
if (err == NGX_EEXIST) { 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) { if (ngx_rename_file(temp->data, path.data) != NGX_FILE_ERROR) {
return; return;

12
src/os/win32/ngx_files.c
View File

@ -201,14 +201,14 @@ ngx_write_fd(ngx_fd_t fd, void *buf, size_t size)
ngx_int_t ngx_int_t
ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool) ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log)
{ {
u_char *name; u_char *name;
ngx_int_t rc; ngx_int_t rc;
ngx_uint_t collision; ngx_uint_t collision;
ngx_atomic_uint_t num; ngx_atomic_uint_t num;
name = ngx_palloc(pool, to->len + 1 + 10 + 1 + sizeof("DELETE")); name = ngx_alloc(to->len + 1 + 10 + 1 + sizeof("DELETE"), log);
if (name == NULL) { if (name == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -230,7 +230,7 @@ ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool)
collision = 1; collision = 1;
ngx_log_error(NGX_LOG_ERR, pool->log, ngx_errno, "MoveFile() failed"); ngx_log_error(NGX_LOG_CRIT, log, ngx_errno, "MoveFile() failed");
} }
if (MoveFile((const char *) from->data, (const char *) to->data) == 0) { if (MoveFile((const char *) from->data, (const char *) to->data) == 0) {
@ -241,15 +241,17 @@ ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_pool_t *pool)
} }
if (DeleteFile((const char *) name) == 0) { if (DeleteFile((const char *) name) == 0) {
ngx_log_error(NGX_LOG_ERR, pool->log, ngx_errno, "DeleteFile() failed"); ngx_log_error(NGX_LOG_CRIT, log, ngx_errno, "DeleteFile() failed");
} }
if (rc == NGX_ERROR) { if (rc == NGX_ERROR) {
ngx_log_error(NGX_LOG_ERR, pool->log, ngx_errno, "MoveFile() failed"); ngx_log_error(NGX_LOG_CRIT, log, ngx_errno, "MoveFile() failed");
} }
/* mutex_unlock() */ /* mutex_unlock() */
ngx_free(name);
return rc; return rc;
} }

3
src/os/win32/ngx_files.h
View File

@ -86,8 +86,7 @@ ssize_t ngx_write_fd(ngx_fd_t fd, void *buf, size_t size);
#define ngx_rename_file(o, n) MoveFile((const char *) o, (const char *) n) #define ngx_rename_file(o, n) MoveFile((const char *) o, (const char *) n)
#define ngx_rename_file_n "MoveFile()" #define ngx_rename_file_n "MoveFile()"
ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_int_t ngx_win32_rename_file(ngx_str_t *from, ngx_str_t *to, ngx_log_t *log);
ngx_pool_t *pool);