aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-25 04:03:20 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-25 04:03:20 +0000
commit71a80abc7c1de76cc90fda8ad0e0f06437805025 (patch)
tree7b412ca700a45d1d6b633f531ac1bd31cdb611f3
parent2ca35a8bfe4c7e64daab5dbecb4fba384069c0fc (diff)
downloadruby-71a80abc7c1de76cc90fda8ad0e0f06437805025.tar.gz
* lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
quoted-string should be zero or more characters. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8518 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/open-uri.rb2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eb44f81d66..344408485c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 25 12:59:48 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
+ quoted-string should be zero or more characters.
+
Tue May 24 23:42:16 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (fix_pow): support Fixnum ** Float case directly
@@ -37,7 +42,6 @@ Mon May 23 15:07:34 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub ($(PROGRAM)): add dependency on $(LIBRUBY_SO).
[experimental]
->>>>>>> 1.4263
Mon May 23 12:21:37 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (make_regexp): should not return junk address during
diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index f33dc38900..ce96e5b1c9 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -364,7 +364,7 @@ module OpenURI
RE_LWS = /[\r\n\t ]+/n
RE_TOKEN = %r{[^\x00- ()<>@,;:\\"/\[\]?={}\x7f]+}n
- RE_QUOTED_STRING = %r{"(?:[\r\n\t !#-\[\]-~\x80-\xff]|\\[\x00-\x7f])"}n
+ RE_QUOTED_STRING = %r{"(?:[\r\n\t !#-\[\]-~\x80-\xff]|\\[\x00-\x7f])*"}n
RE_PARAMETERS = %r{(?:;#{RE_LWS}?#{RE_TOKEN}#{RE_LWS}?=#{RE_LWS}?(?:#{RE_TOKEN}|#{RE_QUOTED_STRING})#{RE_LWS}?)*}n
def content_type_parse # :nodoc: