diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-12-07 14:46:21 +0000 |
---|---|---|
committer | Jonathan Kolb <jon@b0g.us> | 2005-12-07 14:46:21 +0000 |
commit | f962860d0dd4038450aaae5c3b5f94d68f192cab (patch) | |
tree | 56d606cef5954794f18b9c04e071cb0083291eef /src/os/unix/ngx_process_cycle.c | |
parent | 1e8b202b5767ac9f14d1ee5aff3ab55f250bbec5 (diff) | |
download | nginx-f962860d0dd4038450aaae5c3b5f94d68f192cab.tar.gz |
Changes with nginx 0.3.15 07 Dec 2005v0.3.15
*) Feature: the new 444 code of the "return" directive to close
connection.
*) Feature: the "so_keepalive" directive in IMAP/POP3 proxy.
*) Bugfix: if there are unclosed connection nginx now calls abort()
only on gracefull quit and active "debug_points" directive.
Diffstat (limited to 'src/os/unix/ngx_process_cycle.c')
-rw-r--r-- | src/os/unix/ngx_process_cycle.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 7adcc6ef7..14bbe80b2 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -938,23 +938,25 @@ ngx_worker_process_exit(ngx_cycle_t *cycle) } } - c = cycle->connections; - for (i = 0; i < cycle->connection_n; i++) { - if (c[i].fd != -1 - && c[i].read - && !c[i].read->accept - && !c[i].read->channel) - { - ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, - "open socket #%d left in %ui connection, " - "aborting", - c[i].fd, i); - ngx_abort(); + if (ngx_quit) { + c = cycle->connections; + for (i = 0; i < cycle->connection_n; i++) { + if (c[i].fd != -1 + && c[i].read + && !c[i].read->accept + && !c[i].read->channel) + { + ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, + "open socket #%d left in %ui connection, " + "aborting", + c[i].fd, i); + ngx_debug_point(); + } } - } - if (ngx_debug_quit) { - ngx_debug_point(); + if (ngx_debug_quit) { + ngx_debug_point(); + } } /* |