Merge branch 'master' of https://github.com/DanielYWoo/Java-WebSocket into fix86

Davidiusdadi · Davidiusdadi · commit 8c9e7858750b · 2012-05-01T18:06:42.000+02:00
diff --git a/src/org/java_websocket/WebSocketClient.java b/src/org/java_websocket/WebSocketClient.java
@@ -11,6 +11,7 @@
 import java.nio.channels.SocketChannel;
 import java.nio.channels.UnresolvedAddressException;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -58,6 +59,8 @@ public abstract class WebSocketClient extends WebSocketAdapter implements Runnab
 
 	private final Lock closelock = new ReentrantLock();
 
+	private Map<String, String> headers;
+
 	public WebSocketClient( URI serverURI ) {
 		this( serverURI, new Draft_10() );
 	}
@@ -68,6 +71,10 @@ public WebSocketClient( URI serverURI ) {
 	 * must call <var>connect</var> first to initiate the socket connection.
 	 */
 	public WebSocketClient( URI serverUri , Draft draft ) {
+		this(serverUri, draft, null);
+	}
+
+	public WebSocketClient( URI serverUri , Draft draft, Map<String, String> headers) {
 		if( serverUri == null ) {
 			throw new IllegalArgumentException();
 		}
@@ -76,6 +83,7 @@ public WebSocketClient( URI serverUri , Draft draft ) {
 		}
 		this.uri = serverUri;
 		this.draft = draft;
+		this.headers = headers;
 	}
 
 	/**
@@ -279,6 +287,11 @@ private void sendHandshake() throws IOException , InvalidHandshakeException , In
 		HandshakeImpl1Client handshake = new HandshakeImpl1Client();
 		handshake.setResourceDescriptor( path );
 		handshake.put( "Host", host );
+		if (headers != null) {
+			for (Map.Entry<String, String> kv : headers.entrySet()) {
+				handshake.put(kv.getKey(), kv.getValue());
+			}
+		}
 		conn.startHandshake( handshake );
 	}
 
