diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-12-25 20:26:58 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-12-25 20:26:58 +0000 |
| commit | 3b30a901b43c11c83ac598e0954c3c33a89d78fd (patch) | |
| tree | d3cb44de69fa95516be20a38bc14cea0324e8200 /src/core/nginx.c | |
| parent | fc68ea6f7bedd491126ef57110b6362e9af8900f (diff) | |
| download | nginx-3b30a901b43c11c83ac598e0954c3c33a89d78fd.tar.gz nginx-3b30a901b43c11c83ac598e0954c3c33a89d78fd.zip | |
nginx-0.0.1-2003-12-25-23:26:58 import
Diffstat (limited to 'src/core/nginx.c')
| -rw-r--r-- | src/core/nginx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 7deb24fd3..eee88dc3f 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -204,11 +204,13 @@ int main(int argc, char *const *argv) ngx_process_events(cycle->log); if (done) { +#if !(WIN32) if (ngx_delete_file(pidfile.name.data) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_delete_file_n " \"%s\" failed", pidfile.name.data); } +#endif ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "exiting"); @@ -291,11 +293,11 @@ ngx_log_debug(log, "REOPEN: %d:%d:%s" _ fd _ file[i].fd _ file[i].name.data); static ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log) { int i, n, failed; - ngx_fd_t fd; ngx_str_t conf_file; ngx_conf_t conf; ngx_pool_t *pool; ngx_cycle_t *cycle, **old; + ngx_socket_t fd; ngx_core_conf_t *ccf; ngx_open_file_t *file; ngx_listening_t *ls, *nls; @@ -457,7 +459,7 @@ ngx_log_debug(log, "OPEN: %d:%s" _ file[i].fd _ file[i].name.data); fd /= 4; #endif - if (fd >= cycle->connection_n) { + if (fd >= (ngx_socket_t) cycle->connection_n) { ngx_log_error(NGX_LOG_EMERG, log, 0, "%d connections is not enough to hold " "an open listening socket on %s, " |