From 131c29ffff862728d02cbbde473ae789e84630fe Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 15 May 2003 09:48:12 +0000 Subject: * lib/open-uri.rb (OpenURI::Redirect#initialize): call super to initialize mesg. * lib/open-uri.rb (OpenURI::Meta#charset): call block to guess charset if block is given and charset is not given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/open-uri.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib/open-uri.rb') diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 5233bc7bfb..dc2f675f24 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -163,6 +163,7 @@ module OpenURI class Redirect < StandardError # :nodoc: def initialize(uri) + super("redirection to #{uri.to_s}") @uri = uri end attr_reader :uri @@ -271,10 +272,20 @@ module OpenURI # returns a charset parameter in Content-Type field. # It is downcased for canonicalization. + # + # If charset parameter is not given but a block is given, + # the block is called and its result is returned. + # It can be used to guess charset. + # + # If charset parameter and block is not given, + # nil is returned except text type in HTTP. + # In that case, "iso-8859-1" is returned as defined by RFC2616 3.7.1. def charset type, *parameters = content_type_parse if pair = parameters.assoc('charset') pair.last.downcase + elsif block_given? + yield elsif type && %r{\Atext/} =~ type && @base_uri && @base_uri.scheme == 'http' "iso-8859-1" # RFC2616 3.7.1 -- cgit v1.2.3