* 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, 5 insertions, 5 deletions

diff --git a/lib/webrick/httputils.rb b/lib/webrick/httputils.rb
index 18e3e25887..e45d8e0499 100644
--- a/lib/webrick/httputils.rb
+++ b/lib/webrick/httputils.rb
@@ -179,14 +179,14 @@ module WEBrick
       if value
         parts = value.split(/,\s*/)
         parts.each {|part|
-          if m = %r{^([^\s,]+?)(?:;\s*q=([\d]+(?:\.[\d]+)))?$}.match(part)
-            lang = m[1]
+          if m = %r{^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$}.match(part)
+            val = m[1]
             q = (m[2] or 1).to_f
-            tmp.push([lang, q])
+            tmp.push([val, q])
           end
         }
-        tmp = tmp.sort_by{|lang, q| -q}
-        tmp.collect!{|lang, q| lang}
+        tmp = tmp.sort_by{|val, q| -q}
+        tmp.collect!{|val, q| val}
       end
       return tmp
     end