From efdaec7003e37933e113b009407f2a62df2ec78a Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 26 Oct 2009 17:32:17 +0000 Subject: merge r3024, r3025, r3028, r3033, r3034, r3035, r3036: allow cross device temporary files atomic copying --- src/os/unix/ngx_errno.h | 1 + src/os/unix/ngx_process_cycle.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/os/unix') diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h index 3dbfa227e..379f36777 100644 --- a/src/os/unix/ngx_errno.h +++ b/src/os/unix/ngx_errno.h @@ -16,6 +16,7 @@ typedef int ngx_err_t; #define NGX_EPERM EPERM #define NGX_ENOENT ENOENT +#define NGX_ENOPATH ENOENT #define NGX_ESRCH ESRCH #define NGX_EINTR EINTR #define NGX_ECHILD ECHILD diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 684640138..69db458f5 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -281,8 +281,6 @@ ngx_single_process_cycle(ngx_cycle_t *cycle) { ngx_uint_t i; - 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) { @@ -933,8 +931,6 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_uint_t priority) "sigprocmask() failed"); } - ngx_init_temp_number(); - /* * disable deleting previous events for the listening sockets because * in the worker processes there are no events at all at this point -- cgit