From: Eric Wong <e@80x24.org>
To: unicorn-public@bogomips.org
Subject: [PATCH 3/3] http_response: remove Status: header
Date: Sun, 17 Aug 2014 02:33:55 +0000 [thread overview]
Message-ID: <1408242835-21114-4-git-send-email-e@80x24.org> (raw)
In-Reply-To: <1408242835-21114-1-git-send-email-e@80x24.org>
Whatever compatibility reasons which existed in 2009 likely do not exist
now. Other servers (e.g. thin, puma) seem to work alright without it,
so there's no reason to waste precious bytes.
---
lib/unicorn/http_response.rb | 4 +---
test/unit/test_response.rb | 6 ------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/lib/unicorn/http_response.rb b/lib/unicorn/http_response.rb
index 083951c..cc027c5 100644
--- a/lib/unicorn/http_response.rb
+++ b/lib/unicorn/http_response.rb
@@ -24,14 +24,12 @@ module Unicorn::HttpResponse
# writes the rack_response to socket as an HTTP response
def http_response_write(socket, status, headers, body,
response_start_sent=false)
- status = CODES[status.to_i] || status
hijack = nil
http_response_start = response_start_sent ? '' : 'HTTP/1.1 '
if headers
- buf = "#{http_response_start}#{status}\r\n" \
+ buf = "#{http_response_start}#{CODES[status.to_i] || status}\r\n" \
"Date: #{httpdate}\r\n" \
- "Status: #{status}\r\n" \
"Connection: close\r\n"
headers.each do |key, value|
case key
diff --git a/test/unit/test_response.rb b/test/unit/test_response.rb
index 85ac085..fcddc5e 100644
--- a/test/unit/test_response.rb
+++ b/test/unit/test_response.rb
@@ -38,7 +38,6 @@ class ResponseTest < Test::Unit::TestCase
http_response_write(out,'200', {}, [])
assert ! out.closed?
assert out.length > 0, "output didn't have data"
- assert_equal 1, out.string.split(/\r\n/).grep(/^Status: 200 OK/).size
end
def test_response_200
@@ -71,7 +70,6 @@ class ResponseTest < Test::Unit::TestCase
out = StringIO.new
http_response_write(out,200, {"X-Whatever" => "stuff"}, [])
assert ! out.closed?
- assert_equal 1, out.string.split(/\r\n/).grep(/^Status: 200 OK/i).size
end
def test_body_closed
@@ -91,9 +89,5 @@ class ResponseTest < Test::Unit::TestCase
assert ! out.closed?
headers = out.string.split(/\r\n\r\n/).first.split(/\r\n/)
assert %r{\AHTTP/\d\.\d 666 I AM THE BEAST\z}.match(headers[0])
- status = headers.grep(/\AStatus:/i).first
- assert status
- assert_equal "Status: 666 I AM THE BEAST", status
end
-
end
--
EW
prev parent reply other threads:[~2014-08-17 2:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-17 2:33 more house-cleaning for unicorn 5 Eric Wong
2014-08-17 2:33 ` [PATCH 1/3] dev: remove isolate dependency Eric Wong
2014-08-17 2:33 ` [PATCH 2/3] unicorn.gemspec: depend on test-unit 3.0 Eric Wong
2014-08-17 2:33 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/unicorn/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408242835-21114-4-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=unicorn-public@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/unicorn.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).