diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-03-28 14:43:02 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-03-28 14:43:02 +0000 |
commit | c04deca88f2b3b99b615571b447d7ecbb6a79bee (patch) | |
tree | 79cedaf8b0e94ca35296e47fa7dd0d29a94bbda9 /src/os/unix/ngx_process_cycle.c | |
parent | c4d120bb4378dbd1fbb9f1e2d7930feab6c2ecf2 (diff) | |
download | nginx-c04deca88f2b3b99b615571b447d7ecbb6a79bee.tar.gz nginx-c04deca88f2b3b99b615571b447d7ecbb6a79bee.zip |
nginx-0.1.27-RELEASE importrelease-0.1.27
*) Feature: the "blocked" parameter of the "valid_referers" directive.
*) Change: the errors while handling the request header now logged at
"info" level. The server name and the "Host" and "Referer" header
lines also logged.
*) Change: the "Host" header line is also logged in error log.
*) Feature: the proxy_pass_unparsed_uri directive. The special handling
of the "://" symbols in URI, appeared in 0.1.11 version, now is
canceled.
*) Bugfix: nginx could not be built on FreeBSD and Linux, if the
--without-ngx_http_auth_basic_module configuration parameter was
used.
Diffstat (limited to 'src/os/unix/ngx_process_cycle.c')
-rw-r--r-- | src/os/unix/ngx_process_cycle.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 9c5a7ee15..23589c997 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -632,7 +632,14 @@ ngx_master_exit(ngx_cycle_t *cycle) ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exit"); + /* + * we do not destroy cycle->pool here because a signal handler + * that uses cycle->log can be called at this point + */ + +#if 0 ngx_destroy_pool(cycle->pool); +#endif exit(0); } @@ -718,6 +725,10 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data) * we do not destroy cycle->pool here because a signal handler * that uses cycle->log can be called at this point */ + +#if 0 + ngx_destroy_pool(cycle->pool); +#endif exit(0); } @@ -736,6 +747,11 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data) * we do not destroy cycle->pool here because a signal handler * that uses cycle->log can be called at this point */ + +#if 0 + ngx_destroy_pool(cycle->pool); +#endif + exit(0); } |