Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'bug62216' into PHP-5.3

* bug62216:
  Fixed bug #62216
  • Loading branch information...
commit 4358e90a8f4fc7b3eaf6f42315b5d71b953391c6 2 parents 151b16c + bb02fd5
Jerome Loyet authored
Showing with 2 additions and 1 deletion.
  1. +1 −0  NEWS
  2. +1 −1  sapi/fpm/init.d.php-fpm.in
View
1  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)
View
2  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 () {
Please sign in to comment.
Something went wrong with that request. Please try again.