]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
master: Fix to previous pre-forking change.
authorTimo Sirainen <tss@iki.fi>
Mon, 2 Sep 2013 14:44:39 +0000 (17:44 +0300)
committerTimo Sirainen <tss@iki.fi>
Mon, 2 Sep 2013 14:44:39 +0000 (17:44 +0300)
src/master/service-monitor.c

index 43a84caf05152ce4f21611c747c8712aee36881f..2ccf4726b188b6aa9e6d973bb2a894efca797944 100644 (file)
@@ -360,7 +360,9 @@ static void service_monitor_start_extra_avail(struct service *service)
                        return;
        }
        if (service->to_prefork == NULL) {
-               service->prefork_counter = service->list->fork_counter;
+               /* ioloop handles timeouts before fds (= SIGCHLD callback),
+                  so let the first timeout handler call simply update the fork
+                  counter and the second one check if we're busy or not. */
                service->to_prefork =
                        timeout_add_short(0, service_monitor_prefork_timeout, service);
        }