unicorn 3.3.1 → 3.4.0

data/t/bin/unused_listen

@@ -7,24 +7,11 @@ require 'tmpdir'
 
 default_port = 8080
 addr = ENV['UNICORN_TEST_ADDR'] || '127.0.0.1'
-retries = 100
-base = 5000
 port = sock = lock_path = nil
 
 begin
-  begin
-    port = base + rand(32768 - base)
-    while port == default_port
-      port = base + rand(32768 - base)
-    end
-
-    sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-    sock.bind(Socket.pack_sockaddr_in(port, addr))
-    sock.listen(5)
-  rescue Errno::EADDRINUSE, Errno::EACCES
-    sock.close rescue nil
-    retry if (retries -= 1) >= 0
-  end
+  sock = TCPServer.new(addr, 0)
+  port = sock.addr[1]
 
   # since we'll end up closing the random port we just got, there's a race
   # condition could allow the random port we just chose to reselect itself

data/test/exec/test_exec.rb

@@ -797,7 +797,6 @@ EOF
 
   def test_daemonize_redirect_fail
     pid_file = "#{@tmpdir}/test.pid"
-    log = Tempfile.new('unicorn_test_log')
     ucfg = Tempfile.new('unicorn_test_config')
     ucfg.syswrite("pid #{pid_file}\"\n")
     err = Tempfile.new('stderr')
@@ -1040,7 +1039,7 @@ EOF
       lock_path = "#{Dir::tmpdir}/unicorn_test." \
                   "#{Unicorn::Const::DEFAULT_LISTEN}.lock"
       begin
-        lock = File.open(lock_path, File::WRONLY|File::CREAT|File::EXCL, 0600)
+        File.open(lock_path, File::WRONLY|File::CREAT|File::EXCL, 0600)
         yield
       rescue Errno::EEXIST
         lock_path = nil

data/test/rails/test_rails.rb

@@ -265,7 +265,7 @@ logger Logger.new('#{COMMON_TMP.path}')
 
     if @pid
       Process.kill(:QUIT, @pid)
-      pid2, status = Process.waitpid2(@pid)
+      _, status = Process.waitpid2(@pid)
       assert status.success?
     end
 

data/test/test_helper.rb

@@ -100,30 +100,17 @@ end
 # for a race condition is very small).  You may also set UNICORN_TEST_ADDR
 # to override the default test address (127.0.0.1).
 def unused_port(addr = '127.0.0.1')
-  retries = 100
-  base = 5000
   port = sock = nil
   begin
-    begin
-      port = base + rand(32768 - base)
-      while port == Unicorn::Const::DEFAULT_PORT
-        port = base + rand(32768 - base)
-      end
-
-      sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-      sock.bind(Socket.pack_sockaddr_in(port, addr))
-      sock.listen(5)
-    rescue Errno::EADDRINUSE, Errno::EACCES
-      sock.close rescue nil
-      retry if (retries -= 1) >= 0
-    end
+    sock = TCPServer.new(addr, 0)
+    port = sock.addr[1]
 
     # since we'll end up closing the random port we just got, there's a race
     # condition could allow the random port we just chose to reselect itself
     # when running tests in parallel with gmake.  Create a lock file while
     # we have the port here to ensure that does not happen .
     lock_path = "#{Dir::tmpdir}/unicorn_test.#{addr}:#{port}.lock"
-    lock = File.open(lock_path, File::WRONLY|File::CREAT|File::EXCL, 0600)
+    File.open(lock_path, File::WRONLY|File::CREAT|File::EXCL, 0600)
     at_exit { File.unlink(lock_path) rescue nil }
   rescue Errno::EEXIST
     sock.close rescue nil

data/test/unit/test_configurator.rb

@@ -33,6 +33,14 @@ class TestConfigurator < Test::Unit::TestCase
     assert_equal "0.0.0.0:2007", meth.call('2007')
     assert_equal "0.0.0.0:2007", meth.call(2007)
 
+    %w([::1]:2007 [::]:2007).each do |addr|
+      assert_equal addr, meth.call(addr.dup)
+    end
+
+    # for Rainbows! users only
+    assert_equal "[::]:80", meth.call("[::]")
+    assert_equal "127.6.6.6:80", meth.call("127.6.6.6")
+
     # the next two aren't portable, consider them unsupported for now
     # assert_match %r{\A\d+\.\d+\.\d+\.\d+:2007\z}, meth.call('1:2007')
     # assert_match %r{\A\d+\.\d+\.\d+\.\d+:2007\z}, meth.call('2:2007')

data/test/unit/test_http_parser.rb

@@ -14,9 +14,10 @@ class HttpParserTest < Test::Unit::TestCase
 
   def test_parse_simple
     parser = HttpParser.new
-    req = {}
-    http = "GET / HTTP/1.1\r\n\r\n"
-    assert_equal req, parser.headers(req, http)
+    req = parser.env
+    http = parser.buf
+    http << "GET / HTTP/1.1\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal '', http
 
     assert_equal 'HTTP/1.1', req['SERVER_PROTOCOL']
@@ -31,14 +32,14 @@ class HttpParserTest < Test::Unit::TestCase
     parser.clear
     req.clear
 
-    http = "G"
-    assert_nil parser.headers(req, http)
+    http << "G"
+    assert_nil parser.parse
     assert_equal "G", http
     assert req.empty?
 
     # try parsing again to ensure we were reset correctly
-    http = "GET /hello-world HTTP/1.1\r\n\r\n"
-    assert parser.headers(req, http)
+    http << "ET /hello-world HTTP/1.1\r\n\r\n"
+    assert parser.parse
 
     assert_equal 'HTTP/1.1', req['SERVER_PROTOCOL']
     assert_equal '/hello-world', req['REQUEST_PATH']
@@ -53,161 +54,161 @@ class HttpParserTest < Test::Unit::TestCase
 
   def test_tab_lws
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.1\r\nHost:\tfoo.bar\r\n\r\n"
-    assert_equal req.object_id, parser.headers(req, tmp).object_id
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\nHost:\tfoo.bar\r\n\r\n"
+    assert_equal req.object_id, parser.parse.object_id
     assert_equal "foo.bar", req['HTTP_HOST']
   end
 
   def test_connection_close_no_ka
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.1\r\nConnection: close\r\n\r\n"
-    assert_equal req.object_id, parser.headers(req, tmp).object_id
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\nConnection: close\r\n\r\n"
+    assert_equal req.object_id, parser.parse.object_id
     assert_equal "GET", req['REQUEST_METHOD']
     assert ! parser.keepalive?
   end
 
   def test_connection_keep_alive_ka
     parser = HttpParser.new
-    req = {}
-    tmp = "HEAD / HTTP/1.1\r\nConnection: keep-alive\r\n\r\n"
-    assert_equal req.object_id, parser.headers(req, tmp).object_id
+    req = parser.env
+    parser.buf << "HEAD / HTTP/1.1\r\nConnection: keep-alive\r\n\r\n"
+    assert_equal req.object_id, parser.parse.object_id
     assert parser.keepalive?
   end
 
   def test_connection_keep_alive_no_body
     parser = HttpParser.new
-    req = {}
-    tmp = "POST / HTTP/1.1\r\nConnection: keep-alive\r\n\r\n"
-    assert_equal req.object_id, parser.headers(req, tmp).object_id
+    req = parser.env
+    parser.buf << "POST / HTTP/1.1\r\nConnection: keep-alive\r\n\r\n"
+    assert_equal req.object_id, parser.parse.object_id
     assert parser.keepalive?
   end
 
   def test_connection_keep_alive_no_body_empty
     parser = HttpParser.new
-    req = {}
-    tmp = "POST / HTTP/1.1\r\n" \
-          "Content-Length: 0\r\n" \
-          "Connection: keep-alive\r\n\r\n"
-    assert_equal req.object_id, parser.headers(req, tmp).object_id
+    req = parser.env
+    parser.buf << "POST / HTTP/1.1\r\n" \
+                  "Content-Length: 0\r\n" \
+                  "Connection: keep-alive\r\n\r\n"
+    assert_equal req.object_id, parser.parse.object_id
     assert parser.keepalive?
   end
 
   def test_connection_keep_alive_ka_bad_version
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.0\r\nConnection: keep-alive\r\n\r\n"
-    assert_equal req.object_id, parser.headers(req, tmp).object_id
+    req = parser.env
+    parser.buf << "GET / HTTP/1.0\r\nConnection: keep-alive\r\n\r\n"
+    assert_equal req.object_id, parser.parse.object_id
     assert parser.keepalive?
   end
 
   def test_parse_server_host_default_port
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.1\r\nHost: foo\r\n\r\n"
-    assert_equal req, parser.headers(req, tmp)
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\nHost: foo\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal 'foo', req['SERVER_NAME']
     assert_equal '80', req['SERVER_PORT']
-    assert_equal '', tmp
+    assert_equal '', parser.buf
     assert parser.keepalive?
   end
 
   def test_parse_server_host_alt_port
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.1\r\nHost: foo:999\r\n\r\n"
-    assert_equal req, parser.headers(req, tmp)
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\nHost: foo:999\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal 'foo', req['SERVER_NAME']
     assert_equal '999', req['SERVER_PORT']
-    assert_equal '', tmp
+    assert_equal '', parser.buf
     assert parser.keepalive?
   end
 
   def test_parse_server_host_empty_port
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.1\r\nHost: foo:\r\n\r\n"
-    assert_equal req, parser.headers(req, tmp)
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\nHost: foo:\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal 'foo', req['SERVER_NAME']
     assert_equal '80', req['SERVER_PORT']
-    assert_equal '', tmp
+    assert_equal '', parser.buf
     assert parser.keepalive?
   end
 
   def test_parse_server_host_xfp_https
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.1\r\nHost: foo:\r\n" \
-          "X-Forwarded-Proto: https\r\n\r\n"
-    assert_equal req, parser.headers(req, tmp)
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\nHost: foo:\r\n" \
+                  "X-Forwarded-Proto: https\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal 'foo', req['SERVER_NAME']
     assert_equal '443', req['SERVER_PORT']
-    assert_equal '', tmp
+    assert_equal '', parser.buf
     assert parser.keepalive?
   end
 
   def test_parse_xfp_https_chained
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.0\r\n" \
-          "X-Forwarded-Proto: https,http\r\n\r\n"
-    assert_equal req, parser.headers(req, tmp)
+    req = parser.env
+    parser.buf << "GET / HTTP/1.0\r\n" \
+                  "X-Forwarded-Proto: https,http\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal '443', req['SERVER_PORT'], req.inspect
     assert_equal 'https', req['rack.url_scheme'], req.inspect
-    assert_equal '', tmp
+    assert_equal '', parser.buf
   end
 
   def test_parse_xfp_https_chained_backwards
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.0\r\n" \
+    req = parser.env
+    parser.buf << "GET / HTTP/1.0\r\n" \
           "X-Forwarded-Proto: http,https\r\n\r\n"
-    assert_equal req, parser.headers(req, tmp)
+    assert_equal req, parser.parse
     assert_equal '80', req['SERVER_PORT'], req.inspect
     assert_equal 'http', req['rack.url_scheme'], req.inspect
-    assert_equal '', tmp
+    assert_equal '', parser.buf
   end
 
   def test_parse_xfp_gopher_is_ignored
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.0\r\n" \
-          "X-Forwarded-Proto: gopher\r\n\r\n"
-    assert_equal req, parser.headers(req, tmp)
+    req = parser.env
+    parser.buf << "GET / HTTP/1.0\r\n" \
+                  "X-Forwarded-Proto: gopher\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal '80', req['SERVER_PORT'], req.inspect
     assert_equal 'http', req['rack.url_scheme'], req.inspect
-    assert_equal '', tmp
+    assert_equal '', parser.buf
   end
 
   def test_parse_x_forwarded_ssl_on
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.0\r\n" \
-          "X-Forwarded-Ssl: on\r\n\r\n"
-    assert_equal req, parser.headers(req, tmp)
+    req = parser.env
+    parser.buf << "GET / HTTP/1.0\r\n" \
+                  "X-Forwarded-Ssl: on\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal '443', req['SERVER_PORT'], req.inspect
     assert_equal 'https', req['rack.url_scheme'], req.inspect
-    assert_equal '', tmp
+    assert_equal '', parser.buf
   end
 
   def test_parse_x_forwarded_ssl_off
     parser = HttpParser.new
-    req = {}
-    tmp = "GET / HTTP/1.0\r\n" \
-          "X-Forwarded-Ssl: off\r\n\r\n"
-    assert_equal req, parser.headers(req, tmp)
+    req = parser.env
+    parser.buf << "GET / HTTP/1.0\r\nX-Forwarded-Ssl: off\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal '80', req['SERVER_PORT'], req.inspect
     assert_equal 'http', req['rack.url_scheme'], req.inspect
-    assert_equal '', tmp
+    assert_equal '', parser.buf
   end
 
   def test_parse_strange_headers
     parser = HttpParser.new
-    req = {}
+    req = parser.env
     should_be_good = "GET / HTTP/1.1\r\naaaaaaaaaaaaa:++++++++++\r\n\r\n"
-    assert_equal req, parser.headers(req, should_be_good)
-    assert_equal '', should_be_good
+    parser.buf << should_be_good
+    assert_equal req, parser.parse
+    assert_equal '', parser.buf
     assert parser.keepalive?
   end
 
@@ -217,14 +218,14 @@ class HttpParserTest < Test::Unit::TestCase
   def test_nasty_pound_header
     parser = HttpParser.new
     nasty_pound_header = "GET / HTTP/1.1\r\nX-SSL-Bullshit:   -----BEGIN CERTIFICATE-----\r\n\tMIIFbTCCBFWgAwIBAgICH4cwDQYJKoZIhvcNAQEFBQAwcDELMAkGA1UEBhMCVUsx\r\n\tETAPBgNVBAoTCGVTY2llbmNlMRIwEAYDVQQLEwlBdXRob3JpdHkxCzAJBgNVBAMT\r\n\tAkNBMS0wKwYJKoZIhvcNAQkBFh5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMu\r\n\tdWswHhcNMDYwNzI3MTQxMzI4WhcNMDcwNzI3MTQxMzI4WjBbMQswCQYDVQQGEwJV\r\n\tSzERMA8GA1UEChMIZVNjaWVuY2UxEzARBgNVBAsTCk1hbmNoZXN0ZXIxCzAJBgNV\r\n\tBAcTmrsogriqMWLAk1DMRcwFQYDVQQDEw5taWNoYWVsIHBhcmQYJKoZIhvcNAQEB\r\n\tBQADggEPADCCAQoCggEBANPEQBgl1IaKdSS1TbhF3hEXSl72G9J+WC/1R64fAcEF\r\n\tW51rEyFYiIeZGx/BVzwXbeBoNUK41OK65sxGuflMo5gLflbwJtHBRIEKAfVVp3YR\r\n\tgW7cMA/s/XKgL1GEC7rQw8lIZT8RApukCGqOVHSi/F1SiFlPDxuDfmdiNzL31+sL\r\n\t0iwHDdNkGjy5pyBSB8Y79dsSJtCW/iaLB0/n8Sj7HgvvZJ7x0fr+RQjYOUUfrePP\r\n\tu2MSpFyf+9BbC/aXgaZuiCvSR+8Snv3xApQY+fULK/xY8h8Ua51iXoQ5jrgu2SqR\r\n\twgA7BUi3G8LFzMBl8FRCDYGUDy7M6QaHXx1ZWIPWNKsCAwEAAaOCAiQwggIgMAwG\r\n\tA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgWgMA4GA1UdDwEB/wQEAwID6DAs\r\n\tBglghkgBhvhCAQ0EHxYdVUsgZS1TY2llbmNlIFVzZXIgQ2VydGlmaWNhdGUwHQYD\r\n\tVR0OBBYEFDTt/sf9PeMaZDHkUIldrDYMNTBZMIGaBgNVHSMEgZIwgY+AFAI4qxGj\r\n\tloCLDdMVKwiljjDastqooXSkcjBwMQswCQYDVQQGEwJVSzERMA8GA1UEChMIZVNj\r\n\taWVuY2UxEjAQBgNVBAsTCUF1dGhvcml0eTELMAkGA1UEAxMCQ0ExLTArBgkqhkiG\r\n\t9w0BCQEWHmNhLW9wZXJhdG9yQGdyaWQtc3VwcG9ydC5hYy51a4IBADApBgNVHRIE\r\n\tIjAggR5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMudWswGQYDVR0gBBIwEDAO\r\n\tBgwrBgEEAdkvAQEBAQYwPQYJYIZIAYb4QgEEBDAWLmh0dHA6Ly9jYS5ncmlkLXN1\r\n\tcHBvcnQuYWMudmT4sopwqlBWsvcHViL2NybC9jYWNybC5jcmwwPQYJYIZIAYb4QgEDBDAWLmh0\r\n\tdHA6Ly9jYS5ncmlkLXN1cHBvcnQuYWMudWsvcHViL2NybC9jYWNybC5jcmwwPwYD\r\n\tVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NhLmdyaWQt5hYy51ay9wdWIv\r\n\tY3JsL2NhY3JsLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAS/U4iiooBENGW/Hwmmd3\r\n\tXCy6Zrt08YjKCzGNjorT98g8uGsqYjSxv/hmi0qlnlHs+k/3Iobc3LjS5AMYr5L8\r\n\tUO7OSkgFFlLHQyC9JzPfmLCAugvzEbyv4Olnsr8hbxF1MbKZoQxUZtMVu29wjfXk\r\n\thTeApBv7eaKCWpSp7MCbvgzm74izKhu3vlDk9w6qVrxePfGgpKPqfHiOoGhFnbTK\r\n\twTC6o2xq5y0qZ03JonF7OJspEd3I5zKY3E+ov7/ZhW6DqT8UFvsAdjvQbXyhV8Eu\r\n\tYhixw1aKEPzNjNowuIseVogKOLXxWI5vAi5HgXdS0/ES5gDGsABo4fqovUKlgop3\r\n\tRA==\r\n\t-----END CERTIFICATE-----\r\n\r\n"
-    req = {}
-    buf = nasty_pound_header.dup
+    req = parser.env
+    parser.buf << nasty_pound_header.dup
 
     assert nasty_pound_header =~ /(-----BEGIN .*--END CERTIFICATE-----)/m
     expect = $1.dup
     expect.gsub!(/\r\n\t/, ' ')
-    assert_equal req, parser.headers(req, buf)
-    assert_equal '', buf
+    assert_equal req, parser.parse
+    assert_equal '', parser.buf
     assert_equal expect, req['HTTP_X_SSL_BULLSHIT']
   end
 
@@ -235,9 +236,10 @@ class HttpParserTest < Test::Unit::TestCase
              "\t\r\n" \
              "    \r\n" \
              "  ASDF\r\n\r\n"
-    req = {}
-    assert_equal req, parser.headers(req, header)
-    assert_equal '', header
+    parser.buf << header
+    req = parser.env
+    assert_equal req, parser.parse
+    assert_equal '', parser.buf
     assert_equal 'ASDF', req['HTTP_X_ASDF']
   end
 
@@ -249,9 +251,10 @@ class HttpParserTest < Test::Unit::TestCase
              "\t\r\n" \
              "       x\r\n" \
              "  ASDF\r\n\r\n"
-    req = {}
-    assert_equal req, parser.headers(req, header)
-    assert_equal '', header
+    req = parser.env
+    parser.buf << header
+    assert_equal req, parser.parse
+    assert_equal '', parser.buf
     assert_equal 'hi y x ASDF', req['HTTP_X_ASDF']
   end
 
@@ -261,8 +264,9 @@ class HttpParserTest < Test::Unit::TestCase
              "Host: \r\n" \
              "    YHBT.net\r\n" \
              "\r\n"
-    req = {}
-    assert_equal req, parser.headers(req, header)
+    parser.buf << header
+    req = parser.env
+    assert_equal req, parser.parse
     assert_equal 'example.com', req['HTTP_HOST']
   end
 
@@ -271,21 +275,22 @@ class HttpParserTest < Test::Unit::TestCase
   # in case we ever go multithreaded/evented...
   def test_resumable_continuations
     nr = 1000
-    req = {}
     header = "GET / HTTP/1.1\r\n" \
              "X-ASDF:      \r\n" \
              "  hello\r\n"
     tmp = []
     nr.times { |i|
       parser = HttpParser.new
-      assert parser.headers(req, "#{header} #{i}\r\n").nil?
+      req = parser.env
+      parser.buf << "#{header} #{i}\r\n"
+      assert parser.parse.nil?
       asdf = req['HTTP_X_ASDF']
       assert_equal "hello #{i}", asdf
       tmp << [ parser, asdf ]
-      req.clear
     }
     tmp.each_with_index { |(parser, asdf), i|
-      assert_equal req, parser.headers(req, "#{header} #{i}\r\n .\r\n\r\n")
+      parser.buf << " .\r\n\r\n"
+      assert parser.parse
       assert_equal "hello #{i} .", asdf
     }
   end
@@ -296,8 +301,9 @@ class HttpParserTest < Test::Unit::TestCase
              "    y\r\n" \
              "Host: hello\r\n" \
              "\r\n"
-    req = {}
-    assert_raises(HttpParserError) { parser.headers(req, header) }
+    parser.buf << header
+    req = parser.env
+    assert_raises(HttpParserError) { parser.parse }
   end
 
   def test_parse_ie6_urls
@@ -309,7 +315,7 @@ class HttpParserTest < Test::Unit::TestCase
        /mal"formed"?
     ).each do |path|
       parser = HttpParser.new
-      req = {}
+      req = parser.env
       sorta_safe = %(GET #{path} HTTP/1.1\r\n\r\n)
       assert_equal req, parser.headers(req, sorta_safe)
       assert_equal path, req['REQUEST_URI']
@@ -320,7 +326,7 @@ class HttpParserTest < Test::Unit::TestCase
   
   def test_parse_error
     parser = HttpParser.new
-    req = {}
+    req = parser.env
     bad_http = "GET / SsUTF/1.1"
 
     assert_raises(HttpParserError) { parser.headers(req, bad_http) }
@@ -334,7 +340,7 @@ class HttpParserTest < Test::Unit::TestCase
 
   def test_piecemeal
     parser = HttpParser.new
-    req = {}
+    req = parser.env
     http = "GET"
     assert_nil parser.headers(req, http)
     assert_nil parser.headers(req, http)
@@ -356,9 +362,10 @@ class HttpParserTest < Test::Unit::TestCase
   # not common, but underscores do appear in practice
   def test_absolute_uri_underscores
     parser = HttpParser.new
-    req = {}
+    req = parser.env
     http = "GET http://under_score.example.com/foo?q=bar HTTP/1.0\r\n\r\n"
-    assert_equal req, parser.headers(req, http)
+    parser.buf << http
+    assert_equal req, parser.parse
     assert_equal 'http', req['rack.url_scheme']
     assert_equal '/foo?q=bar', req['REQUEST_URI']
     assert_equal '/foo', req['REQUEST_PATH']
@@ -367,16 +374,17 @@ class HttpParserTest < Test::Unit::TestCase
     assert_equal 'under_score.example.com', req['HTTP_HOST']
     assert_equal 'under_score.example.com', req['SERVER_NAME']
     assert_equal '80', req['SERVER_PORT']
-    assert_equal "", http
+    assert_equal "", parser.buf
     assert ! parser.keepalive?
   end
 
   # some dumb clients add users because they're stupid
   def test_absolute_uri_w_user
     parser = HttpParser.new
-    req = {}
+    req = parser.env
     http = "GET http://user%20space@example.com/foo?q=bar HTTP/1.0\r\n\r\n"
-    assert_equal req, parser.headers(req, http)
+    parser.buf << http
+    assert_equal req, parser.parse
     assert_equal 'http', req['rack.url_scheme']
     assert_equal '/foo?q=bar', req['REQUEST_URI']
     assert_equal '/foo', req['REQUEST_PATH']
@@ -385,7 +393,7 @@ class HttpParserTest < Test::Unit::TestCase
     assert_equal 'example.com', req['HTTP_HOST']
     assert_equal 'example.com', req['SERVER_NAME']
     assert_equal '80', req['SERVER_PORT']
-    assert_equal "", http
+    assert_equal "", parser.buf
     assert ! parser.keepalive?
   end
 
@@ -394,7 +402,7 @@ class HttpParserTest < Test::Unit::TestCase
   def test_absolute_uri_uri_parse
     "#{URI::REGEXP::PATTERN::UNRESERVED};:&=+$,".split(//).each do |char|
       parser = HttpParser.new
-      req = {}
+      req = parser.env
       http = "GET http://#{char}@example.com/ HTTP/1.0\r\n\r\n"
       assert_equal req, parser.headers(req, http)
       assert_equal 'http', req['rack.url_scheme']
@@ -412,9 +420,9 @@ class HttpParserTest < Test::Unit::TestCase
 
   def test_absolute_uri
     parser = HttpParser.new
-    req = {}
-    http = "GET http://example.com/foo?q=bar HTTP/1.0\r\n\r\n"
-    assert_equal req, parser.headers(req, http)
+    req = parser.env
+    parser.buf << "GET http://example.com/foo?q=bar HTTP/1.0\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal 'http', req['rack.url_scheme']
     assert_equal '/foo?q=bar', req['REQUEST_URI']
     assert_equal '/foo', req['REQUEST_PATH']
@@ -423,17 +431,18 @@ class HttpParserTest < Test::Unit::TestCase
     assert_equal 'example.com', req['HTTP_HOST']
     assert_equal 'example.com', req['SERVER_NAME']
     assert_equal '80', req['SERVER_PORT']
-    assert_equal "", http
+    assert_equal "", parser.buf
     assert ! parser.keepalive?
   end
 
   # X-Forwarded-Proto is not in rfc2616, absolute URIs are, however...
   def test_absolute_uri_https
     parser = HttpParser.new
-    req = {}
+    req = parser.env
     http = "GET https://example.com/foo?q=bar HTTP/1.1\r\n" \
            "X-Forwarded-Proto: http\r\n\r\n"
-    assert_equal req, parser.headers(req, http)
+    parser.buf << http
+    assert_equal req, parser.parse
     assert_equal 'https', req['rack.url_scheme']
     assert_equal '/foo?q=bar', req['REQUEST_URI']
     assert_equal '/foo', req['REQUEST_PATH']
@@ -442,17 +451,17 @@ class HttpParserTest < Test::Unit::TestCase
     assert_equal 'example.com', req['HTTP_HOST']
     assert_equal 'example.com', req['SERVER_NAME']
     assert_equal '443', req['SERVER_PORT']
-    assert_equal "", http
+    assert_equal "", parser.buf
     assert parser.keepalive?
   end
 
   # Host: header should be ignored for absolute URIs
   def test_absolute_uri_with_port
     parser = HttpParser.new
-    req = {}
-    http = "GET http://example.com:8080/foo?q=bar HTTP/1.2\r\n" \
+    req = parser.env
+    parser.buf << "GET http://example.com:8080/foo?q=bar HTTP/1.2\r\n" \
            "Host: bad.example.com\r\n\r\n"
-    assert_equal req, parser.headers(req, http)
+    assert_equal req, parser.parse
     assert_equal 'http', req['rack.url_scheme']
     assert_equal '/foo?q=bar', req['REQUEST_URI']
     assert_equal '/foo', req['REQUEST_PATH']
@@ -461,16 +470,16 @@ class HttpParserTest < Test::Unit::TestCase
     assert_equal 'example.com:8080', req['HTTP_HOST']
     assert_equal 'example.com', req['SERVER_NAME']
     assert_equal '8080', req['SERVER_PORT']
-    assert_equal "", http
+    assert_equal "", parser.buf
     assert ! parser.keepalive? # TODO: read HTTP/1.2 when it's final
   end
 
   def test_absolute_uri_with_empty_port
     parser = HttpParser.new
-    req = {}
-    http = "GET https://example.com:/foo?q=bar HTTP/1.1\r\n" \
+    req = parser.env
+    parser.buf << "GET https://example.com:/foo?q=bar HTTP/1.1\r\n" \
            "Host: bad.example.com\r\n\r\n"
-    assert_equal req, parser.headers(req, http)
+    assert_equal req, parser.parse
     assert_equal 'https', req['rack.url_scheme']
     assert_equal '/foo?q=bar', req['REQUEST_URI']
     assert_equal '/foo', req['REQUEST_PATH']
@@ -479,42 +488,192 @@ class HttpParserTest < Test::Unit::TestCase
     assert_equal 'example.com:', req['HTTP_HOST']
     assert_equal 'example.com', req['SERVER_NAME']
     assert_equal '443', req['SERVER_PORT']
+    assert_equal "", parser.buf
+    assert parser.keepalive? # TODO: read HTTP/1.2 when it's final
+  end
+
+  def test_absolute_ipv6_uri
+    parser = HttpParser.new
+    req = parser.env
+    url = "http://[::1]/foo?q=bar"
+    http = "GET #{url} HTTP/1.1\r\n" \
+           "Host: bad.example.com\r\n\r\n"
+    assert_equal req, parser.headers(req, http)
+    assert_equal 'http', req['rack.url_scheme']
+    assert_equal '/foo?q=bar', req['REQUEST_URI']
+    assert_equal '/foo', req['REQUEST_PATH']
+    assert_equal 'q=bar', req['QUERY_STRING']
+
+    uri = URI.parse(url)
+    assert_equal "[::1]", uri.host,
+                 "URI.parse changed upstream for #{url}? host=#{uri.host}"
+    assert_equal "[::1]", req['HTTP_HOST']
+    assert_equal "[::1]", req['SERVER_NAME']
+    assert_equal '80', req['SERVER_PORT']
     assert_equal "", http
     assert parser.keepalive? # TODO: read HTTP/1.2 when it's final
   end
 
-  def test_put_body_oneshot
+  def test_absolute_ipv6_uri_alpha
+    parser = HttpParser.new
+    req = parser.env
+    url = "http://[::a]/"
+    http = "GET #{url} HTTP/1.1\r\n" \
+           "Host: bad.example.com\r\n\r\n"
+    assert_equal req, parser.headers(req, http)
+    assert_equal 'http', req['rack.url_scheme']
+
+    uri = URI.parse(url)
+    assert_equal "[::a]", uri.host,
+                 "URI.parse changed upstream for #{url}? host=#{uri.host}"
+    assert_equal "[::a]", req['HTTP_HOST']
+    assert_equal "[::a]", req['SERVER_NAME']
+    assert_equal '80', req['SERVER_PORT']
+  end
+
+  def test_absolute_ipv6_uri_alpha_2
     parser = HttpParser.new
-    req = {}
-    http = "PUT / HTTP/1.0\r\nContent-Length: 5\r\n\r\nabcde"
+    req = parser.env
+    url = "http://[::B]/"
+    http = "GET #{url} HTTP/1.1\r\n" \
+           "Host: bad.example.com\r\n\r\n"
     assert_equal req, parser.headers(req, http)
+    assert_equal 'http', req['rack.url_scheme']
+
+    uri = URI.parse(url)
+    assert_equal "[::B]", uri.host,
+                 "URI.parse changed upstream for #{url}? host=#{uri.host}"
+    assert_equal "[::B]", req['HTTP_HOST']
+    assert_equal "[::B]", req['SERVER_NAME']
+    assert_equal '80', req['SERVER_PORT']
+  end
+
+  def test_absolute_ipv6_uri_with_empty_port
+    parser = HttpParser.new
+    req = parser.env
+    url = "https://[::1]:/foo?q=bar"
+    http = "GET #{url} HTTP/1.1\r\n" \
+           "Host: bad.example.com\r\n\r\n"
+    assert_equal req, parser.headers(req, http)
+    assert_equal 'https', req['rack.url_scheme']
+    assert_equal '/foo?q=bar', req['REQUEST_URI']
+    assert_equal '/foo', req['REQUEST_PATH']
+    assert_equal 'q=bar', req['QUERY_STRING']
+
+    uri = URI.parse(url)
+    assert_equal "[::1]", uri.host,
+                 "URI.parse changed upstream for #{url}? host=#{uri.host}"
+    assert_equal "[::1]:", req['HTTP_HOST']
+    assert_equal "[::1]", req['SERVER_NAME']
+    assert_equal '443', req['SERVER_PORT']
+    assert_equal "", http
+    assert parser.keepalive? # TODO: read HTTP/1.2 when it's final
+  end
+
+  def test_absolute_ipv6_uri_with_port
+    parser = HttpParser.new
+    req = parser.env
+    url = "https://[::1]:666/foo?q=bar"
+    http = "GET #{url} HTTP/1.1\r\n" \
+           "Host: bad.example.com\r\n\r\n"
+    assert_equal req, parser.headers(req, http)
+    assert_equal 'https', req['rack.url_scheme']
+    assert_equal '/foo?q=bar', req['REQUEST_URI']
+    assert_equal '/foo', req['REQUEST_PATH']
+    assert_equal 'q=bar', req['QUERY_STRING']
+
+    uri = URI.parse(url)
+    assert_equal "[::1]", uri.host,
+                 "URI.parse changed upstream for #{url}? host=#{uri.host}"
+    assert_equal "[::1]:666", req['HTTP_HOST']
+    assert_equal "[::1]", req['SERVER_NAME']
+    assert_equal '666', req['SERVER_PORT']
+    assert_equal "", http
+    assert parser.keepalive? # TODO: read HTTP/1.2 when it's final
+  end
+
+  def test_ipv6_host_header
+    parser = HttpParser.new
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\n" \
+                  "Host: [::1]\r\n\r\n"
+    assert_equal req, parser.parse
+    assert_equal "[::1]", req['HTTP_HOST']
+    assert_equal "[::1]", req['SERVER_NAME']
+    assert_equal '80', req['SERVER_PORT']
+    assert_equal "", parser.buf
+    assert parser.keepalive? # TODO: read HTTP/1.2 when it's final
+  end
+
+  def test_ipv6_host_header_with_port
+    parser = HttpParser.new
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\n" \
+                  "Host: [::1]:666\r\n\r\n"
+    assert_equal req, parser.parse
+    assert_equal "[::1]", req['SERVER_NAME']
+    assert_equal '666', req['SERVER_PORT']
+    assert_equal "[::1]:666", req['HTTP_HOST']
+    assert_equal "", parser.buf
+    assert parser.keepalive? # TODO: read HTTP/1.2 when it's final
+  end
+
+  def test_ipv6_host_header_with_empty_port
+    parser = HttpParser.new
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\nHost: [::1]:\r\n\r\n"
+    assert_equal req, parser.parse
+    assert_equal "[::1]", req['SERVER_NAME']
+    assert_equal '80', req['SERVER_PORT']
+    assert_equal "[::1]:", req['HTTP_HOST']
+    assert_equal "", parser.buf
+    assert parser.keepalive? # TODO: read HTTP/1.2 when it's final
+  end
+
+  # XXX Highly unlikely..., just make sure we don't segfault or assert on it
+  def test_broken_ipv6_host_header
+    parser = HttpParser.new
+    req = parser.env
+    parser.buf << "GET / HTTP/1.1\r\nHost: [::1:\r\n\r\n"
+    assert_equal req, parser.parse
+    assert_equal "[", req['SERVER_NAME']
+    assert_equal ':1:', req['SERVER_PORT']
+    assert_equal "[::1:", req['HTTP_HOST']
+    assert_equal "", parser.buf
+  end
+
+  def test_put_body_oneshot
+    parser = HttpParser.new
+    req = parser.env
+    parser.buf << "PUT / HTTP/1.0\r\nContent-Length: 5\r\n\r\nabcde"
+    assert_equal req, parser.parse
     assert_equal '/', req['REQUEST_PATH']
     assert_equal '/', req['REQUEST_URI']
     assert_equal 'PUT', req['REQUEST_METHOD']
     assert_equal 'HTTP/1.0', req['HTTP_VERSION']
     assert_equal 'HTTP/1.0', req['SERVER_PROTOCOL']
-    assert_equal "abcde", http
+    assert_equal "abcde", parser.buf
     assert ! parser.keepalive? # TODO: read HTTP/1.2 when it's final
   end
 
   def test_put_body_later
     parser = HttpParser.new
-    req = {}
-    http = "PUT /l HTTP/1.0\r\nContent-Length: 5\r\n\r\n"
-    assert_equal req, parser.headers(req, http)
+    req = parser.env
+    parser.buf << "PUT /l HTTP/1.0\r\nContent-Length: 5\r\n\r\n"
+    assert_equal req, parser.parse
     assert_equal '/l', req['REQUEST_PATH']
     assert_equal '/l', req['REQUEST_URI']
     assert_equal 'PUT', req['REQUEST_METHOD']
     assert_equal 'HTTP/1.0', req['HTTP_VERSION']
     assert_equal 'HTTP/1.0', req['SERVER_PROTOCOL']
-    assert_equal "", http
+    assert_equal "", parser.buf
     assert ! parser.keepalive? # TODO: read HTTP/1.2 when it's final
   end
 
   def test_unknown_methods
     %w(GETT HEADR XGET XHEAD).each { |m|
       parser = HttpParser.new
-      req = {}
+      req = parser.env
       s = "#{m} /forums/1/topics/2375?page=1#posts-17408 HTTP/1.1\r\n\r\n"
       ok = false
       assert_nothing_raised do
@@ -532,17 +691,18 @@ class HttpParserTest < Test::Unit::TestCase
 
   def test_fragment_in_uri
     parser = HttpParser.new
-    req = {}
+    req = parser.env
     get = "GET /forums/1/topics/2375?page=1#posts-17408 HTTP/1.1\r\n\r\n"
+    parser.buf << get
     ok = false
     assert_nothing_raised do
-      ok = parser.headers(req, get)
+      ok = parser.parse
     end
     assert ok
     assert_equal '/forums/1/topics/2375?page=1', req['REQUEST_URI']
     assert_equal 'posts-17408', req['FRAGMENT']
     assert_equal 'page=1', req['QUERY_STRING']
-    assert_equal '', get
+    assert_equal '', parser.buf
     assert parser.keepalive?
   end
 
@@ -568,7 +728,8 @@ class HttpParserTest < Test::Unit::TestCase
     10.times do |c|
       get = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-#{rand_data(1024, 1024+(c*1024))}: Test\r\n\r\n"
       assert_raises Unicorn::HttpParserError do
-        parser.headers({}, get)
+        parser.buf << get
+        parser.parse
         parser.clear
       end
     end
@@ -577,7 +738,8 @@ class HttpParserTest < Test::Unit::TestCase
     10.times do |c|
       get = "GET /#{rand_data(10,120)} HTTP/1.1\r\nX-Test: #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
       assert_raises Unicorn::HttpParserError do
-        parser.headers({}, get)
+        parser.buf << get
+        parser.parse
         parser.clear
       end
     end
@@ -585,16 +747,18 @@ class HttpParserTest < Test::Unit::TestCase
     # then large headers are rejected too
     get = "GET /#{rand_data(10,120)} HTTP/1.1\r\n"
     get << "X-Test: test\r\n" * (80 * 1024)
+    parser.buf << get
     assert_raises Unicorn::HttpParserError do
-      parser.headers({}, get)
-      parser.clear
+      parser.parse
     end
+    parser.clear
 
     # finally just that random garbage gets blocked all the time
     10.times do |c|
       get = "GET #{rand_data(1024, 1024+(c*1024), false)} #{rand_data(1024, 1024+(c*1024), false)}\r\n\r\n"
       assert_raises Unicorn::HttpParserError do
-        parser.headers({}, get)
+        parser.buf << get
+        parser.parse
         parser.clear
       end
     end