[nginx] svn commit: r4245 - in branches/stable-1.0: . src/os/unix

[igor at sysoev.ru]

Author: is
Date: 2011-11-01 11:26:56 +0000 (Tue, 01 Nov 2011)
New Revision: 4245

Modified:
   branches/stable-1.0/
   branches/stable-1.0/src/os/unix/ngx_process.c
Log:
Merging r4020:

SIGWINCH/NOACCEPT signal is disabled now in non-daemon mode.
Non-daemon mode is currently used by supervisord, daemontools and so on
or during debugging. The NOACCEPT signal is only used for online upgrade
which is not supported when nginx is run under supervisord, etc.,
so this change should not break existant setups.



Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4023,4025-4027,4035-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4131,4133,4135-4137,4154,4156-4157,4184,4192,4200-4205
   + /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4020,4023,4025-4027,4035-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4131,4133,4135-4137,4154,4156-4157,4184,4192,4200-4205

Modified: branches/stable-1.0/src/os/unix/ngx_process.c
===================================================================
--- branches/stable-1.0/src/os/unix/ngx_process.c	2011-11-01 11:25:15 UTC (rev 4244)
+++ branches/stable-1.0/src/os/unix/ngx_process.c	2011-11-01 11:26:56 UTC (rev 4245)
@@ -339,8 +339,10 @@
             break;
 
         case ngx_signal_value(NGX_NOACCEPT_SIGNAL):
-            ngx_noaccept = 1;
-            action = ", stop accepting connections";
+            if (ngx_daemonized) {
+                ngx_noaccept = 1;
+                action = ", stop accepting connections";
+            }
             break;
 
         case ngx_signal_value(NGX_RECONFIGURE_SIGNAL):
@@ -392,6 +394,9 @@
         switch (signo) {
 
         case ngx_signal_value(NGX_NOACCEPT_SIGNAL):
+            if (!ngx_daemonized) {
+                break;
+            }
             ngx_debug_quit = 1;
         case ngx_signal_value(NGX_SHUTDOWN_SIGNAL):
             ngx_quit = 1;