From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 1 Dec 2013 13:17:54 +0000 (+0000)
Subject: ws
X-Git-Tag: php-5.6.0alpha1~110^2~30^2~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6efce9f137a94a76cbf271aefcf530584e4e10d;p=php

ws
---

diff --git a/phpdbg.init.d b/phpdbg.init.d
index 11750446f1..cc18957b4c 100755
--- a/phpdbg.init.d
+++ b/phpdbg.init.d
@@ -50,73 +50,73 @@ insanity()
 
 start()
 {
-		insanity
+	insanity
 
-		if [ $? -eq 1 ]; then
-			return $RETVAL
-		fi
+	if [ $? -eq 1 ]; then
+		return $RETVAL
+	fi
 
-        echo -n $"Starting: phpdbg ${OPTIONS} on ${STDIN}/${STDOUT} "
-        nohup ${PHPDBG} -l${STDIN}/${STDOUT} ${OPTIONS} 2>>${LOGFILE} 1>/dev/null </dev/null &
-        PID=$!
-        RETVAL=$?
-        if [ $RETVAL -eq 0 ]; then
-                echo $PID > $PIDFILE
-                echo_success
-        else
-                echo_failure
-        fi
-        echo
-        [ $RETVAL = 0 ] && touch ${LOCKFILE}
-       return $RETVAL
+	echo -n $"Starting: phpdbg ${OPTIONS} on ${STDIN}/${STDOUT} "
+	nohup ${PHPDBG} -l${STDIN}/${STDOUT} ${OPTIONS} 2>>${LOGFILE} 1>/dev/null </dev/null &
+	PID=$!
+	RETVAL=$?
+	if [ $RETVAL -eq 0 ]; then
+		echo $PID > $PIDFILE
+		echo_success
+	else
+		echo_failure
+	fi
+	echo
+	[ $RETVAL = 0 ] && touch ${LOCKFILE}
+	return $RETVAL
 }
 
 stop()
 {
-		insanity
+	insanity
 
-		if [ $? -eq 1 ]; then
-			return $RETVAL
+	if [ $? -eq 1 ]; then
+		return $RETVAL
+	fi
+
+	if [ -f ${LOCKFILE} ] && [ -f ${PIDFILE} ]
+	then
+		echo -n $"Stopping: phpdbg ${OPTIONS} on ${STDIN}/${STDOUT} "
+		kill -s TERM $(cat $PIDFILE)
+		RETVAL=$?
+		if [ $RETVAL -eq 0 ]; then
+			echo_success
+		else
+			echo_failure
 		fi
-		
-        if [ -f ${LOCKFILE} ] && [ -f ${PIDFILE} ]
-        then
-                echo -n $"Stopping: phpdbg ${OPTIONS} on ${STDIN}/${STDOUT} "
-                kill -s TERM $(cat $PIDFILE)
-                RETVAL=$?
-                if [ $RETVAL -eq 0 ]; then
-                        echo_success
-                else
-                        echo_failure
-                fi
-                echo
-                [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
-        else
-                echo -n $"Error: phpdbg not running"
-                echo_failure
-                echo
-                [ $RETVAL = 1 ]
-        fi
-        return $RETVAL
+		echo
+		[ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
+	else
+		echo -n $"Error: phpdbg not running"
+		echo_failure
+		echo
+		[ $RETVAL = 1 ]
+	fi
+	return $RETVAL
 }
 ##################################################################
 case "$1" in
-        start)
-        start
-        ;;
-        stop)
-        stop
-        ;;
-        status)
-        status $PHPDBG
-        ;;
-        restart)
-        $0 stop
-        $0 start
-        ;;
-        *)
-        echo "usage: $0 start|stop|restart|status"
-        ;;
+	start)
+	start
+	;;
+	stop)
+	stop
+	;;
+	status)
+	status $PHPDBG
+	;;
+	restart)
+	$0 stop
+	$0 start
+	;;
+	*)
+	echo "usage: $0 start|stop|restart|status"
+	;;
 esac
 ###################################################################
 exit $RETVAL
diff --git a/tutorials/java/dist/phpdbg-ui.jar b/tutorials/java/dist/phpdbg-ui.jar
index 7850d33756..bf98166e2e 100644
Binary files a/tutorials/java/dist/phpdbg-ui.jar and b/tutorials/java/dist/phpdbg-ui.jar differ