dovecot-2.2: master: Fix to previous pre-forking change.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/108a8158c1a9
changeset: 16706:108a8158c1a9
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Sep 02 17:44:39 2013 +0300
description:
master: Fix to previous pre-forking change.

diffstat:

 src/master/service-monitor.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (14 lines):

diff -r a3f0aca52d6f -r 108a8158c1a9 src/master/service-monitor.c
--- a/src/master/service-monitor.c	Mon Sep 02 17:37:47 2013 +0300
+++ b/src/master/service-monitor.c	Mon Sep 02 17:44:39 2013 +0300
@@ -360,7 +360,9 @@
 			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);
 	}