summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-14 19:21:51 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-14 19:21:51 +0000
commite68dcc175c738b16fb03a840bcb48d0f36e62ffd (patch)
tree480cf5c9f700aa84460d035d73641c21c92e011a
parent3ab5be34767e6ad85392a212e93632c0c4f22a8e (diff)
downloadruby-e68dcc175c738b16fb03a840bcb48d0f36e62ffd.tar.gz
merge revision(s) 20248:
* 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
-rw-r--r--ChangeLog6
-rw-r--r--lib/net/ftp.rb4
-rw-r--r--version.h2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bfda55558..c7c36ea78e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* lib/logger.rb (ProgName): fixed for svn, based on a patch from
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index d890130ce7..e07418e83e 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -152,9 +152,9 @@ module Net
end
def open_socket(host, port)
- if defined? SOCKSsocket and ENV["SOCKS_SERVER"]
+ if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
@passive = true
- return SOCKSsocket.open(host, port)
+ return SOCKSSocket.open(host, port)
else
return TCPSocket.open(host, port)
end
diff --git a/version.h b/version.h
index bda68d50fc..eaebd46f9f 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-15"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090215
-#define RUBY_PATCHLEVEL 117
+#define RUBY_PATCHLEVEL 118
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8