summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-30 16:21:44 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-30 16:21:44 +0000
commitbed2ff29bac1a9b55c4091adf7d693c1b00087ae (patch)
treeea4b86df62e1e5813426082dbc9b1b48478368e4 /lib
parent7f9630172c5785bf4edf25369b3a9d0c45bfea6b (diff)
merge revision(s) 36852:
* lib/uri/ftp.rb (URI::FTP#initialize): raise InvalidURIError if "//" is not present [ruby-core:47344] [Bug #6945] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/uri/ftp.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb
index 26e4bb8326..971684a545 100644
--- a/lib/uri/ftp.rb
+++ b/lib/uri/ftp.rb
@@ -135,6 +135,7 @@ module URI
# +opaque+, +query+ and +fragment+, in that order.
#
def initialize(*arg)
+ raise InvalidURIError unless arg[5]
arg[5] = arg[5].sub(/^\//,'').sub(/^%2F/,'/')
super(*arg)
@typecode = nil