@@ -31,6 +31,11 @@ public enum READYSTATE {
 	 */
 	public static final int DEFAULT_PORT = 80;
 
+	/**
+	 * The default wss port of WebSockets, as defined in the spec. If the nullary
+	 * constructor is used, DEFAULT_WSS_PORT will be the port the WebSocketServer
+	 * is binded to. Note that ports under 1024 usually require root permissions.
+	 */
 	public static final int DEFAULT_WSS_PORT = 443;
 
 	/**
 
@@ -91,8 +91,20 @@ protected void startConnectionLostTimer() {
 		connectionLostTimerTask = new TimerTask() {
 			@Override
 			public void run() {
-				for (WebSocket conn: connections()) {
-					conn.sendPing();
+				Collection<WebSocket> con = connections();
+				synchronized ( con ) {
+					long current = (System.currentTimeMillis()-(connectionLostTimeout * 1500));
+					for( WebSocket conn : con ) {
+						if (conn instanceof WebSocketImpl) {
+							if( ((WebSocketImpl)conn).getLastPong() < current ) {
+								if (WebSocketImpl.DEBUG)
+									System.out.println("Closing connection due to no pong received: " + conn.toString());
+								conn.close( CloseFrame.ABNORMAL_CLOSE );
+							} else {
+								conn.sendPing();
+							}
+						}
+					}
 				}
 			}
 		};
@@ -218,5 +230,4 @@ public String getFlashPolicy( WebSocket conn ) throws InvalidDataException {
 		return "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"" + adr.getPort() + "\" /></cross-domain-policy>\0";
 	}
 
-
 }
@@ -97,6 +97,11 @@ public class WebSocketImpl implements WebSocket {
 
 	private String resourceDescriptor = null;
 
+	/**
+	 * Attribute, when the last pong was recieved
+	 */
+	private long lastPong = System.currentTimeMillis();
+
 	/**
 	 * Creates a websocket with server role
 	 *
@@ -349,6 +354,7 @@ private void decodeFrames( ByteBuffer socketBuffer ) {
 					wsl.onWebsocketPing( this, f );
 					continue;
 				} else if( curop == Opcode.PONG ) {
+					lastPong = System.currentTimeMillis();
 					wsl.onWebsocketPong( this, f );
 					continue;
 				} else if( !fin || curop == Opcode.CONTINUOUS ) {
@@ -765,4 +771,12 @@ public void close() {
 	public String getResourceDescriptor() {
 		return resourceDescriptor;
 	}
+
+	/**
+	 * Getter for the last pong recieved
+	 * @return the timestamp for the last recieved pong
+	 */
+	long getLastPong() {
+		return lastPong;
+	}
 }