archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 20248:

Browse source 
* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
	  a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in 
	  [ruby-core:19982].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-14 19:21:51 +00:00
parent 3ab5be3476
commit e68dcc175c
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Feb 15 04:21:42 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in
[ruby-core:19982].
Fri Feb 13 19:18:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Feb 13 19:18:42 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/logger.rb (ProgName): fixed for svn, based on a patch from * lib/logger.rb (ProgName): fixed for svn, based on a patch from

4
lib/net/ftp.rb
View file

@ -152,9 +152,9 @@ module Net
end end
def open_socket(host, port) def open_socket(host, port)
if defined? SOCKSsocket and ENV["SOCKS_SERVER"] if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
@passive = true @passive = true
return SOCKSsocket.open(host, port) return SOCKSSocket.open(host, port)
else else
return TCPSocket.open(host, port) return TCPSocket.open(host, port)
end end

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-15" #define RUBY_RELEASE_DATE "2009-02-15"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090215 #define RUBY_RELEASE_CODE 20090215
#define RUBY_PATCHLEVEL 117 #define RUBY_PATCHLEVEL 118
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8