knu	2009-02-09 12:16:43 +0900 (Mon, 09 Feb 2009)

  New Revision: 22157

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22157

  Log:
     r22164@crimson:  knu | 2009-02-09 11:52:38 +0900
     (OpenURI::Meta#content_type_parse): fix tests. [ruby-dev:33336]
     (r15200)

  Modified directories:
    branches/ruby_1_8/
  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/open-uri.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 22156)
+++ ruby_1_8/ChangeLog	(revision 22157)
@@ -1,4 +1,4 @@
-Sun Feb  9 11:43:37 2009  Akinori MUSHA  <knu@i...>
+Mon Feb  9 11:50:02 2009  Akinori MUSHA  <knu@i...>
 
 	* lib/open-uri.rb: add :read_timeout option.
 	  [ruby-core:4848] (r9166)
@@ -15,6 +15,8 @@
 	  (OpenURI::HTTPRedirect): new exception class for
 	  redirection. (r13788)
 	  (OpenURI::Buffer): use Meta ===.  [ruby-core:14295] (r14609)
+	  (OpenURI::Meta#content_type_parse): fix
+	  tests. [ruby-dev:33336] (r15200)
 
 Mon Feb  9 01:21:16 2009  Tanaka Akira  <akr@f...>
 
Index: ruby_1_8/lib/open-uri.rb
===================================================================
--- ruby_1_8/lib/open-uri.rb	(revision 22156)
+++ ruby_1_8/lib/open-uri.rb	(revision 22157)
@@ -430,7 +430,7 @@
         subtype = $2.downcase
         parameters = []
         $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
+          val = qval.gsub(/[\r\n\t !#-\[\]-~\x80-\xff]+|(\\[\x00-\x7f])/n) { $1 ? $1[1,1] : $& } if qval
           parameters << [att.downcase, val]
         }
         ["#{type}/#{subtype}", *parameters]

Property changes on: ruby_1_8
___________________________________________________________________
Name: svk:merge
   - 050cfa88-b445-4b2e-b226-957b86f2c464:/local/ruby/1.8:22163
b2dd03c8-39d4-4d8f-98ff-823fe69b080e:/trunk:5286
   + 050cfa88-b445-4b2e-b226-957b86f2c464:/local/ruby/1.8:22164
b2dd03c8-39d4-4d8f-98ff-823fe69b080e:/trunk:5286


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/