kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) r45344: [Backport #9543]

Browse source 
* lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-07-06 13:57:45 +00:00
parent 5fdc9a2e08
commit 1fe220dc0b
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Jul 6 22:56:03 2014 Zachary Scott <e@zzak.io>
* lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]
Fri Jul 4 00:46:03 2014 Zachary Scott <e@zzak.io> Fri Jul 4 00:46:03 2014 Zachary Scott <e@zzak.io>
* enumerator.c: [DOC] Fix example to show Enumerator#peek behavior * enumerator.c: [DOC] Fix example to show Enumerator#peek behavior

12
lib/gserver.rb
View file

@ -37,7 +37,7 @@ require "thread"
# super(port, *args) # super(port, *args)
# end # end
# def serve(io) # def serve(io)
# io.puts(Time.now.to_s) # io.puts(Time.now.to_i)
# end # end
# end # end
# #
@ -144,7 +144,7 @@ class GServer
attr_reader :port attr_reader :port
# Host on which to bind, as a String # Host on which to bind, as a String
attr_reader :host attr_reader :host
# Maximum number of connections to accept at at ime, as a Fixnum # Maximum number of connections to accept at a time, as a Fixnum
attr_reader :maxConnections attr_reader :maxConnections
# IO Device on which log messages should be written # IO Device on which log messages should be written
attr_accessor :stdlog attr_accessor :stdlog
@ -156,7 +156,7 @@ class GServer
# Called when a client connects, if auditing is enabled. # Called when a client connects, if auditing is enabled.
# #
# +client+:: a TCPSocket instances representing the client that connected # +client+:: a TCPSocket instance representing the client that connected
# #
# Return true to allow this client to connect, false to prevent it. # Return true to allow this client to connect, false to prevent it.
def connecting(client) def connecting(client)
@ -192,7 +192,7 @@ class GServer
# Called if #debug is true whenever an unhandled exception is raised. # Called if #debug is true whenever an unhandled exception is raised.
# This implementation simply logs the backtrace. # This implementation simply logs the backtrace.
# #
# +detail+:: The Exception that was caught # +detail+:: the Exception that was caught
def error(detail) def error(detail)
log(detail.backtrace.join("\n")) log(detail.backtrace.join("\n"))
end end
@ -212,9 +212,9 @@ class GServer
# Create a new server # Create a new server
# #
# +port+:: the port, as a Fixnum, on which to listen. # +port+:: the port, as a Fixnum, on which to listen
# +host+:: the host to bind to # +host+:: the host to bind to
# +maxConnections+:: The maximum number of simultaneous connections to # +maxConnections+:: the maximum number of simultaneous connections to
# accept # accept
# +stdlog+:: IO device on which to log messages # +stdlog+:: IO device on which to log messages
# +audit+:: if true, lifecycle callbacks will be called. See #audit # +audit+:: if true, lifecycle callbacks will be called. See #audit

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.2" #define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-07-04" #define RUBY_RELEASE_DATE "2014-07-06"
#define RUBY_PATCHLEVEL 166 #define RUBY_PATCHLEVEL 167
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 4 #define RUBY_RELEASE_DAY 6
#include "ruby/version.h" #include "ruby/version.h"