Fixing field case. Draft 75 is case-sensitive while Draft 76 is case-insensitive.

Author: nmische

src/WebSocketClient.java

@@ -320,14 +320,23 @@ private void sendClientHandshake(WebSocket conn) throws IOException {
         WebSocketHandshake clientHandshake = new WebSocketHandshake();
         clientHandshake.setType(ClientServerType.CLIENT);
         clientHandshake.setDraft(getDraft());
-        clientHandshake.put("request-uri", requestURI);
-        clientHandshake.put("host", host);
-        clientHandshake.put("origin", origin);
+        
+        if (getDraft() == Draft.DRAFT75) {
+            clientHandshake.put("Request-Uri", requestURI);
+            clientHandshake.put("Host", host);
+            clientHandshake.put("Origin", origin);        	
+        } else {
+            clientHandshake.put("request-uri", requestURI);
+            clientHandshake.put("host", host);
+            clientHandshake.put("origin", origin);
+        }
+        
+       
         if (subprotocol != null) {
             if (getDraft() == Draft.DRAFT75) { 
-                clientHandshake.put("websocket-protocol", subprotocol);
+                clientHandshake.put("Websocket-Protocol", subprotocol);
             } else {
-                clientHandshake.put("sec-webSocket-protocol", subprotocol);
+                clientHandshake.put("sec-websocket-protocol", subprotocol);
             }            
         }
 

src/WebSocketHandshake.java

@@ -112,12 +112,22 @@ public void parseHandshake() {
         if (this.handshakeType == ClientServerType.SERVER) {
             int sp1 = line.indexOf(" ");
             int sp2 = line.indexOf(" ",sp1+1);
-            String httpVersion = line.substring(0,sp1);            
+            String httpVersion = line.substring(0,sp1);
             String statusCode = line.substring(sp1+1,sp2);
             String reasonPhrase = line.substring(sp2+1,line.length());
-            put("http-version", httpVersion);
-            put("status-code", statusCode);
-            put("reason-phrase", reasonPhrase);
+            String httpVersionKey = "HTTP-Version";
+            String statusCodeKey = "Status-Code";
+            String reasonPhraseKey = "Reason-Phrase";
+            
+            if (this.handshakeDraft == Draft.DRAFT76) {
+                httpVersionKey = httpVersionKey.toLowerCase();
+                statusCodeKey = statusCodeKey.toLowerCase();
+                reasonPhraseKey = reasonPhraseKey.toLowerCase();
+            }
+            
+            put(httpVersionKey, httpVersion);
+            put(statusCodeKey, statusCode);
+            put(reasonPhraseKey, reasonPhrase);
         }
 
         if (this.handshakeType == ClientServerType.CLIENT) {
@@ -126,9 +136,20 @@ public void parseHandshake() {
             String method = line.substring(0,sp1);            
             String requestURI = line.substring(sp1+1,sp2);
             String httpVersion = line.substring(sp2+1,line.length());
-            put("method", method);
-            put("request-uri", requestURI);
-            put("http-version", httpVersion);
+            String methodKey = "Method";
+            String requestURIKey = "Request-URI";
+            String httpVersionKey = "HTTP-Version";
+            
+            
+            if (this.handshakeDraft == Draft.DRAFT76) {
+                methodKey = methodKey.toLowerCase();
+                requestURIKey = httpVersionKey.toLowerCase();
+                httpVersionKey = httpVersionKey.toLowerCase();
+            }
+            
+            put(methodKey, method);
+            put(requestURIKey, requestURI);
+            put(httpVersionKey, httpVersion);
         }
 
         // parse fields
@@ -206,10 +227,10 @@ public void buildHandshake() {
                                        "Connection: Upgrade\r\n";
 
             if (this.handshakeDraft == Draft.DRAFT75) {
-                responseHandshake += "WebSocket-Origin: " + getProperty("origin") + "\r\n" +
-                                     "WebSocket-Location: ws://" + getProperty("host") + getProperty("request-uri") + "\r\n";
+                responseHandshake += "WebSocket-Origin: " + getProperty("Origin") + "\r\n" +
+                                     "WebSocket-Location: ws://" + getProperty("Host") + getProperty("Request-URI") + "\r\n";
                 if (containsKey("WebSocket-Protocol")) {
-                    responseHandshake += "WebSocket-Protocol: " + getProperty("websocket-protocol") + "\r\n";
+                    responseHandshake += "WebSocket-Protocol: " + getProperty("Websocket-Protocol") + "\r\n";
                 }
             }
 
@@ -243,14 +264,18 @@ public void buildHandshake() {
 
         if (this.handshakeType == ClientServerType.CLIENT) {
 
-            String requestHandshake = "GET " + getProperty("request-uri") + " HTTP/1.1\r\n" +
+            String requestURI = (getDraft() == Draft.DRAFT75) ? getProperty("Request-URI") : getProperty("request-uri");
+            String host = (getDraft() == Draft.DRAFT75) ? getProperty("Host") : getProperty("host");
+            String origin = (getDraft() == Draft.DRAFT75) ? getProperty("Origin") : getProperty("origin");
+            
+            String requestHandshake = "GET " + requestURI + " HTTP/1.1\r\n" +
                 "Upgrade: WebSocket\r\n" +
                 "Connection: Upgrade\r\n" +
-                "Host: " + getProperty("host") + "\r\n" +
-                "Origin: " + getProperty("origin") + "\r\n";
+                "Host: " + host + "\r\n" +
+                "Origin: " + origin + "\r\n";
 
-            if (getDraft() == Draft.DRAFT75 && containsKey("websocket-protocol")) {  
-                requestHandshake += "WebSocket-Protocol: " + getProperty("websocket-protocol") + "\r\n";
+            if (getDraft() == Draft.DRAFT75 && containsKey("Websocket-Protocol")) {  
+                requestHandshake += "WebSocket-Protocol: " + getProperty("Websocket-Protocol") + "\r\n";
             }
 
             if (getDraft() == Draft.DRAFT76 ) {

src/WebSocketServer.java

@@ -373,9 +373,9 @@ public boolean onHandshakeRecieved(WebSocket conn, WebSocketHandshake handshake)
 
     private boolean handleHandshake75(WebSocket conn, WebSocketHandshake handshake) throws IOException {
 
-        if (!handshake.getProperty("method").equals("GET")
-                || !handshake.getProperty("http-version").equals("HTTP/1.1")
-                    || !handshake.getProperty("request-uri").startsWith("/")) {
+        if (!handshake.getProperty("Method").equals("GET")
+                || !handshake.getProperty("HTTP-Version").equals("HTTP/1.1")
+                    || !handshake.getProperty("Request-URI").startsWith("/")) {
             return false;
         }
 
@@ -409,11 +409,11 @@ private boolean handleHandshake75(WebSocket conn, WebSocketHandshake handshake)
         WebSocketHandshake serverHandshake = new WebSocketHandshake();
         serverHandshake.setType(ClientServerType.SERVER);
         serverHandshake.setDraft(Draft.DRAFT75);
-        serverHandshake.put("host", handshake.getProperty("Host"));
-        serverHandshake.put("request-uri", handshake.getProperty("request-uri"));
-        serverHandshake.put("origin", handshake.getProperty("Origin"));
+        serverHandshake.put("Host", handshake.getProperty("Host"));
+        serverHandshake.put("Request-Uri", handshake.getProperty("request-uri"));
+        serverHandshake.put("Origin", handshake.getProperty("Origin"));
         if (handshake.containsKey("Websocket-Protocol")) {
-            serverHandshake.put("websocket-protocol", handshake.getProperty("Websocket-Protocol"));
+            serverHandshake.put("Websocket-Protocol", handshake.getProperty("Websocket-Protocol"));
         }
 
         conn.socketChannel().write(ByteBuffer.wrap(serverHandshake.getHandshake()));