From 4eada861c174a41101a1e5f543ed0eb937b66ed1 Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@maestrodev.com>
Date: Tue, 25 Jun 2013 22:50:33 +1000
Subject: [PATCH] Support SSL on Ruby 1.8.7 / JRuby 1.6

Under older versions of Ruby, SSL needed to be turned on after creating the
HTTP object, but before making a request, as a separate method call; and you
must require 'net/https'.

In addition to the above, this brings more consistency under which
circumstances the SSL and proxy configuration variables are applied when
using server_ip instead of server_url to configure the location of the
Jenkins server.
---
 lib/jenkins_api_client/client.rb | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/jenkins_api_client/client.rb b/lib/jenkins_api_client/client.rb
index f1c39711..86f6477f 100644
--- a/lib/jenkins_api_client/client.rb
+++ b/lib/jenkins_api_client/client.rb
@@ -23,6 +23,7 @@
 require 'rubygems'
 require 'json'
 require 'net/http'
+require 'net/https'
 require 'nokogiri'
 require 'base64'
 require "mixlib/shellout"
@@ -172,18 +173,26 @@ def to_s
     def make_http_request( request, follow_redirect = @follow_redirects )
       request.basic_auth @username, @password if @username
 
-      if @server_url
-        http = Net::HTTP.new(@server_uri.host, @server_uri.port)
-        http.use_ssl = true if @ssl
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @ssl
-        response = http.request(request)
+      if @server_uri
+        host = @server_uri.host
+        port = @server_uri.port
       else
-        Net::HTTP.start(
-          @server_ip, @server_port, @proxy_ip, @proxy_port, :use_ssl => @ssl
-        ) do |http|
-          response = http.request(request)
-        end
+        host = @server_ip
+        port = @server_port
+      end
+
+      if @proxy_ip
+        http = Net::HTTP::Proxy(@proxy_ip, @proxy_port).new(host, port)
+      else
+        http = Net::HTTP.new(host, port)
       end
+
+      if @ssl
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      response = http.request(request)
       case response
         when Net::HTTPRedirection then
           # If we got a redirect request, follow it (if flag set), but don't go any deeper