summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-01 12:45:01 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-01 12:45:01 +0000
commitf3f6a3af1199b6a14171a2fcec1e2dacf7a99133 (patch)
tree17fa4f8277efd0a07e9e456581618ca01565a9b0
parentebda27fe441c67e32de579178375cc8ac2e6d7b8 (diff)
downloadruby-f3f6a3af1199b6a14171a2fcec1e2dacf7a99133.tar.gz
ruby-f3f6a3af1199b6a14171a2fcec1e2dacf7a99133.tar.xz
ruby-f3f6a3af1199b6a14171a2fcec1e2dacf7a99133.zip
* ext/socket/socket.c (socks_init): typo fixed. a patch from Sven
Klemm <sven at c3d2.de>. [ruby-core:08770] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/socket.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0afd9adce..cae32dbf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 1 21:41:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c (socks_init): typo fixed. a patch from Sven
+ Klemm <sven at c3d2.de>. [ruby-core:08770]
+
Fri Sep 1 14:22:42 2006 WATANABE Hirofumi <eban@ruby-lang.org>
* array.c (rb_ary_shuffle): RDoc fixed.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index ca86334df..e2e691a14 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1300,7 +1300,7 @@ tcp_init(int argc, VALUE *argv, VALUE sock)
#ifdef SOCKS
static VALUE
-socks_init(VALUE sock, VALUE host, VALUEserv)
+socks_init(VALUE sock, VALUE host, VALUE serv)
{
static init = 0;