Merge pull request #779 from slandelle/series/0.5

fix: ProxyHandler is not set at the right place in the pipeline

Author: hamnis

client/src/main/scala/org/http4s/netty/client/Http4sChannelPoolMap.scala

@@ -192,6 +192,15 @@ private[client] class Http4sChannelPoolMap[F[_]](
         None
       )
       val pipeline = channel.pipeline()
+      config.proxy.foreach {
+        case p: HttpProxy =>
+          p.toProxyHandler(key.requestKey).foreach { handler =>
+            void(pipeline.addLast("proxy", handler))
+          }
+        case s: Socks =>
+          void(pipeline.addLast("proxy", s.toProxyHandler))
+      }
+
       (key.requestKey, SSLContextOption.toMaybeSSLContext(config.sslConfig)) match {
         case (RequestKey(Scheme.https, Uri.Authority(_, host, mayBePort)), Some(context)) =>
           void {
@@ -210,15 +219,6 @@ private[client] class Http4sChannelPoolMap[F[_]](
         case _ => ()
       }
 
-      config.proxy.foreach {
-        case p: HttpProxy =>
-          p.toProxyHandler(key.requestKey).foreach { handler =>
-            void(pipeline.addLast("proxy", handler))
-          }
-        case s: Socks =>
-          void(pipeline.addLast("proxy", s.toProxyHandler))
-      }
-
       configurePipeline(channel, key)
     }
   }