From 88d9078adcfadf18ce7696daa57c8ae6a41c3469 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 23 Jan 2007 01:27:31 +0000 Subject: * ext/socket/socket.c: fix errors in socket sample code. [ruby-core:09992] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/socket/socket.c | 6 +++--- version.h | 8 +++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3367f876..5bd804bc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 22 14:57:25 2007 Yukihiro Matsumoto + + * ext/socket/socket.c: fix errors in socket sample code. + [ruby-core:09992] + Sat Jan 13 23:54:48 2007 Masaki Suketa * ext/win32ole/win32ole.c (ole_free, ole_type_free, diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 57eb7a4c4..24904530b 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -2951,7 +2951,7 @@ sock_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock) * socket.bind( sockaddr ) * socket.listen( 5 ) * client, client_sockaddr = socket.accept - * puts "The client said, '#{socket.readline.chomp}'" + * puts "The client said, '#{client.readline.chomp}'" * client.puts "Hello from script one!" * socket.close * @@ -3056,7 +3056,7 @@ sock_accept(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 * @@ -3111,8 +3111,8 @@ sock_accept_nonblock(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 f4b6e1a1f..af5720217 100644 --- a/version.h +++ b/version.h @@ -1,17 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2007-01-13" +#define RUBY_RELEASE_DATE "2007-01-23" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20070113 -#define RUBY_PATCHLEVEL 5000 +#define RUBY_RELEASE_CODE 20070123 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 23 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; RUBY_EXTERN const char ruby_platform[]; -RUBY_EXTERN const int ruby_patchlevel; -- cgit