[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: Fixed bug #62216: NEWS sapi/fpm/init.d.php-fpm.in
From:       Jérôme Loyet <fat () php ! net>
Date:       2012-09-28 9:18:08
Message-ID: php-mail-7a26acfde96a01593604cf6b64f88089282230812 () git ! php ! net
[Download RAW message or body]

Commit:    bb02fd5772070f00a7d26f2a64f34b55f6eea326
Author:    Jerome Loyet <fat@php.net>         Fri, 28 Sep 2012 11:18:08 +0200
Parents:   151b16cf7ff6ddbf2e11932949aaa2ecb0f22724
Branches:  PHP-5.3 PHP-5.4 master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=bb02fd5772070f00a7d26f2a64f34b55f6eea326

Log:
Fixed bug #62216

Add PID to php-fpm init.d script

Bugs:
https://bugs.php.net/62216

Changed paths:
  M  NEWS
  M  sapi/fpm/init.d.php-fpm.in


Diff:
diff --git a/NEWS b/NEWS
index 14e81ca..83abf01 100644
--- a/NEWS
+++ b/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)
diff --git a/sapi/fpm/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in
index 3edd64f..49cce79 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 () {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]