php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-15 20:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3'

Browse Source
This commit is contained in:
Jakub Zelenka
2018-08-05 20:37:46 +01:00
parent f98a08f9c1 9b462f332e
commit 68c49e76d3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sapi/fpm/config.m4
View File

@@ -6,7 +6,7 @@ PHP_ARG_ENABLE(fpm,,
dnl configure checks {{{
AC_DEFUN([AC_FPM_STDLIBS],
[
AC_CHECK_FUNCS(setenv clearenv setproctitle)
AC_CHECK_FUNCS(setenv clearenv setproctitle setproctitle_fast)
AC_SEARCH_LIBS(socket, socket)
AC_SEARCH_LIBS(inet_addr, nsl)

4
sapi/fpm/fpm/fpm_env.c
View File

@@ -119,7 +119,9 @@ static char * nvmatch(char *s1, char *s2) /* {{{ */
void fpm_env_setproctitle(char *title) /* {{{ */
{
#ifdef HAVE_SETPROCTITLE
#if defined(HAVE_SETPROCTITLE_FAST)
setproctitle_fast("%s", title);
#elif defined(HAVE_SETPROCTITLE)
setproctitle("%s", title);
#else
#ifdef __linux__