Mercurial > hg > nginx
diff src/os/unix/ngx_process_cycle.c @ 587:284cc140593b release-0.3.15
nginx-0.3.15-RELEASE import
*) 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.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 07 Dec 2005 14:51:31 +0000 |
parents | 4d9ea73a627a |
children | d4e858a5751a |
line wrap: on
line diff
--- a/src/os/unix/ngx_process_cycle.c Mon Dec 05 16:59:05 2005 +0000 +++ b/src/os/unix/ngx_process_cycle.c Wed Dec 07 14:51:31 2005 +0000 @@ -938,23 +938,25 @@ } } - 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(); + } } /*