archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 01:54:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge revision(s) 39632: [Backport #8013]

Browse source 
* 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
This commit is contained in:
nagachika 2013-03-24 16:27:10 +00:00
parent 1154668521
commit a41e107fd8
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Mar 25 01:26:26 2013 Zachary Scott <zachary@zacharyscott.net>
* 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 <nobu@ruby-lang.org>
* compile.c (iseq_compile_each): pass keyword arguments to zsuper,

8
lib/webrick/httpproxy.rb
View file

@ -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

2
version.h
View file

@ -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