Merge branch 'master' of github.com:mrniko/netty-socketio

pom.xml

@@ -108,7 +108,7 @@
   <dependency>
   	<groupId>io.netty</groupId>
   	<artifactId>netty-transport</artifactId>
-  	<version>4.1.5.Final</version>
+       <version>4.1.15.Final</version>
   </dependency>
   <dependency>
   	<groupId>io.netty</groupId>

src/main/java/com/corundumstudio/socketio/SocketIOServer.java

@@ -171,8 +171,8 @@ public class SocketIOServer implements ClientListeners {
             bootstrap.childOption(ChannelOption.RCVBUF_ALLOCATOR, new FixedRecvByteBufAllocator(config.getTcpReceiveBufferSize()));
         }
         bootstrap.childOption(ChannelOption.SO_KEEPALIVE, config.isTcpKeepAlive());
+        bootstrap.childOption(ChannelOption.SO_LINGER, config.getSoLinger());
 
-        bootstrap.option(ChannelOption.SO_LINGER, config.getSoLinger());
         bootstrap.option(ChannelOption.SO_REUSEADDR, config.isReuseAddress());
         bootstrap.option(ChannelOption.SO_BACKLOG, config.getAcceptBackLog());
     }