* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):

  should delete trailing LF from the result of pack("m*").

* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
  - should delete trailing LF from the result of pack("m*").
  - clear Request-Line not to send the sesponse by HTTPServer#run.

* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
  refine regexp (and change the name of a local variable).

* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
  don't allow changing its mode.

* test/webrick/*, sample/webrick/httpproxy.rb: add new files.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 14 insertions, 0 deletions

diff --git a/lib/webrick/httpproxy.rb b/lib/webrick/httpproxy.rb
index c5ed44f1da..14e3499775 100644
--- a/lib/webrick/httpproxy.rb
+++ b/lib/webrick/httpproxy.rb
@@ -15,6 +15,14 @@ require "net/http"
 Net::HTTP::version_1_2 if RUBY_VERSION < "1.7"
 
 module WEBrick
+  NullReader = Object.new
+  class << NullReader
+    def read(*args)
+      nil
+    end
+    alias gets read
+  end
+
   class HTTPProxyServer < HTTPServer
     def initialize(config)
       super
@@ -111,6 +119,7 @@ module WEBrick
         proxy_port = proxy.port
         if proxy.userinfo
           credentials = "Basic " + [proxy.userinfo].pack("m*")
+          credentials.chomp!
           header['proxy-authorization'] = credentials
         end
       end
@@ -171,6 +180,7 @@ module WEBrick
         proxy_request_line = "CONNECT #{host}:#{port} HTTP/1.0"
         if proxy.userinfo
           credentials = "Basic " + [proxy.userinfo].pack("m*")
+          credentials.chomp!
         end
         host, port = proxy.host, proxy.port
       end
@@ -211,6 +221,10 @@ module WEBrick
         end
         res.send_response(ua)
         access_log(@config, req, res)
+
+        # Should clear request-line not to send the sesponse twice.
+        # see: HTTPServer#run
+        req.parse(NullReader) rescue nil
       end
 
       begin