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

diff --git a/test/webrick/test_server.rb b/test/webrick/test_server.rb
new file mode 100644
index 0000000000..5c6b3e55de
--- /dev/null
+++ b/test/webrick/test_server.rb
@@ -0,0 +1,66 @@
+require "test/unit"
+require "tempfile"
+require "webrick"
+require File.join(File.dirname(__FILE__), "utils.rb")
+
+class TestWEBrickServer < Test::Unit::TestCase
+  class Echo < WEBrick::GenericServer
+    def run(sock)
+      while line = sock.gets
+        sock << line
+      end
+    end
+  end
+
+  def test_server
+    TestWEBrick.start_server(Echo){|server, addr, port|
+      TCPSocket.open(addr, port){|sock|
+        sock.puts("foo"); assert_equal("foo\n", sock.gets)
+        sock.puts("bar"); assert_equal("bar\n", sock.gets)
+        sock.puts("baz"); assert_equal("baz\n", sock.gets)
+        sock.puts("qux"); assert_equal("qux\n", sock.gets)
+      }
+    }
+  end
+
+  def test_callbacks
+    accepted = started = stopped = 0
+    config = {
+      :AcceptCallback => Proc.new{ accepted += 1 },
+      :StartCallback => Proc.new{ started += 1 },
+      :StopCallback => Proc.new{ stopped += 1 },
+    }
+    TestWEBrick.start_server(Echo, config){|server, addr, port|
+      true while server.status != :Running
+      assert_equal(started, 1)
+      assert_equal(stopped, 0)
+      assert_equal(accepted, 0)
+      TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
+      TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
+      TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets }
+      assert_equal(accepted, 3)
+    }
+    assert_equal(started, 1)
+    assert_equal(stopped, 1)
+  end
+
+  def test_daemon
+    begin
+      r, w = IO.pipe
+      Process.fork{
+        r.close
+        WEBrick::Daemon.start
+        w.puts(Process.ppid)
+        w.puts(Process.pid)
+        sleep
+      }
+      assert_equal(1, r.gets.to_i)
+      assert(Process.kill(:KILL, r.gets.to_i))
+    rescue NotImplementedError
+      # snip this test
+    ensure
+      r.close
+      w.close
+    end
+  end
+end