diff options
| author | Jerome Loyet <fat@php.net> | 2012-09-28 11:20:47 +0200 |
|---|---|---|
| committer | Jerome Loyet <fat@php.net> | 2012-09-28 11:20:47 +0200 |
| commit | 4358e90a8f4fc7b3eaf6f42315b5d71b953391c6 (patch) | |
| tree | da77bbaea8b353524975120ebf99643eb939805d | |
| parent | 151b16cf7ff6ddbf2e11932949aaa2ecb0f22724 (diff) | |
| parent | bb02fd5772070f00a7d26f2a64f34b55f6eea326 (diff) | |
| download | php-git-4358e90a8f4fc7b3eaf6f42315b5d71b953391c6.tar.gz | |
Merge branch 'bug62216' into PHP-5.3
* bug62216:
Fixed bug #62216
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sapi/fpm/init.d.php-fpm.in | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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 () { |