Add a way to turn off SSL connection poolling

Author: jfarcand

src/main/java/com/ning/http/client/AsyncHttpClientConfig.java

@@ -73,6 +73,7 @@ public class AsyncHttpClientConfig {
     private final List<IOExceptionFilter> ioExceptionFilters;
     private final int requestCompressionLevel;
     private final int maxRequestRetry;
+    private final boolean allowSslConnectionPool;
 
     private AsyncHttpClientConfig(int maxTotalConnections,
                                   int maxConnectionPerHost,
@@ -94,7 +95,9 @@ private AsyncHttpClientConfig(int maxTotalConnections,
                                   List<RequestFilter> requestFilters,
                                   List<ResponseFilter> responseFilters,
                                   List<IOExceptionFilter> ioExceptionFilters,
-                                  int requestCompressionLevel, int maxRequestRetry) {
+                                  int requestCompressionLevel,
+                                  int maxRequestRetry,
+                                  boolean allowSslConnectionCaching) {
 
         this.maxTotalConnections = maxTotalConnections;
         this.maxConnectionPerHost = maxConnectionPerHost;
@@ -117,6 +120,7 @@ private AsyncHttpClientConfig(int maxTotalConnections,
         this.requestCompressionLevel = requestCompressionLevel;
         this.maxRequestRetry = maxRequestRetry;
         this.reaper = reaper;
+        this.allowSslConnectionPool = allowSslConnectionCaching;
 
         if (applicationThreadPool == null) {
             this.applicationThreadPool = Executors.newCachedThreadPool();
@@ -362,6 +366,15 @@ public int getMaxRequestRetry() {
         return maxRequestRetry;
     }
 
+    /**
+     * Return true is SSL connection polling is enabled. Default is true.
+     * @return
+     */
+    public boolean isSslConnectionPoolEnabled() {
+        return allowSslConnectionPool;
+    }
+
+
     /**
      * Builder for an {@link AsyncHttpClient}
      */
@@ -401,6 +414,7 @@ public Thread newThread(Runnable r) {
         private final List<RequestFilter> requestFilters = new LinkedList<RequestFilter>();
         private final List<ResponseFilter> responseFilters = new LinkedList<ResponseFilter>();
         private final List<IOExceptionFilter> ioExceptionFilters = new LinkedList<IOExceptionFilter>();
+        private boolean allowSslConnectionPool = true;
 
         public Builder() {
         }
@@ -738,6 +752,16 @@ public Builder setMaxRequestRetry(int maxRequestRetry) {
             return this;
         }
 
+        /**
+         * Return true is if connections pooling is enabled.
+         * @param allowSslConnectionPool true if enabled
+         * @return true is if connections pooling is enabled.
+         */
+        public Builder setAllowSslConnectionPool(boolean allowSslConnectionPool) {
+            this.allowSslConnectionPool = allowSslConnectionPool;
+            return this;
+        }
+
         /**
          * Create a config builder with values taken from the given prototype configuration.
          * 
@@ -796,7 +820,8 @@ public AsyncHttpClientConfig build() {
                     responseFilters,
                     ioExceptionFilters,
                     requestCompressionLevel,
-                    maxRequestRetry);
+                    maxRequestRetry,
+                    allowSslConnectionPool);
         }
     }
 }

src/main/java/com/ning/http/client/providers/netty/NettyConnectionsPool.java

@@ -54,6 +54,10 @@ public NettyConnectionsPool(NettyAsyncHttpProvider provider) {
      * {@inheritDoc}
      */
     public boolean offer(String uri, Channel channel) {
+        if (!provider.getConfig().isSslConnectionPoolEnabled() && uri.startsWith("https") ) {
+            return false;
+        }
+
         log.debug("Adding uri: {} for channel {}", uri, channel);
         channel.getPipeline().getContext(NettyAsyncHttpProvider.class).setAttachment(new NettyAsyncHttpProvider.DiscardEvent());
 
@@ -117,6 +121,10 @@ public void run(Timeout timeout) {
      * {@inheritDoc}
      */
     public Channel poll(String uri) {
+        if (!provider.getConfig().isSslConnectionPoolEnabled() && uri.startsWith("https") ) {
+            return null;
+        }
+
         Channel channel = null;
         ConcurrentLinkedQueue<Channel> pooledConnectionForHost = connectionsPool.get(uri);
         if (pooledConnectionForHost != null) {
@@ -154,7 +162,7 @@ public Channel poll(String uri) {
      */
     public boolean removeAll(Channel channel) {
         if (isClosed.get()) return false;
-
+        
         boolean isRemoved = false;
         Iterator<Map.Entry<String, ConcurrentLinkedQueue<Channel>>> i = connectionsPool.entrySet().iterator();
         while (i.hasNext()) {

src/test/java/com/ning/http/client/async/BasicHttpsTest.java

@@ -243,6 +243,30 @@ public void multipleSSLRequestsTest() throws Throwable {
         c.close();
     }
 
+    @Test(groups = {"standalone", "default_provider"})
+    public void multipleSSLWithoutCacheTest() throws Throwable {
+        final AsyncHttpClient c = new AsyncHttpClient(new Builder().setSSLContext(createSSLContext()).setAllowSslConnectionPool(false).build());
+
+        String body = "hello there";
+        c.preparePost(getTargetUrl())
+                .setBody(body)
+                .setHeader("Content-Type", "text/html")
+                .execute();
+
+        c.preparePost(getTargetUrl())
+                .setBody(body)
+                .setHeader("Content-Type", "text/html")
+                .execute();
+
+       Response response = c.preparePost(getTargetUrl())
+                .setBody(body)
+                .setHeader("Content-Type", "text/html")
+                .execute().get();
+
+        assertEquals(response.getResponseBody(), body);
+        c.close();
+    }
+
     @Test(groups = {"standalone", "default_provider"})
     public void reconnectsAfterFailedCertificationPath() throws Throwable {
         final AsyncHttpClient c = new AsyncHttpClient(new Builder().setSSLContext(createSSLContext()).build());