Merge branches 'logs' and 'timeout' of https://github.com/jcpunk/noVNC

diff --cc utils/launch.sh
index 109de88dac476c7983bcd7be4b8834efbcabd531,c07c3698a2916e743b39ee8c1e7d72406e409263..0900f7e3a0294f536251a63fbf1d431793ee7bfa
--- 1/utils/launch.sh
--- 2/utils/launch.sh
+++ b/utils/launch.sh
@@@ -27,8 -27,12 +27,13 @@@ usage() 
      echo "                                    "
      echo "    --record FILE         Record traffic to FILE.session.js"
      echo "                                    "
 -
 +    echo "    --syslog SERVER       Can be local socket such as /dev/log, or a UDP host:port pair."
 +    echo "                                    "
+     echo "    --heartbeat SEC       send a ping to the client every SEC seconds"
+     echo "    --timeout SEC         after SEC seconds exit when not connected"
+     echo "    --idle-timeout SEC    server exits after SEC seconds if there are no"
+     echo "                          active connections"
+     echo "                                    "
      exit 2
  }
  
@@@ -43,7 -47,9 +48,10 @@@ WEB="
  proxy_pid=""
  SSLONLY=""
  RECORD_ARG=""
 +SYSLOG_ARG=""
+ HEARTBEAT_ARG=""
+ IDLETIMEOUT_ARG=""
+ TIMEOUT_ARG=""
  
  die() {
      echo "$*"
@@@ -73,7 -79,9 +81,10 @@@ while [ "$*" ]; d
      --web)     WEB="${OPTARG}"; shift            ;;
      --ssl-only) SSLONLY="--ssl-only"             ;;
      --record) RECORD_ARG="--record ${OPTARG}"; shift ;;
 +    --syslog) SYSLOG_ARG="--syslog ${OPTARG}"; shift ;;
+     --heartbeat) HEARTBEAT_ARG="--heartbeat ${OPTARG}"; shift ;;
+     --idle-timeout) IDLETIMEOUT_ARG="--idle-timeout ${OPTARG}"; shift ;;
+     --timeout) TIMEOUT_ARG="--timeout ${OPTARG}"; shift ;;
      -h|--help) usage                              ;;
      -*) usage "Unknown chrooter option: ${param}" ;;
      *) break                                      ;;
@@@ -166,7 -174,7 +177,7 @@@ f
  
  echo "Starting webserver and WebSockets proxy on port ${PORT}"
  #${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
- ${WEBSOCKIFY} ${SYSLOG_ARG} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${RECORD_ARG} &
 -${WEBSOCKIFY} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${HEARTBEAT_ARG} ${IDLETIMEOUT_ARG} ${RECORD_ARG} ${TIMEOUT_ARG} &
++${WEBSOCKIFY} ${SYSLOG_ARG} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${KEY:+--key ${KEY}} ${PORT} ${VNC_DEST} ${HEARTBEAT_ARG} ${IDLETIMEOUT_ARG} ${RECORD_ARG} ${TIMEOUT_ARG} &
  proxy_pid="$!"
  sleep 1
  if ! ps -p ${proxy_pid} >/dev/null; then