From cdc463042b9406e4703d21202bc363e86321bb5d Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 7 Dec 2005 14:51:31 +0000 Subject: 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. --- src/os/unix/ngx_process_cycle.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'src/os/unix/ngx_process_cycle.c') 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(); + } } /* -- cgit v1.2.3