From f86a98779c95a6a36eec05a63f16999d2a9ff877 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 18 Nov 2008 16:46:16 +0000 Subject: merges r20222 from trunk into ruby_1_9_1. * lib/uri/generic.rb (URI::Generic#check_path): REL_PATH should a symbol. [ruby-core:19805] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 11 +++++++++++ lib/uri/generic.rb | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index aa7fdbaad..dcd5054a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Nov 11 21:22:28 2008 Yukihiro Matsumoto + + * lib/uri/generic.rb (URI::Generic#check_path): REL_PATH should a + symbol. [ruby-core:19805] + +Tue Nov 11 23:02:27 2008 Yuki Sonoda (Yugui) + + * man/ruby.1 (RUBYOPT): wrote which option can appear. + (--yydebug): wrote "do not use". + (--dump): wrote "do not use". + Tue Nov 11 20:49:29 2008 Kazuhiro NISHIYAMA * configure.in: fix SEGV on Mac OS X 10.5.3 with pthread. diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb index f569a22f4..65c6c7379 100644 --- a/lib/uri/generic.rb +++ b/lib/uri/generic.rb @@ -481,7 +481,7 @@ module URI "bad component(expected absolute path component): #{v}" end else - if v && v != '' && @parser.regexp[:ABS_PATH] !~ v && @parser.regexp[REL_PATH] !~ v + if v && v != '' && @parser.regexp[:ABS_PATH] !~ v && @parser.regexp[:REL_PATH] !~ v raise InvalidComponentError, "bad component(expected relative path component): #{v}" end -- cgit