From fd1ec829c8c941143c8ae70b18e51838bc51da73 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 18 Jun 2010 06:47:52 +0000
Subject: avoid needless HeaderHash#to_hash calls

HeaderHash objects can only be used as headers without
violating Rack::Lint in Rack 1.1.0 or later.
---
 lib/rainbows/dev_fd_response.rb       | 4 ++--
 lib/rainbows/event_machine.rb         | 4 ++--
 lib/rainbows/rev/deferred_response.rb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/rainbows/dev_fd_response.rb b/lib/rainbows/dev_fd_response.rb
index bab35bc..479a668 100644
--- a/lib/rainbows/dev_fd_response.rb
+++ b/lib/rainbows/dev_fd_response.rb
@@ -40,7 +40,7 @@ module Rainbows
         # we need to make sure our pipe output is Fiber-compatible
         case env["rainbows.model"]
         when :FiberSpawn, :FiberPool, :RevFiberSpawn
-          return [ status, headers.to_hash, Fiber::IO.new(io,::Fiber.current) ]
+          return [ status, headers, Fiber::IO.new(io,::Fiber.current) ]
         end
       else # unlikely, char/block device file, directory, ...
         return response
@@ -48,7 +48,7 @@ module Rainbows
       resp = dup # be reentrant here
       resp.to_path = "/dev/fd/#{io.fileno}"
       resp.to_io = io
-      [ status, headers.to_hash, resp ]
+      [ status, headers, resp ]
     end
 
     # called by the webserver or other middlewares if they can't
diff --git a/lib/rainbows/event_machine.rb b/lib/rainbows/event_machine.rb
index e5560d3..6ba536b 100644
--- a/lib/rainbows/event_machine.rb
+++ b/lib/rainbows/event_machine.rb
@@ -118,7 +118,7 @@ module Rainbows
         if st.file?
           headers.delete('Transfer-Encoding')
           headers['Content-Length'] ||= st.size.to_s
-          response = [ response[0], headers.to_hash, [] ]
+          response = [ response[0], headers, [] ]
           HttpResponse.write(self, response, out)
           stream = stream_file_data(body.to_path)
           stream.callback { quit } unless alive
@@ -130,7 +130,7 @@ module Rainbows
           else
             out[0] = CONN_CLOSE
           end
-          response = [ response[0], headers.to_hash, [] ]
+          response = [ response[0], headers, [] ]
           HttpResponse.write(self, response, out)
           if do_chunk
             EM.watch(io, ResponseChunkPipe, self).notify_readable = true
diff --git a/lib/rainbows/rev/deferred_response.rb b/lib/rainbows/rev/deferred_response.rb
index 62a308c..fd7a499 100644
--- a/lib/rainbows/rev/deferred_response.rb
+++ b/lib/rainbows/rev/deferred_response.rb
@@ -42,7 +42,7 @@ module Rainbows
         end
         client.defer_body(io, out)
         out.nil? or
-          client.write(HttpResponse.header_string(status, headers.to_hash, out))
+          client.write(HttpResponse.header_string(status, headers, out))
       end
 
       def initialize(io, client, do_chunk, body)
-- 
cgit v1.2.3-24-ge0c7