summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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;