1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/uri/rfc3986_parser.rb: specify a regexp for :OPAQUE; generic.rb

assumes it is present, and will refuse all values otherwise.
  by Matthew Draper <matthew@trebex.net>
  https://github.com/ruby/ruby/pull/718 fix GH-718

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-09-17 14:15:03 +00:00
parent f5e06db39c
commit e37aab94da
3 changed files with 13 additions and 1 deletions

View file

@ -1,3 +1,10 @@
Wed Sep 17 23:12:36 2014 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/rfc3986_parser.rb: specify a regexp for :OPAQUE; generic.rb
assumes it is present, and will refuse all values otherwise.
by Matthew Draper <matthew@trebex.net>
https://github.com/ruby/ruby/pull/718 fix GH-718
Wed Sep 17 16:22:58 2014 Eric Wong <e@80x24.org>
* ext/zlib/zlib.c (zlib_mem_alloc): check overflow

View file

@ -83,7 +83,7 @@ module URI
REL_PATH: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~])+(?:\/(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*)*\z/,
QUERY: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
FRAGMENT: /\A(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*\z/,
OPAQUE: nil,
OPAQUE: /\A(?:[^\/].*)?\z/,
PORT: /\A[\x09\x0a\x0c\x0d ]*\d*[\x09\x0a\x0c\x0d ]*\z/,
}
end

View file

@ -730,6 +730,11 @@ class URI::TestGeneric < Test::Unit::TestCase
assert_raise(URI::InvalidURIError) { uri.port = 'bar' }
assert_raise(URI::InvalidURIError) { uri.path = 'bar' }
assert_raise(URI::InvalidURIError) { uri.query = 'bar' }
uri = URI.parse('foo:bar')
assert_raise(URI::InvalidComponentError) { uri.opaque = '/baz' }
uri.opaque = 'xyzzy'
assert_equal('foo:xyzzy', uri.to_s)
end
def test_set_scheme