Merge branch 'master' into uds

Author: silence-code

client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java

@@ -39,6 +39,7 @@
 import io.netty.util.Timer;
 import io.netty.util.concurrent.*;
 import io.netty.util.internal.StringUtil;
+import io.netty.util.internal.PlatformDependent;
 import org.asynchttpclient.*;
 import org.asynchttpclient.channel.ChannelPool;
 import org.asynchttpclient.channel.ChannelPoolPartitioning;
@@ -205,15 +206,20 @@ private Bootstrap newBootstrap(ChannelFactory<? extends Channel> channelFactory,
 
   @SuppressWarnings("unchecked")
   private TransportFactory<? extends Channel, ? extends EventLoopGroup> getNativeTransportFactory() {
+    String nativeTransportFactoryClassName = null;
+    if (PlatformDependent.isOsx()) {
+      nativeTransportFactoryClassName = "org.asynchttpclient.netty.channel.KQueueTransportFactory";
+    } else if (!PlatformDependent.isWindows()) {
+      nativeTransportFactoryClassName = "org.asynchttpclient.netty.channel.EpollTransportFactory";
+    }
+
     try {
-      return (TransportFactory<? extends Channel, ? extends EventLoopGroup>) Class.forName("org.asynchttpclient.netty.channel.EpollTransportFactory").newInstance();
-    } catch (Exception e) {
-      try {
-        return (TransportFactory<? extends Channel, ? extends EventLoopGroup>) Class.forName("org.asynchttpclient.netty.channel.KQueueTransportFactory").newInstance();
-      } catch (Exception e1) {
-        throw new IllegalArgumentException("No suitable native transport (epoll or kqueue) available");
+      if (nativeTransportFactoryClassName != null) {
+        return (TransportFactory<? extends Channel, ? extends EventLoopGroup>) Class.forName(nativeTransportFactoryClassName).newInstance();
       }
+    } catch (Exception e) {
     }
+    throw new IllegalArgumentException("No suitable native transport (epoll or kqueue) available");
   }
 
   private TransportFactory<? extends Channel, ? extends EventLoopGroup> getDomainTransportFactory() {
@@ -382,6 +388,11 @@ public Future<Channel> updatePipelineForHttpTunneling(ChannelPipeline pipeline,
 
     if (requestUri.isWebSocket()) {
       pipeline.addAfter(AHC_HTTP_HANDLER, AHC_WS_HANDLER, wsHandler);
+
+      if (config.isEnableWebSocketCompression()) {
+        pipeline.addBefore(AHC_WS_HANDLER, WS_COMPRESSOR_HANDLER, WebSocketClientCompressionHandler.INSTANCE);
+      }
+
       pipeline.remove(AHC_HTTP_HANDLER);
     }
     return whenHanshaked;