aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/webrick/httpproxy.rb8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3452217428..f5d8ba7d72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 8 10:44:00 2013 Zachary Scott <zachary@zacharyscott.net>
+
+ * lib/webrick/httpproxy.rb: Fix typos in HTTPProxyServer [Bug #8013]
+ Patch by Nobuhiro IMAI [ruby-core:53127]
+
Fri Mar 8 03:16:15 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* class.c (rb_mod_ancestors): Include singleton_class in ancestors
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