about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-12-30 02:32:41 +0000
committerEric Wong <normalperson@yhbt.net>2010-12-30 02:32:41 +0000
commit6183611108c571dbed29dfe2854b9f06757fd27f (patch)
treea3f03284546e6019133989ae02d9bf557c18218b
parent3a2634f3f68f6b8ea1aa7b2bb5944884bbfa8017 (diff)
downloadunicorn-6183611108c571dbed29dfe2854b9f06757fd27f.tar.gz
It's a minor garbage reduction, but nobody uses "$,", and
if they did, they'd break things in the Ruby standard library
as well as Rack, so let anybody who uses "$," shoot themselves
in the foot.
-rw-r--r--lib/unicorn/http_response.rb2
-rw-r--r--test/unit/test_response.rb12
2 files changed, 1 insertions, 13 deletions
diff --git a/lib/unicorn/http_response.rb b/lib/unicorn/http_response.rb
index ccf7110..2d13863 100644
--- a/lib/unicorn/http_response.rb
+++ b/lib/unicorn/http_response.rb
@@ -32,7 +32,7 @@ module Unicorn::HttpResponse
         next if %r{\A(?:Date\z|Status\z|Connection\z)}i =~ key
         if value =~ /\n/
           # avoiding blank, key-only cookies with /\n+/
-          buf << value.split(/\n+/).map! { |v| "#{key}: #{v}\r\n" }.join('')
+          buf << value.split(/\n+/).map! { |v| "#{key}: #{v}\r\n" }.join
         else
           buf << "#{key}: #{value}\r\n"
         end
diff --git a/test/unit/test_response.rb b/test/unit/test_response.rb
index e5245e8..7dcf977 100644
--- a/test/unit/test_response.rb
+++ b/test/unit/test_response.rb
@@ -29,18 +29,6 @@ class ResponseTest < Test::Unit::TestCase
     assert_equal 1, out.string.split(/\r\n/).grep(/^Status: 200 OK/).size
   end
 
-  def test_response_OFS_set
-    old_ofs = $,
-    $, = "\f\v"
-    out = StringIO.new
-    http_response_write(out,[200, {"X-k" => "cd","X-y" => "z"}, ["cool"]])
-    assert out.closed?
-    resp = out.string
-    assert ! resp.include?("\f\v"), "output didn't use $, ($OFS)"
-    ensure
-      $, = old_ofs
-  end
-
   def test_response_200
     io = StringIO.new
     http_response_write(io, [200, {}, []])