From 62c844e343978f233e4f2567fb344411c39e263c Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 5 Jan 2011 14:06:00 -0800
Subject: http_parser: add clear method, deprecate reset

But allows small optimizations to be made to avoid
constant/instance variable lookups later :)
---
 test/unit/test_http_parser.rb    | 12 ++++++------
 test/unit/test_http_parser_ng.rb |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/test/unit/test_http_parser.rb b/test/unit/test_http_parser.rb
index a11740d..9da43c9 100644
--- a/test/unit/test_http_parser.rb
+++ b/test/unit/test_http_parser.rb
@@ -28,7 +28,7 @@ class HttpParserTest < Test::Unit::TestCase
     assert_equal '', req['QUERY_STRING']
 
     assert parser.keepalive?
-    parser.reset
+    parser.clear
     req.clear
 
     http = "G"
@@ -326,7 +326,7 @@ class HttpParserTest < Test::Unit::TestCase
     assert_raises(HttpParserError) { parser.headers(req, bad_http) }
 
     # make sure we can recover
-    parser.reset
+    parser.clear
     req.clear
     assert_equal req, parser.headers(req, "GET / HTTP/1.0\r\n\r\n")
     assert ! parser.keepalive?
@@ -569,7 +569,7 @@ class HttpParserTest < Test::Unit::TestCase
       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.reset
+        parser.clear
       end
     end
 
@@ -578,7 +578,7 @@ class HttpParserTest < Test::Unit::TestCase
       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.reset
+        parser.clear
       end
     end
 
@@ -587,7 +587,7 @@ class HttpParserTest < Test::Unit::TestCase
     get << "X-Test: test\r\n" * (80 * 1024)
     assert_raises Unicorn::HttpParserError do
       parser.headers({}, get)
-      parser.reset
+      parser.clear
     end
 
     # finally just that random garbage gets blocked all the time
@@ -595,7 +595,7 @@ class HttpParserTest < Test::Unit::TestCase
       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.reset
+        parser.clear
       end
     end
 
diff --git a/test/unit/test_http_parser_ng.rb b/test/unit/test_http_parser_ng.rb
index e080d9c..b60afdf 100644
--- a/test/unit/test_http_parser_ng.rb
+++ b/test/unit/test_http_parser_ng.rb
@@ -91,7 +91,7 @@ class HttpParserNgTest < Test::Unit::TestCase
       @parser.parse
     end
     assert @parser.keepalive?
-    @parser.reset
+    @parser.clear
     assert ! @parser.keepalive?
     assert ! @parser.next?
   end
@@ -491,7 +491,7 @@ class HttpParserNgTest < Test::Unit::TestCase
     }.each do |uri,expect|
       assert_equal req, @parser.headers(req.clear, str % [ uri ])
       req = req.dup
-      @parser.reset
+      @parser.clear
       assert_equal uri, req["REQUEST_URI"], "REQUEST_URI mismatch"
       assert_equal expect[qs], req[qs], "#{qs} mismatch"
       assert_equal expect[pi], req[pi], "#{pi} mismatch"
@@ -516,7 +516,7 @@ class HttpParserNgTest < Test::Unit::TestCase
     }.each do |uri,expect|
       assert_equal req, @parser.headers(req.clear, str % [ uri ])
       req = req.dup
-      @parser.reset
+      @parser.clear
       assert_equal uri, req["REQUEST_URI"], "REQUEST_URI mismatch"
       assert_equal "example.com", req["HTTP_HOST"], "Host: mismatch"
       assert_equal expect[qs], req[qs], "#{qs} mismatch"
-- 
cgit v1.2.3-24-ge0c7