From 6c2e145ee8f3de7c5fd3ab92fd14ae7a8ca0bd00 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 22 Jul 2011 21:17:36 +0000 Subject: merge revision(s) 32631: ------------------------------------------------------------------------ r32631 | naruse | 2011-07-23 06:16:50 +0900 (Sat, 23 Jul 2011) | 1 line Fix r32622. ------------------------------------------------------------------------ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/uri/common.rb | 2 +- version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/uri/common.rb b/lib/uri/common.rb index 8b9e1e3695..f23fe98d4f 100644 --- a/lib/uri/common.rb +++ b/lib/uri/common.rb @@ -984,7 +984,7 @@ module URI # See URI.decode_www_form_component, URI.encode_www_form def self.decode_www_form(str, enc=Encoding::UTF_8) return [] if str.empty? - unless /\A#{WFKV_}*=#{WFKV_}*(?:[;&]#{WFKV_}*=#{WFKV_}*)*\z/o =~ str + unless /\A#{WFKV_}=#{WFKV_}(?:[;&]#{WFKV_}=#{WFKV_})*\z/o =~ str raise ArgumentError, "invalid data of application/x-www-form-urlencoded (#{str})" end ary = [] diff --git a/version.h b/version.h index c0dcf3f8b1..98ab0319de 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" #define RUBY_PATCHLEVEL -1 -#define RUBY_RELEASE_DATE "2011-07-22" +#define RUBY_RELEASE_DATE "2011-07-23" #define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" -- cgit v1.2.3