summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerome Loyet <fat@php.net>2012-09-28 11:18:08 +0200
committerJerome Loyet <fat@php.net>2012-09-28 11:18:08 +0200
commitbb02fd5772070f00a7d26f2a64f34b55f6eea326 (patch)
treeda77bbaea8b353524975120ebf99643eb939805d
parent151b16cf7ff6ddbf2e11932949aaa2ecb0f22724 (diff)
downloadphp-git-bb02fd5772070f00a7d26f2a64f34b55f6eea326.tar.gz
Fixed bug #62216
Add PID to php-fpm init.d script
-rw-r--r--NEWS1
-rw-r--r--sapi/fpm/init.d.php-fpm.in2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 14e81cac21..83abf0177f 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ PHP NEWS
. Fixed bug #63085 (Systemd integration and daemonize). (remi, fat)
. Fixed bug #62947 (Unneccesary warnings on FPM). (fat)
. Fixed bug #62887 (Only /status?plain&full gives "last request cpu"). (fat)
+ . Fixed bug #62216 (Add PID to php-fpm init.d script). (fat)
- Intl:
. Fix bug #62915 (defective cloning in several intl classes). (Gustavo)
diff --git a/sapi/fpm/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in
index 3edd64fe19..49cce79ae9 100644
--- a/sapi/fpm/init.d.php-fpm.in
+++ b/sapi/fpm/init.d.php-fpm.in
@@ -18,7 +18,7 @@ php_fpm_CONF=@sysconfdir@/php-fpm.conf
php_fpm_PID=@localstatedir@/run/php-fpm.pid
-php_opts="--fpm-config $php_fpm_CONF"
+php_opts="--fpm-config $php_fpm_CONF --pid $php_fpm_PID"
wait_for_pid () {