summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-05 02:00:29 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-05 02:00:29 +0000
commitbf620f001127c9a6aee757e5d6319e23c153fdfa (patch)
treeed54a921055a2f1423dd6b5d5827de11b948557d
parenta2108abc5b0f46650cc33e2e9574c3c7e5edb499 (diff)
downloadruby-bf620f001127c9a6aee757e5d6319e23c153fdfa.tar.gz
ruby-bf620f001127c9a6aee757e5d6319e23c153fdfa.tar.xz
ruby-bf620f001127c9a6aee757e5d6319e23c153fdfa.zip
* lib/open-uri.rb (URI::Generic#find_proxy): no_proxy support did not work.
[ruby-dev:21484] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4688 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--lib/open-uri.rb2
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a06e0d4e2..790ea6b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 5 10:55:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * lib/open-uri.rb (URI::Generic#find_proxy): no_proxy support did not
+ work. [ruby-dev:21484]
+
Sun Oct 5 09:52:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
* lib/test/unit/assertions.rb: will use pp for output if available.
@@ -51,10 +56,10 @@ Sat Oct 4 21:49:14 2003 WATANABE Hirofumi <eban@ruby-lang.org>
Sat Oct 4 17:52:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* lib/soap/netHttpClient.rb: follow http-access2. hosts which matches
- ENV['no_proxy'] or ENV['NO_PROXY'] is not proxyed.
+ ENV['no_proxy'] or ENV['NO_PROXY'] are not proxyed.
- [,:] separated. ("ruby-lang.org:rubyist.net")
- no regexp. (give "ruby-lang.org", not "*.ruby-lang.org")
- - if you want specify hot by IP address, give full address.
+ - if you want specify host by IP address, give full address.
("192.168.1.1, 192.168.1.2")
* lib/soap/rpc/cgistub.rb: return "Status: XXX MMM" line.
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index dc2f675f2..8ff5a10b8 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -338,7 +338,7 @@ module URI
name = 'no_proxy'
if no_proxy = ENV[name] || ENV[name.upcase]
no_proxy.scan(/([^:,]*)(?::(\d+))?/) {|host, port|
- if /(\A|\.)#{Regexp.quote host}\z/i =~ proxy_uri.host &&
+ if /(\A|\.)#{Regexp.quote host}\z/i =~ self.host &&
(!port || self.port == port.to_i)
proxy_uri = nil
break