diff options
| author | David CARLIER <devnexen@gmail.com> | 2021-02-15 21:00:38 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2021-03-21 18:36:12 +0000 |
| commit | d54fa6f7783a7ae680bd1367ede62d46134d6b20 (patch) | |
| tree | bd18db9ee198c7e79416c8ac749036bdc70fa71c /sapi | |
| parent | 661731d4f1c4ed42cd9afb26aaf8bb3d63d1aafb (diff) | |
| download | php-git-d54fa6f7783a7ae680bd1367ede62d46134d6b20.tar.gz | |
fpm master/child process rename, enable on mac os.
Note the change appears mainly in command like ps.
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/fpm/fpm/fpm_env.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sapi/fpm/fpm/fpm_env.c b/sapi/fpm/fpm/fpm_env.c index e9a59d2daa..a9227f8c7d 100644 --- a/sapi/fpm/fpm/fpm_env.c +++ b/sapi/fpm/fpm/fpm_env.c @@ -13,7 +13,7 @@ #include "fpm.h" #ifndef HAVE_SETPROCTITLE -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) static char **fpm_env_argv = NULL; static size_t fpm_env_argv_len = 0; #endif @@ -122,8 +122,7 @@ void fpm_env_setproctitle(char *title) /* {{{ */ setproctitle_fast("%s", title); #elif defined(HAVE_SETPROCTITLE) setproctitle("%s", title); -#else -#ifdef __linux__ +#elif defined(__linux__) || defined(__APPLE__) size_t prefixlen = strlen(SETPROCTITLE_PREFIX); if (fpm_env_argv != NULL && fpm_env_argv_len > prefixlen + 3) { memset(fpm_env_argv[0], 0, fpm_env_argv_len); @@ -132,7 +131,6 @@ void fpm_env_setproctitle(char *title) /* {{{ */ fpm_env_argv[1] = NULL; } #endif -#endif } /* }}} */ @@ -208,7 +206,7 @@ int fpm_env_init_main() /* {{{ */ } } #ifndef HAVE_SETPROCTITLE -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) int i; char *first = NULL; char *last = NULL; |