[nginx] svn commit: r4362 - in branches/stable-1.0: . src/core

[mdounin at mdounin.ru]

Author: mdounin
Date: 2011-12-14 15:25:32 +0000 (Wed, 14 Dec 2011)
New Revision: 4362

Log:
Merge of r4294:

Fixed handling of SIGWINCH/NOACCEPT signal.

After first upgrade it was ignored since r4020 (1.1.1, 1.0.9) as
ngx_daemonized wasn't set.


Modified:
   branches/stable-1.0/
   branches/stable-1.0/src/core/nginx.c


Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4300-4304,4308-4309,4321,4342-4343
   + /trunk:3960-3974,3977-3987,3991-3996,3998,4000-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143-4144,4147-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4217-4223,4227-4232,4235-4237,4265-4268,4270,4274-4276,4278-4280,4282-4284,4294,4300-4304,4308-4309,4321,4342-4343

Modified: branches/stable-1.0/src/core/nginx.c
===================================================================
--- branches/stable-1.0/src/core/nginx.c	2011-12-14 15:23:23 UTC (rev 4361)
+++ branches/stable-1.0/src/core/nginx.c	2011-12-14 15:25:32 UTC (rev 4362)
@@ -376,6 +376,10 @@
         ngx_daemonized = 1;
     }
 
+    if (ngx_inherited) {
+        ngx_daemonized = 1;
+    }
+
 #endif
 
     if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {