diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 17:32:17 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-10-26 17:32:17 +0000 |
| commit | efdaec7003e37933e113b009407f2a62df2ec78a (patch) | |
| tree | fbf57f161e23d1254eb47a769ba69d83f9e5a5b7 /src/os/win32 | |
| parent | 7571f6c962e5b02abf01b2f1c9f84cb109728d4d (diff) | |
| download | nginx-efdaec7003e37933e113b009407f2a62df2ec78a.tar.gz nginx-efdaec7003e37933e113b009407f2a62df2ec78a.tar.bz2 | |
merge r3024, r3025, r3028, r3033, r3034, r3035, r3036:
allow cross device temporary files atomic copying
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_errno.h | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/os/win32/ngx_errno.h b/src/os/win32/ngx_errno.h index 75ae73f5d..e5e1a3744 100644 --- a/src/os/win32/ngx_errno.h +++ b/src/os/win32/ngx_errno.h @@ -21,6 +21,7 @@ typedef DWORD ngx_err_t; #define NGX_EPERM ERROR_ACCESS_DENIED #define NGX_ENOENT ERROR_FILE_NOT_FOUND +#define NGX_ENOPATH ERROR_PATH_NOT_FOUND #define NGX_ENOMEM ERROR_NOT_ENOUGH_MEMORY #define NGX_EACCES ERROR_ACCESS_DENIED /* it's seems that ERROR_FILE_EXISTS is not appropriate error code */ diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index 7a4b9556f..59016b961 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -793,8 +793,6 @@ ngx_worker_thread(void *data) cycle = (ngx_cycle_t *) ngx_cycle; - ngx_init_temp_number(); - for (n = 0; ngx_modules[n]; n++) { if (ngx_modules[n]->init_process) { if (ngx_modules[n]->init_process(cycle) == NGX_ERROR) { @@ -1024,8 +1022,6 @@ ngx_single_process_cycle(ngx_cycle_t *cycle) ngx_int_t i; ngx_tid_t tid; - ngx_init_temp_number(); - for (i = 0; ngx_modules[i]; i++) { if (ngx_modules[i]->init_process) { if (ngx_modules[i]->init_process(cycle) == NGX_ERROR) { |