Merge pull request #159 from chrchr/proxy_with_ssl

This makes SSL connections via proxies work correctly.
httprb · Oct 2, 2014 · 0148f73 · 0148f73
2 parents 409c983 + d1a4576
commit 0148f73
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/http/client.rb b/lib/http/client.rb
@@ -51,7 +51,7 @@ def perform(req, options)
 
       # TODO: keep-alive support
       @socket = options[:socket_class].open(req.socket_host, req.socket_port)
-      @socket = start_tls(@socket, options) if uri.is_a?(URI::HTTPS)
+      @socket = start_tls(@socket, options) if uri.is_a?(URI::HTTPS) && !req.using_proxy?
 
       req.stream @socket