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