From: Jerome Loyet <fat@php.net>
Date: Sat, 26 May 2012 16:44:35 +0000 (+0200)
Subject: - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an... 
X-Git-Tag: php-5.4.4RC2~6^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0298b92b69e5637e8d151790ad6369f7980a406a;p=php

- Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
---

diff --git a/sapi/fpm/fpm/fpm.c b/sapi/fpm/fpm/fpm.c
index 176dbaf32e..dab415d123 100644
--- a/sapi/fpm/fpm/fpm.c
+++ b/sapi/fpm/fpm/fpm.c
@@ -39,6 +39,7 @@ struct fpm_globals_s fpm_globals = {
 	.test_successful = 0,
 	.heartbeat = 0,
 	.run_as_root = 0,
+	.send_config_signal = 0,
 };
 
 int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root) /* {{{ */
diff --git a/sapi/fpm/fpm/fpm.h b/sapi/fpm/fpm/fpm.h
index b0bed0a074..7a2903d07d 100644
--- a/sapi/fpm/fpm/fpm.h
+++ b/sapi/fpm/fpm/fpm.h
@@ -55,6 +55,7 @@ struct fpm_globals_s {
 	int test_successful;
 	int heartbeat;
 	int run_as_root;
+	int send_config_signal;
 };
 
 extern struct fpm_globals_s fpm_globals;
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 08477da8d1..9c314f51c6 100644
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1804,14 +1804,14 @@ consult the installation file that came with this distribution, or visit \n\
 
 	if (0 > fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), fpm_prefix, fpm_pid, test_conf, php_allow_to_run_as_root)) {
 
-		if (fpm_global_config.daemonize) {
+		if (fpm_globals.send_config_signal) {
 			zlog(ZLOG_DEBUG, "Sending SIGUSR2 (error) to parent %d", getppid());
 			kill(getppid(), SIGUSR2);
 		}
 		return FPM_EXIT_CONFIG;
 	}
 
-	if (fpm_global_config.daemonize) {
+	if (fpm_globals.send_config_signal) {
 		zlog(ZLOG_DEBUG, "Sending SIGUSR1 (OK) to parent %d", getppid());
 		kill(getppid(), SIGUSR1);
 	}
diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c
index 0f4d383c24..5c5e37c3a4 100644
--- a/sapi/fpm/fpm/fpm_unix.c
+++ b/sapi/fpm/fpm/fpm_unix.c
@@ -305,6 +305,7 @@ int fpm_unix_init_main() /* {{{ */
 				/* restore USR1 and USR2 sigaction */
 				sigaction(SIGUSR1, &oldact_usr1, NULL);
 				sigaction(SIGUSR2, &oldact_usr2, NULL);
+				fpm_globals.send_config_signal = 1;
 				break;
 
 			default : /* parent */