Skip to content

Commit 16cda03

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
2 parents 4dc0662 + 006355c commit 16cda03

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ PHP NEWS
1010
- Apache2Handler:
1111
. Fixed bug #77648 (BOM in sapi/apache2handler/php_functions.c). (cmb)
1212

13+
- FPM:
14+
. Fixed bug #77677 (FPM fails to build on AIX due to missing WCOREDUMP).
15+
(Kevin Adler)
16+
1317
- MySQLi:
1418
. Fixed bug #77597 (mysqli_fetch_field hangs scripts). (Nikita)
1519

sapi/fpm/fpm/fpm_children.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,11 @@ void fpm_children_bury() /* {{{ */
207207

208208
} else if (WIFSIGNALED(status)) {
209209
const char *signame = fpm_signal_names[WTERMSIG(status)];
210+
#ifdef WCOREDUMP
210211
const char *have_core = WCOREDUMP(status) ? " - core dumped" : "";
212+
#else
213+
const char* have_core = "";
214+
#endif
211215

212216
if (signame == NULL) {
213217
signame = "";

sapi/litespeed/lsapilib.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,9 +2819,14 @@ static void lsapi_sigchild( int signal )
28192819
if ( WIFSIGNALED( status ))
28202820
{
28212821
int sig_num = WTERMSIG( status );
2822-
int dump = WCOREDUMP( status );
2822+
2823+
#ifdef WCOREDUMP
2824+
const char * dump = WCOREDUMP( status ) ? "yes" : "no";
2825+
#else
2826+
const char * dump = "unknown";
2827+
#endif
28232828
lsapi_log("Child process with pid: %d was killed by signal: "
2824-
"%d, core dump: %d\n", pid, sig_num, dump );
2829+
"%d, core dumped: %s\n", pid, sig_num, dump );
28252830
}
28262831
if ( pid == s_pid_dump_debug_info )
28272832
{

0 commit comments

Comments
 (0)