diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:46:16 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:46:16 +0000 |
| commit | f86a98779c95a6a36eec05a63f16999d2a9ff877 (patch) | |
| tree | 38df109205239776049345f3fc12df1091f67c46 | |
| parent | b93f61286694869ca6eb9bdccb184a0103c2d838 (diff) | |
| download | ruby-f86a98779c95a6a36eec05a63f16999d2a9ff877.tar.gz ruby-f86a98779c95a6a36eec05a63f16999d2a9ff877.tar.xz ruby-f86a98779c95a6a36eec05a63f16999d2a9ff877.zip | |
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
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | lib/uri/generic.rb | 2 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,14 @@ +Tue Nov 11 21:22:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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) <yugui@yugui.jp> + + * 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 <zn@mbf.nifty.com> * 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 |