diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/open-uri.rb | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sat Mar 27 21:40:41 2004 Tanaka Akira <akr@m17n.org> + + * (lib/open-uri.rb): permit extra semicolon in content-type field. + Sat Mar 27 10:40:48 2004 Tanaka Akira <akr@m17n.org> * (lib/pp.rb, lib/prettyprint.rb): define seplist in PP::PPMethods diff --git a/lib/open-uri.rb b/lib/open-uri.rb index c6bfd7a509..84acdb9984 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -282,11 +282,12 @@ module OpenURI def content_type_parse # :nodoc: v = @meta['content-type'] - if v && %r{\A#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?/(#{RE_TOKEN})#{RE_LWS}?(#{RE_PARAMETERS})\z}o =~ v + # The last (?:;#{RE_LWS}?)? matches extra ";" which is not permitted by RFC2045. + if v && %r{\A#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?/(#{RE_TOKEN})#{RE_LWS}?(#{RE_PARAMETERS})(?:;#{RE_LWS}?)?\z}no =~ v type = $1.downcase subtype = $2.downcase parameters = [] - $3.scan(/;#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?=#{RE_LWS}?(?:(#{RE_TOKEN})|(#{RE_QUOTED_STRING}))/o) {|att, val, qval| + $3.scan(/;#{RE_LWS}?(#{RE_TOKEN})#{RE_LWS}?=#{RE_LWS}?(?:(#{RE_TOKEN})|(#{RE_QUOTED_STRING}))/no) {|att, val, qval| val = qval.gsub(/[\r\n\t !#-\[\]-~\x80-\xff]+|(\\[\x00-\x7f])/) { $1 ? $1[1,1] : $& } if qval parameters << [att.downcase, val] } |