com php-src: fpm process name, FreeBSD 12.x using new setproctitle_fast: sapi/fpm/config.m4 sapi/fpm/fpm/ fpm_env.c
| From: | Jakub Zelenka | Date: | Sun, 05 Aug 2018 19:36:41 +0000 |
| Subject: | com php-src: fpm process name, FreeBSD 12.x using new setproctitle_fast: sapi/fpm/config.m4 sapi/fpm/fpm/ fpm_env.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102827@lists.php.net to get a copy of this message | ||
Commit: 9b462f332eaa0588ced82851efe88c04ca0fe2a8
Author: David Carlier <devnexen@gmail.com> Mon, 30 Jul 2018 09:43:00 +0100
Committer: Jakub Zelenka <bukka@php.net> Sun, 5 Aug 2018 20:36:41 +0100
Parents: 86d472e24917c2588a06af378f90f10c59ba0a88
Branches: PHP-7.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9b462f332eaa0588ced82851efe88c04ca0fe2a8
Log:
fpm process name, FreeBSD 12.x using new setproctitle_fast
Changed paths:
M sapi/fpm/config.m4
M sapi/fpm/fpm/fpm_env.c
Diff:
diff --git a/sapi/fpm/config..m4 b/sapi/fpm/config.m4
index 647b646..44d842b 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -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)
diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c
index b805e97..99c7cc1 100644
--- a/sapi/fpm/fpm/fpm_env.c
+++ b/sapi/fpm/fpm/fpm_env.c
@@ -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__