From a41e107fd8a061bde6e2ece007895b208f4bc7ac Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 24 Mar 2013 16:27:10 +0000 Subject: [PATCH] merge revision(s) 39632: [Backport #8013] * lib/webrick/httpproxy.rb: Fix typos in HTTPProxyServer [Bug #8013] Patch by Nobuhiro IMAI [ruby-core:53127] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/webrick/httpproxy.rb | 8 ++++---- version.h | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22980d99fe..acc3fa8d95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 25 01:26:26 2013 Zachary Scott + + * lib/webrick/httpproxy.rb: Fix typos in HTTPProxyServer [Bug #8013] + Patch by Nobuhiro IMAI [ruby-core:53127] + Mon Mar 25 01:09:48 2013 Nobuyoshi Nakada * compile.c (iseq_compile_each): pass keyword arguments to zsuper, diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb index 3ad573d5d9..7c34d33df0 100644 --- a/lib/webrick/httpproxy.rb +++ b/lib/webrick/httpproxy.rb @@ -46,10 +46,10 @@ module WEBrick # # proxy = WEBrick::HTTPProxyServer.new Port: 8000 # - # trap 'INT' do p.shutdown end - # trap 'TERM' do p.shutdown end + # trap 'INT' do proxy.shutdown end + # trap 'TERM' do proxy.shutdown end # - # p.start + # proxy.start # # See ::new for proxy-specific configuration items. # @@ -186,7 +186,7 @@ module WEBrick res.send_response(ua) access_log(@config, req, res) - # Should clear request-line not to send the sesponse twice. + # Should clear request-line not to send the response twice. # see: HTTPServer#run req.parse(NullReader) rescue nil end diff --git a/version.h b/version.h index 6938daa64c..ab6c9571c6 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-25" -#define RUBY_PATCHLEVEL 93 +#define RUBY_PATCHLEVEL 94 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3