aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-22 06:01:17 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-01-22 06:01:17 +0000
commit06720d45c74de5b0a000ebb04148623e4bb03fc2 (patch)
tree823878066aa4eabb70bc53a33243bfd48f83a64c
parent0fe77cd26b04c652a0dae30f0f04980a324ea95d (diff)
downloadruby-06720d45c74de5b0a000ebb04148623e4bb03fc2.tar.gz
* ext/socket/socket.c: fix errors in socket sample code.
[ruby-core:09992] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/socket.c4
-rw-r--r--version.h6
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bc26090b3b..1cd4cf28c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 22 14:57:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/socket/socket.c: fix errors in socket sample code.
+ [ruby-core:09992]
+
Sat Jan 20 21:05:18 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (fole_s_set_code_page): WIN32OLE.codepage=
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 419f08c6de..a0cf8353a1 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -2893,7 +2893,7 @@ sock_accept(VALUE sock)
* IO.select([socket])
* retry
* end
- * puts "The client said, '#{socket.readline.chomp}'"
+ * puts "The client said, '#{client_socket.readline.chomp}'"
* client_socket.puts "Hello from script one!"
* socket.close
*
@@ -2947,8 +2947,8 @@ sock_accept_nonblock(VALUE sock)
* socket.bind( sockaddr )
* socket.listen( 5 )
* client_fd, client_sockaddr = socket.sysaccept
- * puts "The client said, '#{socket.readline.chomp}'"
* client_socket = Socket.for_fd( client_fd )
+ * puts "The client said, '#{client_socket.readline.chomp}'"
* client_socket.puts "Hello from script one!"
* socket.close
*
diff --git a/version.h b/version.h
index f9bb245d59..ed22736d1a 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-01-20"
+#define RUBY_RELEASE_DATE "2007-01-22"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070120
+#define RUBY_RELEASE_CODE 20070122
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 22
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];