From 5d9c2182b7c6b052e278d07da2d446da0e432419 Mon Sep 17 00:00:00 2001
From: Dan Drinkard <dan.drinkard@gmail.com>
Date: Tue, 28 Jan 2014 14:09:28 -0500
Subject: [PATCH] Don't throw errors when using SSL
---
lib/geocoder/lookups/base.rb | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/lib/geocoder/lookups/base.rb b/lib/geocoder/lookups/base.rb
index 3e9ec677..467f0b9c 100644
--- a/lib/geocoder/lookups/base.rb
+++ b/lib/geocoder/lookups/base.rb
@@ -227,15 +227,13 @@ module Geocoder
def make_api_request(query)
timeout(configuration.timeout) do
uri = URI.parse(query_url(query))
- # client = http_client.new(uri.host, uri.port)
- # client.use_ssl = true if configuration.use_https
- # client.get(uri.request_uri, configuration.http_headers)
+ args = [uri.host, uri.port]
+ args = args.push(uri.user, uri.password) unless uri.user.nil? or uri.password.nil?
+ opts = {}
+ opts[:use_ssl] = true if configuration.use_https
- http_client.start(uri.host, uri.port) do |client|
- client.use_ssl = true if configuration.use_https
- req = Net::HTTP::Get.new(uri.request_uri, configuration.http_headers)
- req.basic_auth(uri.user, uri.password) if uri.user and uri.password
- client.request(req)
+ http_client.start(*args, opts) do |client|
+ resp = client.get(uri.request_uri, configuration.http_headers)
end
end
end
--
GitLab