From f2b5e62d6029c4dc4d08e39e9cd3844ab8238435 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Tue, 3 May 2011 23:15:54 -0400
Subject: [PATCH] Be more informative about proxy server format.
---
lib/geocoder/cli.rb | 2 +-
lib/geocoder/configuration.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/geocoder/cli.rb b/lib/geocoder/cli.rb
index 127b8d3f..b12680ca 100644
--- a/lib/geocoder/cli.rb
+++ b/lib/geocoder/cli.rb
@@ -23,7 +23,7 @@ module Geocoder
end
opts.on("-p <proxy>", "--proxy <proxy>",
- "HTTP proxy server to use (not including 'http://')") do |proxy|
+ "HTTP proxy server to use (user:pass@host:port)") do |proxy|
Geocoder::Configuration.http_proxy = proxy
end
diff --git a/lib/geocoder/configuration.rb b/lib/geocoder/configuration.rb
index 500ac9c9..3fefc7fe 100644
--- a/lib/geocoder/configuration.rb
+++ b/lib/geocoder/configuration.rb
@@ -15,10 +15,10 @@ module Geocoder
# use HTTPS for lookup requests? (if supported)
[:use_https, false],
- # HTTP proxy server (not including "http://")
+ # HTTP proxy server (user:pass@host:port)
[:http_proxy, nil],
- # HTTPS proxy server (not including "https://")
+ # HTTPS proxy server (user:pass@host:port)
[:https_proxy, nil],
# API key for geocoding service
--
GitLab