diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-01 14:51:37 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-01 14:51:55 +0100 |
| commit | 16cda039b5db1847b01ab33be2fc8966ab50aaf5 (patch) | |
| tree | acc8fe64e44a32a09822af724b8de88ec0a302da | |
| parent | 4dc0662eca4d8bc79cb6f6fa0c62e1600efef78a (diff) | |
| parent | 006355c9fa0d1cd8aef86a97c162053e7d2d896e (diff) | |
| download | php-git-16cda039b5db1847b01ab33be2fc8966ab50aaf5.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_children.c | 4 | ||||
| -rw-r--r-- | sapi/litespeed/lsapilib.c | 9 |
3 files changed, 15 insertions, 2 deletions
@@ -10,6 +10,10 @@ PHP NEWS - Apache2Handler: . Fixed bug #77648 (BOM in sapi/apache2handler/php_functions.c). (cmb) +- FPM: + . Fixed bug #77677 (FPM fails to build on AIX due to missing WCOREDUMP). + (Kevin Adler) + - MySQLi: . Fixed bug #77597 (mysqli_fetch_field hangs scripts). (Nikita) diff --git a/sapi/fpm/fpm/fpm_children.c b/sapi/fpm/fpm/fpm_children.c index df848acf86..82c749fc81 100644 --- a/sapi/fpm/fpm/fpm_children.c +++ b/sapi/fpm/fpm/fpm_children.c @@ -207,7 +207,11 @@ void fpm_children_bury() /* {{{ */ } else if (WIFSIGNALED(status)) { const char *signame = fpm_signal_names[WTERMSIG(status)]; +#ifdef WCOREDUMP const char *have_core = WCOREDUMP(status) ? " - core dumped" : ""; +#else + const char* have_core = ""; +#endif if (signame == NULL) { signame = ""; diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index c72c0e3aa2..0e4410fbc7 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -2819,9 +2819,14 @@ static void lsapi_sigchild( int signal ) if ( WIFSIGNALED( status )) { int sig_num = WTERMSIG( status ); - int dump = WCOREDUMP( status ); + +#ifdef WCOREDUMP + const char * dump = WCOREDUMP( status ) ? "yes" : "no"; +#else + const char * dump = "unknown"; +#endif lsapi_log("Child process with pid: %d was killed by signal: " - "%d, core dump: %d\n", pid, sig_num, dump ); + "%d, core dumped: %s\n", pid, sig_num, dump ); } if ( pid == s_pid_dump_debug_info ) { |