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

* lib/net/ftp.rb (parse227, parse228, parse229): don't use $~.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2012-03-26 14:43:27 +00:00
parent d68b3a38e9
commit bb314d3347
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Mar 26 23:43:04 2012 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb (parse227, parse228, parse229): don't use $~.
Mon Mar 26 23:34:40 2012 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb (parse227, parse228, parse229): don't use local

16
lib/net/ftp.rb
View file

@ -923,8 +923,8 @@ module Net
if resp[0, 3] != "227"
raise FTPReplyError, resp
end
if /\((?<host>\d+(,\d+){3}),(?<port>\d+,\d+)\)/ =~ resp
return parse_pasv_ipv4_host($~["host"]), parse_pasv_port($~["port"])
if m = /\((?<host>\d+(,\d+){3}),(?<port>\d+,\d+)\)/.match(resp)
return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"])
else
raise FTPProtoError, resp
end
@ -939,10 +939,10 @@ module Net
if resp[0, 3] != "228"
raise FTPReplyError, resp
end
if /\(4,4,(?<host>\d+(,\d+){3}),2,(?<port>\d+,\d+)\)/ =~ resp
return parse_pasv_ipv4_host($~["host"]), parse_pasv_port($~["port"])
elsif /\(6,16,(?<host>\d+(,(\d+)){15}),2,(?<port>\d+,\d+)\)/ =~ resp
return parse_pasv_ipv6_host($~["host"]), parse_pasv_port($~["port"])
if m = /\(4,4,(?<host>\d+(,\d+){3}),2,(?<port>\d+,\d+)\)/.match(resp)
return parse_pasv_ipv4_host(m["host"]), parse_pasv_port(m["port"])
elsif m = /\(6,16,(?<host>\d+(,(\d+)){15}),2,(?<port>\d+,\d+)\)/.match(resp)
return parse_pasv_ipv6_host(m["host"]), parse_pasv_port(m["port"])
else
raise FTPProtoError, resp
end
@ -977,8 +977,8 @@ module Net
if resp[0, 3] != "229"
raise FTPReplyError, resp
end
if /\((?<d>[!-~])\k<d>\k<d>(?<port>\d+)\k<d>\)/ =~ resp
return @sock.peeraddr[3], $~["port"].to_i
if m = /\((?<d>[!-~])\k<d>\k<d>(?<port>\d+)\k<d>\)/.match(resp)
return @sock.peeraddr[3], m["port"].to_i
else
raise FTPProtoError, resp
end