nagachika	2013-03-25 01:27:10 +0900 (Mon, 25 Mar 2013)

  New Revision: 39916

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39916

  Log:
    merge revision(s) 39632: [Backport #8013]
    
    * lib/webrick/httpproxy.rb: Fix typos in HTTPProxyServer [Bug #8013]
      Patch by Nobuhiro IMAI [ruby-core:53127]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/lib/webrick/httpproxy.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39915)
+++ ruby_2_0_0/ChangeLog	(revision 39916)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar 25 01:26:26 2013  Zachary Scott  <zachary@z...>
+
+	* 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@r...>
 
 	* compile.c (iseq_compile_each): pass keyword arguments to zsuper,
Index: ruby_2_0_0/lib/webrick/httpproxy.rb
===================================================================
--- ruby_2_0_0/lib/webrick/httpproxy.rb	(revision 39915)
+++ ruby_2_0_0/lib/webrick/httpproxy.rb	(revision 39916)
@@ -46,10 +46,10 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/webrick/httpproxy.rb#L46
   #
   #   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 https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/webrick/httpproxy.rb#L186
         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
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39915)
+++ ruby_2_0_0/version.h	(revision 39916)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39632


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/