Merge branch 'PHP-5.4' into PHP-5.5

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

NEWS

@@ -11,6 +11,9 @@ PHP                                                                        NEWS
   . Fixed bug #64166 (quoted-printable-encode stream filter incorrectly
     discarding whitespace). (Michael M Slusarz)
 
+- FPM:
+  . Implemented FR #64764 (add support for FPM init.d script). (Lior Kaplan)
+
 - PDO:
   . Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to 
     the same db server). (Laruence)

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
 	;;