Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64764: Add status option to fpm init.d script

1 files changed, 15 insertions, 1 deletions

diff --git a/sapi/fpm/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in
index 49cce79ae9..020b942f14 100644
--- a/sapi/fpm/init.d.php-fpm.in
+++ b/sapi/fpm/init.d.php-fpm.in
@@ -91,6 +91,20 @@ case "$1" in
 		fi
 	;;
 
+	status)
+		if [ ! -r $php_fpm_PID ] ; then
+			echo "php-fpm is stopped"
+			exit 0
+		fi
+
+		PID=`cat $php_fpm_PID`
+		if ps -p $PID | grep -q $PID; then
+			echo "php-fpm (pid $PID) is running..."
+		else
+			echo "php-fpm dead but pid file exists"
+		fi
+	;;
+
 	force-quit)
 		echo -n "Terminating php-fpm "
 
@@ -131,7 +145,7 @@ case "$1" in
 	;;
 
 	*)
-		echo "Usage: $0 {start|stop|force-quit|restart|reload}"
+		echo "Usage: $0 {start|stop|force-quit|restart|reload|status}"
 		exit 1
 	;;