Merge branch 'PHP-5.3' into PHP-5.4

Jerome Loyet · Jerome Loyet · commit b530f53c67da · 2012-09-28T11:21:12.000+02:00
* PHP-5.3:
  Fixed bug #62216
diff --git 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 () {
