- Fixed bug #62954 (startup problems fpm / php-fpm)

- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)

diff --git a/NEWS b/NEWS
index 191264b6140168883f536207250497de191cc57b..354353ff724e6058bc7b7e4feb11121f58e31caf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,10 @@ PHP                                                                        NEWS
   . Fixed bug #60909 (custom error handler throwing Exception + fatal error
     = no shutdown function). (Dmitry)
 
+- FPM:
+  . Fixed bug #62954 (startup problems fpm / php-fpm). (fat)
+  . Fixed bug #62886 (PHP-FPM may segfault/hang on startup). (fat)
+
 - Intl:
   . Fix bug #62915 (defective cloning in several intl classes). (Gustavo)
 

diff --git a/sapi/fpm/fpm/fpm.c b/sapi/fpm/fpm/fpm.c
index dab415d123156985d3eb38506992d4e7853f5375..2f42175d894f4923afaaa9e455a4c40a7e125ef0 100644 (file)
--- a/sapi/fpm/fpm/fpm.c
+++ b/sapi/fpm/fpm/fpm.c
@@ -39,7 +39,7 @@ struct fpm_globals_s fpm_globals = {
        .test_successful = 0,
        .heartbeat = 0,
        .run_as_root = 0,
-       .send_config_signal = 0,
+       .send_config_pipe = {0, 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 7a2903d07d3e602dbe8e3cd5d1b41a1733e8c640..c576876386fafa4cf9ba26fae8208680a845817c 100644 (file)
--- a/sapi/fpm/fpm/fpm.h
+++ b/sapi/fpm/fpm/fpm.h
@@ -55,7 +55,7 @@ struct fpm_globals_s {
        int test_successful;
        int heartbeat;
        int run_as_root;
-       int send_config_signal;
+       int send_config_pipe[2];
 };
 
 extern struct fpm_globals_s fpm_globals;

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index b058d7a9f3bd87c2c323f14c628c218a547d6f66..70e917a07fe42af346d23422eee0cf30fac20783 100644 (file)
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -1804,16 +1804,20 @@ 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_globals.send_config_signal) {
-                       zlog(ZLOG_DEBUG, "Sending SIGUSR2 (error) to parent %d", getppid());
-                       kill(getppid(), SIGUSR2);
+               if (fpm_globals.send_config_pipe[1]) {
+                       int writeval = 0;
+                       zlog(ZLOG_DEBUG, "Sending \"0\" (error) to parent via fd=%d", fpm_globals.send_config_pipe[1]);
+                       write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));
+                       close(fpm_globals.send_config_pipe[1]);
                }
                return FPM_EXIT_CONFIG;
        }
 
-       if (fpm_globals.send_config_signal) {
-               zlog(ZLOG_DEBUG, "Sending SIGUSR1 (OK) to parent %d", getppid());
-               kill(getppid(), SIGUSR1);
+       if (fpm_globals.send_config_pipe[1]) {
+               int writeval = 1;
+               zlog(ZLOG_DEBUG, "Sending \"1\" (OK) to parent via fd=%d", fpm_globals.send_config_pipe[1]);
+               write(fpm_globals.send_config_pipe[1], &writeval, sizeof(writeval));
+               close(fpm_globals.send_config_pipe[1]);
        }
        fpm_is_running = 1;
 

diff --git a/sapi/fpm/fpm/fpm_signals.c b/sapi/fpm/fpm/fpm_signals.c
index 656269f1a3610cf162ba8a5ac213965d446ff320..8993a860ae87d4ac375e42e955ba4ed8925a0100 100644 (file)
--- a/sapi/fpm/fpm/fpm_signals.c
+++ b/sapi/fpm/fpm/fpm_signals.c
@@ -249,15 +249,3 @@ int fpm_signals_get_fd() /* {{{ */
 }
 /* }}} */
 
-void fpm_signals_sighandler_exit_ok(pid_t pid) /* {{{ */
-{
-       exit(FPM_EXIT_OK);
-}
-/* }}} */
-
-void fpm_signals_sighandler_exit_config(pid_t pid) /* {{{ */
-{
-       exit(FPM_EXIT_CONFIG);
-}
-/* }}} */
-

diff --git a/sapi/fpm/fpm/fpm_signals.h b/sapi/fpm/fpm/fpm_signals.h
index 13484cbac281ffe9fb08701799735cc60db50478..eb80faecfdb54bb0fa999d31ade039d3d3c659a7 100644 (file)
--- a/sapi/fpm/fpm/fpm_signals.h
+++ b/sapi/fpm/fpm/fpm_signals.h
@@ -11,9 +11,6 @@ int fpm_signals_init_main();
 int fpm_signals_init_child();
 int fpm_signals_get_fd();
 
-void fpm_signals_sighandler_exit_ok(pid_t pid);
-void fpm_signals_sighandler_exit_config(pid_t pid);
-
 extern const char *fpm_signal_names[NSIG + 1];
 
 #endif

diff --git a/sapi/fpm/fpm/fpm_unix.c b/sapi/fpm/fpm/fpm_unix.c
index 5c5e37c3a4f466e53707ccebbf4974464f989d19..1a7594495a01ecc7fac0f72c75c3330f485784a7 100644 (file)
--- a/sapi/fpm/fpm/fpm_unix.c
+++ b/sapi/fpm/fpm/fpm_unix.c
@@ -262,36 +262,19 @@ int fpm_unix_init_main() /* {{{ */
                 * The parent process has then to wait for the master
                 * process to initialize to return a consistent exit
                 * value. For this pupose, the master process will
-                * send USR1 if everything went well and USR2
-                * otherwise.
+                * send \"1\" into the pipe if everything went well 
+                * and \"0\" otherwise.
                 */
 
-               struct sigaction act;
-               struct sigaction oldact_usr1;
-               struct sigaction oldact_usr2;
-               struct timeval tv;
 
-               /*
-                * set sigaction for USR1 before fork
-                * save old sigaction to restore it after
-                * fork in the child process (the master process)
-                */
-               memset(&act, 0, sizeof(act));
-               memset(&act, 0, sizeof(oldact_usr1));
-               act.sa_handler = fpm_signals_sighandler_exit_ok;
-               sigfillset(&act.sa_mask);
-               sigaction(SIGUSR1, &act, &oldact_usr1);
+               struct timeval tv;
+               fd_set rfds;
+               int ret;
 
-               /*
-                * set sigaction for USR2 before fork
-                * save old sigaction to restore it after
-                * fork in the child process (the master process)
-                */
-               memset(&act, 0, sizeof(act));
-               memset(&act, 0, sizeof(oldact_usr2));
-               act.sa_handler = fpm_signals_sighandler_exit_config;
-               sigfillset(&act.sa_mask);
-               sigaction(SIGUSR2, &act, &oldact_usr2);
+               if (pipe(fpm_globals.send_config_pipe) == -1) {
+                       zlog(ZLOG_SYSERROR, "failed to create pipe");
+                       return -1;
+               }
 
                /* then fork */
                pid_t pid = fork();
@@ -302,24 +285,54 @@ int fpm_unix_init_main() /* {{{ */
                                return -1;
 
                        case 0 : /* children */
-                               /* restore USR1 and USR2 sigaction */
-                               sigaction(SIGUSR1, &oldact_usr1, NULL);
-                               sigaction(SIGUSR2, &oldact_usr2, NULL);
-                               fpm_globals.send_config_signal = 1;
+                               close(fpm_globals.send_config_pipe[0]); /* close the read side of the pipe */
                                break;
 
                        default : /* parent */
-                               fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT);
+                               close(fpm_globals.send_config_pipe[1]); /* close the write side of the pipe */
 
                                /*
                                 * wait for 10s before exiting with error
-                                * the child is supposed to send USR1 or USR2 to tell the parent
+                                * the child is supposed to send 1 or 0 into the pipe to tell the parent
                                 * how it goes for it
                                 */
+                               FD_ZERO(&rfds);
+                               FD_SET(fpm_globals.send_config_pipe[0], &rfds);
+
                                tv.tv_sec = 10;
                                tv.tv_usec = 0;
-                               zlog(ZLOG_DEBUG, "The calling process is waiting for the master process to ping");
-                               select(0, NULL, NULL, NULL, &tv);
+
+                               zlog(ZLOG_DEBUG, "The calling process is waiting for the master process to ping via fd=%d", fpm_globals.send_config_pipe[0]);
+                               ret = select(fpm_globals.send_config_pipe[0] + 1, &rfds, NULL, NULL, &tv);
+                               if (ret == -1) {
+                                       zlog(ZLOG_SYSERROR, "failed to select");
+                                       exit(FPM_EXIT_SOFTWARE);
+                               }
+                               if (ret) { /* data available */
+                                       int readval;
+                                       ret = read(fpm_globals.send_config_pipe[0], &readval, sizeof(readval));
+                                       if (ret == -1) {
+                                               zlog(ZLOG_SYSERROR, "failed to read from pipe");
+                                               exit(FPM_EXIT_SOFTWARE);
+                                       }
+
+                                       if (ret == 0) {
+                                               zlog(ZLOG_ERROR, "no data have been read from pipe");
+                                               exit(FPM_EXIT_SOFTWARE);
+                                       } else {
+                                               if (readval == 1) {
+                                                       zlog(ZLOG_DEBUG, "I received a valid acknoledge from the master process, I can exit without error");
+                                                       fpm_cleanups_run(FPM_CLEANUP_PARENT_EXIT);
+                                                       exit(FPM_EXIT_OK);
+                                               } else {
+                                                       zlog(ZLOG_DEBUG, "The master process returned an error !");
+                                                       exit(FPM_EXIT_SOFTWARE);
+                                               }
+                                       }
+                               } else { /* no date sent ! */
+                                       zlog(ZLOG_ERROR, "the master process didn't send back its status (via the pipe to the calling process)");
+                                 exit(FPM_EXIT_SOFTWARE);
+                               }
                                exit(FPM_EXIT_SOFTWARE);
                }
        }