Merge branch 'bug62216' into PHP-5.3

* bug62216: Fixed bug #62216
13 years ago · 4358e90a8f
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -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)
--- 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 () {