--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -6,7 +6,9 @@
 #include <nginx.h>
 
 
-static void ngx_start_worker_processes(ngx_cycle_y *cycle, ngx_int_t n)
+static void ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n,
+                                       ngx_int_t type);
+static void ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo);
 static void ngx_master_exit(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx);
 static void ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data);
 #if (NGX_THREADS)
@@ -36,11 +38,11 @@ ngx_uint_t    ngx_restart;
 
 void ngx_master_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx)
 {
-    int                signo;
+    ngx_uint_t         i;
     sigset_t           set;
     struct timeval     tv;
     struct itimerval   itv;
-    ngx_uint_t         i, live;
+    ngx_uint_t         live;
     ngx_msec_t         delay;
     ngx_core_conf_t   *ccf;
 
@@ -66,11 +68,11 @@ void ngx_master_process_cycle(ngx_cycle_
 
     ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
 
-    ngx_start_worker_processes(ccf->worker_processes);
+    ngx_start_worker_processes(cycle, ccf->worker_processes,
+                               NGX_PROCESS_RESPAWN);
 
     ngx_new_binary = 0;
     delay = 0;
-    signo = 0;
     live = 1;
 
     for ( ;; ) {
@@ -107,13 +109,14 @@ void ngx_master_process_cycle(ngx_cycle_
             live = 0;
             for (i = 0; i < ngx_last_process; i++) {
 
-                ngx_log_debug5(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                               "child: " PID_T_FMT " e:%d t:%d d:%d r:%d",
+                ngx_log_debug6(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+                               "child: " PID_T_FMT " e:%d t:%d d:%d r:%d j:%d",
                                ngx_processes[i].pid,
                                ngx_processes[i].exiting,
                                ngx_processes[i].exited,
                                ngx_processes[i].detached,
-                               ngx_processes[i].respawn);
+                               ngx_processes[i].respawn,
+                               ngx_processes[i].just_respawn);
 
                 if (ngx_processes[i].exited) {
 
@@ -168,19 +171,32 @@ void ngx_master_process_cycle(ngx_cycle_
             }
 
             if (delay > 1000) {
-                signo = SIGKILL;
+                ngx_signal_worker_processes(cycle, SIGKILL);
             } else {
-                signo = ngx_signal_value(NGX_TERMINATE_SIGNAL);
+                ngx_signal_worker_processes(cycle,
+                                       ngx_signal_value(NGX_TERMINATE_SIGNAL));
             }
 
-        } else if (ngx_quit) {
-            signo = ngx_signal_value(NGX_SHUTDOWN_SIGNAL);
+            continue;
+        }
+
+        if (ngx_quit) {
+            ngx_signal_worker_processes(cycle,
+                                        ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
+            continue;
+        }
 
-        } else if (ngx_timer) {
-            ngx_start_worker_processes(ccf->worker_processes);
-            signo = ngx_signal_value(NGX_SHUTDOWN_SIGNAL);
+        if (ngx_timer) {
+            ngx_timer = 0;
+            ngx_start_worker_processes(cycle, ccf->worker_processes,
+                                       NGX_PROCESS_JUST_RESPAWN);
+            live = 1;
+            ngx_signal_worker_processes(cycle,
+                                        ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
+        }
 
-        } else if (ngx_reconfigure) {
+        if (ngx_reconfigure) {
+            ngx_reconfigure = 0;
             ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "reconfiguring");
 
             cycle = ngx_init_cycle(cycle);
@@ -192,381 +208,94 @@ void ngx_master_process_cycle(ngx_cycle_
             ngx_cycle = cycle;
             ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx,
                                                    ngx_core_module);
-            ngx_start_worker_processes(ccf->worker_processes);
-
-            ngx_reconfigure = 0;
-            signo = ngx_signal_value(NGX_SHUTDOWN_SIGNAL);
-
-        } else if (ngx_restart) {
-            ngx_start_worker_processes(ccf->worker_processes);
-            ngx_restart = 0;
-
-        } else if (ngx_reopen) {
-                if (ngx_process == NGX_PROCESS_MASTER) {
-                    signo = ngx_signal_value(NGX_REOPEN_SIGNAL);
-                    ngx_reopen = 0;
-
-                } else { /* NGX_PROCESS_SINGLE */
-                    ngx_reopen = 0;
-                }
-
-                ngx_log_error(NGX_LOG_INFO, cycle->log, 0,
-                              "reopening logs");
-                ngx_reopen_files(cycle, ccf->user);
-
-        } else if (ngx_change_binary) {
-                ngx_change_binary = 0;
-                ngx_log_error(NGX_LOG_INFO, cycle->log, 0,
-                              "changing binary");
-                ngx_new_binary = ngx_exec_new_binary(cycle, ctx->argv);
-
-            } else if (ngx_noaccept) {
-                signo = ngx_signal_value(NGX_SHUTDOWN_SIGNAL);
-            }
-        }
-
-        if (signo) {
-            for (i = 0; i < ngx_last_process; i++) {
-
-                if (ngx_processes[i].detached) {
-                    continue;
-                }
-
-                ngx_log_debug2(NGX_LOG_DEBUG_CORE, cycle->log, 0,
-                               "kill (" PID_T_FMT ", %d)" ,
-                               ngx_processes[i].pid, signo);
-
-                if (kill(ngx_processes[i].pid, signo) == -1) {
-                    ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                                  "kill(%d, %d) failed",
-                                  ngx_processes[i].pid, signo);
-                    continue;
-                }
-
-                if (signo != ngx_signal_value(NGX_REOPEN_SIGNAL)) {
-                    ngx_processes[i].exiting = 1;
-                }
-            }
-
-            signo = 0;
+            ngx_start_worker_processes(cycle, ccf->worker_processes,
+                                       NGX_PROCESS_JUST_RESPAWN);
+            live = 1;
+            ngx_signal_worker_processes(cycle,
+                                        ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
         }
 
-
-
-
-
-
-
-
-
-
-    }
-}
-
-
-void ngx_master_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx)
-{
-    int                signo;
-    sigset_t           set;
-    struct timeval     tv;
-    struct itimerval   itv;
-    ngx_uint_t         i, live;
-    ngx_msec_t         delay;
-    ngx_core_conf_t   *ccf;
-
-    if (ngx_process == NGX_PROCESS_MASTER) {
-        sigemptyset(&set);
-        sigaddset(&set, SIGCHLD);
-        sigaddset(&set, SIGALRM);
-        sigaddset(&set, SIGINT);
-        sigaddset(&set, ngx_signal_value(NGX_RECONFIGURE_SIGNAL));
-        sigaddset(&set, ngx_signal_value(NGX_REOPEN_SIGNAL));
-        sigaddset(&set, ngx_signal_value(NGX_NOACCEPT_SIGNAL));
-        sigaddset(&set, ngx_signal_value(NGX_TERMINATE_SIGNAL));
-        sigaddset(&set, ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
-        sigaddset(&set, ngx_signal_value(NGX_CHANGEBIN_SIGNAL));
-
-        if (sigprocmask(SIG_BLOCK, &set, NULL) == -1) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                          "sigprocmask() failed");
-        }
-
-        sigemptyset(&set);
-    }
-
-    ngx_setproctitle("master process");
-
-    ngx_new_binary = 0;
-    delay = 0;
-    signo = 0;
-    live = 0;
-
-    for ( ;; ) {
-        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "new cycle");
-
-        ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx,
-                                               ngx_core_module);
-
-        if (ngx_process == NGX_PROCESS_MASTER) {
-            for (i = 0; i < (ngx_uint_t) ccf->worker_processes; i++) {
-                ngx_spawn_process(cycle, ngx_worker_process_cycle, NULL,
-                                  "worker process", NGX_PROCESS_RESPAWN);
-            }
-
-            /*
-             * we have to limit the maximum life time of the worker processes
-             * by 10 days because our millisecond event timer is limited
-             * by 24 days on 32-bit platforms
-             */
-
-            itv.it_interval.tv_sec = 0;
-            itv.it_interval.tv_usec = 0;
-            itv.it_value.tv_sec = 10 * 24 * 60 * 60;
-            itv.it_value.tv_usec = 0;
-
-            if (setitimer(ITIMER_REAL, &itv, NULL) == -1) {
-                ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                              "setitimer() failed");
-            }
-
+        if (ngx_restart) {
+            ngx_restart = 0;
+            ngx_start_worker_processes(cycle, ccf->worker_processes,
+                                       NGX_PROCESS_RESPAWN);
             live = 1;
-
-        } else {
-            ngx_init_temp_number();
-
-            for (i = 0; ngx_modules[i]; i++) {
-                if (ngx_modules[i]->init_process) {
-                    if (ngx_modules[i]->init_process(cycle) == NGX_ERROR) {
-                        /* fatal */
-                        exit(2);
-                    }
-                }
-            }
         }
 
-
-        /* a cycle with the same configuration because a new one is invalid */
-
-        for ( ;; ) {
-
-            /* an event loop */
-
-            for ( ;; ) {
-
-                if (ngx_process == NGX_PROCESS_MASTER) {
-                    if (delay) {
-                        delay *= 2;
-
-                        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                                       "temination cycle: %d", delay);
-
-                        itv.it_interval.tv_sec = 0;
-                        itv.it_interval.tv_usec = 0;
-                        itv.it_value.tv_sec = delay / 1000;
-                        itv.it_value.tv_usec = (delay % 1000 ) * 1000;
-
-                        if (setitimer(ITIMER_REAL, &itv, NULL) == -1) {
-                            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                                          "setitimer() failed");
-                        }
-                    }
-
-                    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                                   "sigsuspend");
-
-                    sigsuspend(&set);
-
-                    ngx_gettimeofday(&tv);
-                    ngx_time_update(tv.tv_sec);
-
-                    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                                   "wake up");
-
-                } else { /* NGX_PROCESS_SINGLE */
-                    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                                   "worker cycle");
-
-                    ngx_process_events(cycle);
-                    live = 0;
-                }
-
-                if (ngx_reap) {
-                    ngx_reap = 0;
-                    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                                   "reap childs");
-
-                    live = 0;
-                    for (i = 0; i < ngx_last_process; i++) {
-
-                        ngx_log_debug5(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
-                                       "child: " PID_T_FMT
-                                       " e:%d t:%d d:%d r:%d",
-                                       ngx_processes[i].pid,
-                                       ngx_processes[i].exiting,
-                                       ngx_processes[i].exited,
-                                       ngx_processes[i].detached,
-                                       ngx_processes[i].respawn);
-
-                        if (ngx_processes[i].exited) {
-
-                            if (ngx_processes[i].respawn
-                                && !ngx_processes[i].exiting
-                                && !ngx_terminate
-                                && !ngx_quit)
-                            {
-                                 if (ngx_spawn_process(cycle,
-                                                       ngx_processes[i].proc,
-                                                       ngx_processes[i].data,
-                                                       ngx_processes[i].name, i)
-                                                                  == NGX_ERROR)
-                                 {
-                                     ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
-                                                   "can not respawn %s",
-                                                   ngx_processes[i].name);
-                                     continue;
-                                 }
-
-                                 live = 1;
-
-                                 continue;
-                            }
-
-                            if (ngx_processes[i].pid == ngx_new_binary) {
-                                ngx_new_binary = 0;
-
-                                /* TODO: if (ngx_noaccept) ngx_configure = 1 */
-                            }
-
-                            if (i != --ngx_last_process) {
-                                ngx_processes[i--] =
-                                               ngx_processes[ngx_last_process];
-                            }
-
-                        } else if (ngx_processes[i].exiting
-                                   || !ngx_processes[i].detached)
-                        {
-                            live = 1;
-                        }
-                    }
-                }
+        if (ngx_reopen) {
+            ngx_reopen = 0;
+            ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "reopening logs");
+            ngx_reopen_files(cycle, ccf->user);
+            ngx_signal_worker_processes(cycle,
+                                        ngx_signal_value(NGX_REOPEN_SIGNAL));
+        }
 
-                if (!live && (ngx_terminate || ngx_quit)) {
-                    ngx_master_exit(cycle, ctx);
-                }
-
-                if (ngx_terminate) {
-                    if (delay == 0) {
-                        delay = 50;
-                    }
-
-                    if (delay > 1000) {
-                        signo = SIGKILL;
-                    } else {
-                        signo = ngx_signal_value(NGX_TERMINATE_SIGNAL);
-                    }
-
-                } else if (ngx_quit) {
-                    signo = ngx_signal_value(NGX_SHUTDOWN_SIGNAL);
-
-                } else if (ngx_timer) {
-                    signo = ngx_signal_value(NGX_SHUTDOWN_SIGNAL);
-
-                } else if (ngx_reconfigure) {
-                    ngx_reconfigure = 0;
-                    ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "reconfiguring");
-
-                    cycle = ngx_init_cycle(cycle);
-                    if (cycle == NULL) {
-                        cycle = (ngx_cycle_t *) ngx_cycle;
-                        continue;
-                    }
-
-                    ngx_cycle = cycle;
-                    signo = ngx_signal_value(NGX_SHUTDOWN_SIGNAL);
-
-                } else if (ngx_reopen) {
-                        if (ngx_process == NGX_PROCESS_MASTER) {
-                            signo = ngx_signal_value(NGX_REOPEN_SIGNAL);
-                            ngx_reopen = 0;
-
-                        } else { /* NGX_PROCESS_SINGLE */
-                            ngx_reopen = 0;
-                        }
-
-                        ngx_log_error(NGX_LOG_INFO, cycle->log, 0,
-                                      "reopening logs");
-                        ngx_reopen_files(cycle, ccf->user);
-
-                } else if (ngx_change_binary) {
-                        ngx_change_binary = 0;
-                        ngx_log_error(NGX_LOG_INFO, cycle->log, 0,
-                                      "changing binary");
-                        ngx_new_binary = ngx_exec_new_binary(cycle, ctx->argv);
+        if (ngx_change_binary) {
+            ngx_change_binary = 0;
+            ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "changing binary");
+            ngx_new_binary = ngx_exec_new_binary(cycle, ctx->argv);
+        }
 
-                    } else if (ngx_noaccept) {
-                        signo = ngx_signal_value(NGX_SHUTDOWN_SIGNAL);
-                    }
-                }
-
-                if (signo) {
-                    for (i = 0; i < ngx_last_process; i++) {
-
-                        if (ngx_processes[i].detached) {
-                            continue;
-                        }
-
-                        ngx_log_debug2(NGX_LOG_DEBUG_CORE, cycle->log, 0,
-                                       "kill (" PID_T_FMT ", %d)" ,
-                                       ngx_processes[i].pid, signo);
-
-                        if (kill(ngx_processes[i].pid, signo) == -1) {
-                            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                                          "kill(%d, %d) failed",
-                                          ngx_processes[i].pid, signo);
-                            continue;
-                        }
-
-                        if (signo != ngx_signal_value(NGX_REOPEN_SIGNAL)) {
-                            ngx_processes[i].exiting = 1;
-                        }
-                    }
-
-                    signo = 0;
-                }
-
-                if (ngx_reopen || ngx_reconfigure || ngx_timer) {
-                    break;
-                }
-            }
-
-            if (ngx_reopen) {
-                ngx_reopen = 0;
-
-            } else if (ngx_timer) {
-                ngx_timer = 0;
-
-            } else if (ngx_noaccept) {
-                ngx_noaccept = 0;
-                ngx_reconfigure = 0;
-
-            } else {
-                cycle = ngx_init_cycle(cycle);
-                if (cycle == NULL) {
-                    cycle = (ngx_cycle_t *) ngx_cycle;
-                    continue;
-                }
-
-                ngx_cycle = cycle;
-                ngx_reconfigure = 0;
-            }
-
-            break;
+        if (ngx_noaccept) {
+            ngx_noaccept = 0;
+            ngx_noaccepting = 1;
+            ngx_signal_worker_processes(cycle,
+                                        ngx_signal_value(NGX_SHUTDOWN_SIGNAL));
         }
     }
 }
 
 
-static void ngx_start_worker_processes(ngx_cycle_y *cycle, ngx_int_t n)
+void ngx_single_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx)
+{
+    ngx_uint_t  i;
+
+    ngx_setproctitle("single worker process");
+
+    ngx_init_temp_number();
+
+    for (i = 0; ngx_modules[i]; i++) {
+        if (ngx_modules[i]->init_process) {
+            if (ngx_modules[i]->init_process(cycle) == NGX_ERROR) {
+                /* fatal */
+                exit(2);
+            }
+        }
+    }
+
+    for ( ;; ) {
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "worker cycle");
+
+        ngx_process_events(cycle);
+
+        if (ngx_terminate || ngx_quit) {
+            ngx_master_exit(cycle, ctx);
+        }
+
+        if (ngx_reconfigure) {
+            ngx_reconfigure = 0;
+            ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "reconfiguring");
+
+            cycle = ngx_init_cycle(cycle);
+            if (cycle == NULL) {
+                cycle = (ngx_cycle_t *) ngx_cycle;
+                continue;
+            }
+
+            ngx_cycle = cycle;
+        }
+
+        if (ngx_reopen) {
+            ngx_reopen = 0;
+            ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "reopening logs");
+            ngx_reopen_files(cycle, (ngx_uid_t) -1);
+        }
+    }
+}
+
+
+static void ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n,
+                                       ngx_int_t type)
 {
     struct itimerval  itv;
 
@@ -574,7 +303,7 @@ static void ngx_start_worker_processes(n
 
     while (n--) {
         ngx_spawn_process(cycle, ngx_worker_process_cycle, NULL,
-                          "worker process", NGX_PROCESS_RESPAWN);
+                          "worker process", type);
     }
 
     /*
@@ -594,6 +323,44 @@ static void ngx_start_worker_processes(n
     }
 }
 
+static void ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo)
+{
+    ngx_uint_t  i;
+
+    for (i = 0; i < ngx_last_process; i++) {
+
+        if (ngx_processes[i].detached) {
+            continue;
+        }
+
+        if (ngx_processes[i].just_respawn) {
+            ngx_processes[i].just_respawn = 0;
+            continue;
+        }
+
+        if (ngx_processes[i].exiting
+            && signo == ngx_signal_value(NGX_SHUTDOWN_SIGNAL))
+        {
+            continue;
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_CORE, cycle->log, 0,
+                       "kill (" PID_T_FMT ", %d)" ,
+                       ngx_processes[i].pid, signo);
+
+        if (kill(ngx_processes[i].pid, signo) == -1) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          "kill(%d, %d) failed",
+                          ngx_processes[i].pid, signo);
+            continue;
+        }
+
+        if (signo != ngx_signal_value(NGX_REOPEN_SIGNAL)) {
+            ngx_processes[i].exiting = 1;
+        }
+    }
+}
+
 
 static void ngx_master_exit(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx)
 {