Merge branch 'master' of https://github.com/marci4/Java-WebSocket-Dev

marci4 · marci4 · commit e7380833e4f7 · 2017-04-13T17:11:58.000+02:00
diff --git a/README.markdown b/README.markdown
@@ -20,7 +20,7 @@ Implemented WebSocket protocol versions are:
 
 
 ## Build
-You can build using Ant, Maven or Leiningen but there is nothing against just putting the source path ```src/main/java ``` on your applications buildpath.
+You can build using Ant, Maven, Gradle or Leiningen but there is nothing against just putting the source path ```src/main/java ``` on your applications buildpath.
 
 ### Ant
 
@@ -43,16 +43,27 @@ To use maven add this repository to your pom.xml:
 Also add this dependency to your pom.xml:
 ```xml
 <dependency>
-    <groupId>org.java-websocket</groupId>
-    <artifactId>Java-WebSocket</artifactId>
-    <version>1.3.0</version>
-</dependency> 
+  <groupId>org.java-websocket</groupId>
+  <artifactId>java-websocket</artifactId>
+  <version>1.3.2</version>
+</dependency>
 ```
 
+### Gradle
+To use Gradle add this repository to your repositories list :
+```xml
+maven { url "http://clojars.org/repo" }
+```
+Then you can just add the latest version to your build.
+```xml
+compile "org.java-websocket:java-websocket:1.3.2"
+```
+
+
 ### Leiningen
 
 ``` bash
-lein compile
+[org.java-websocket/java-websocket "1.3.2"]
 ```
 
 Running the Examples
diff --git a/src/main/java/org/java_websocket/drafts/Draft_76.java b/src/main/java/org/java_websocket/drafts/Draft_76.java
@@ -130,7 +130,7 @@ public HandshakeState acceptHandshakeAsClient( ClientHandshake request, ServerHa
 
 	@Override
 	public HandshakeState acceptHandshakeAsServer( ClientHandshake handshakedata ) {
-		if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).length() > 0 && !handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).isEmpty() && handshakedata.hasFieldValue( "Origin" ) )
+		if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).length() > 0 && handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).length() > 0 && handshakedata.hasFieldValue( "Origin" ) )
 			return HandshakeState.MATCHED;
 		return HandshakeState.NOT_MATCHED;
 	}

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public HandshakeState acceptHandshakeAsClient( ClientHandshake request, ServerHa`
`130`	`130`
`131`	`131`	`@Override`
`132`	`132`	`public HandshakeState acceptHandshakeAsServer( ClientHandshake handshakedata ) {`
`133`		`- if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).length() > 0 && !handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).isEmpty() && handshakedata.hasFieldValue( "Origin" ) )`
	`133`	`+ if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).length() > 0 && handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).length() > 0 && handshakedata.hasFieldValue( "Origin" ) )`
`134`	`134`	`return HandshakeState.MATCHED;`
`135`	`135`	`return HandshakeState.NOT_MATCHED;`
`136`	`136`	`}`