Merge pull request jaswope#5 from waterlink/ekosz/fix/double-status

[FIX] Capitalize headers correctly

Author: waterlink

lib/rack/reverse_proxy.rb

@@ -13,7 +13,7 @@ def initialize(app = nil, &b)
       @app = app || lambda {|env| [404, [], []] }
       @matchers = []
       @global_options = {:preserve_host => true, :x_forwarded_host => true, :matching => :all, :replace_response_host => false}
-      instance_eval &b if block_given?
+      instance_eval(&b) if block_given?
     end
 
     def call(env)
@@ -82,15 +82,15 @@ def proxy(env, source_request, matcher)
       target_response.use_ssl = "https" == uri.scheme
 
       # Let rack set the transfer-encoding header
-      response_headers = target_response.headers
-      response_headers.delete('transfer-encoding')
+      response_headers = format_headers(target_response.headers)
+      response_headers.delete('Transfer-Encoding')
 
       # Replace the location header with the proxy domain
-      if response_headers['location'] && options[:replace_response_host]
-        response_location = URI(response_headers['location'][0])
+      if response_headers['Location'] && options[:replace_response_host]
+        response_location = URI(response_headers['Location'][0])
         response_location.host = source_request.host
         response_location.port = source_request.port
-        response_headers['location'] = response_location.to_s
+        response_headers['Location'] = response_location.to_s
       end
 
       [target_response.status, response_headers, target_response.body]
@@ -138,5 +138,13 @@ def reverse_proxy(matcher, url=nil, opts={})
       raise GenericProxyURI.new(url) if matcher.is_a?(String) && url.is_a?(String) && URI(url).class == URI::Generic
       @matchers << ReverseProxyMatcher.new(matcher,url,opts)
     end
+
+    def format_headers(headers)
+      headers.reduce({}) do |acc, (key, val)|
+        formated_key = key.split('-').map(&:capitalize).join('-')
+        acc[formated_key] = Array(val)
+	acc
+      end
+    end
   end
 end

spec/rack/reverse_proxy_spec.rb

@@ -49,6 +49,26 @@ def app
       a_request(:get, 'http://example.com/test/stuff').with(:headers => {'X-Forwarded-Host' => 'example.org'}).should have_been_made
     end
 
+    it 'should format the headers correctly to avoid duplicates' do
+      stub_request(:get, 'http://example.com/2test').to_return({:status => 301, :headers => {:status => '301 Moved Permanently'}})
+
+      get '/2test'
+
+      headers = last_response.headers.to_hash
+      headers['Status'].should == "301 Moved Permanently"
+      headers['status'].should be_nil
+    end
+
+    it 'should format the headers with dashes correctly' do
+      stub_request(:get, 'http://example.com/2test').to_return({:status => 301, :headers => {:status => '301 Moved Permanently', :"x-additional-info" => "something"}})
+
+      get '/2test'
+
+      headers = last_response.headers.to_hash
+      headers['X-Additional-Info'].should == "something"
+      headers['x-additional-info'].should be_nil
+    end
+
     describe "with non-default port" do
       def app
         Rack::ReverseProxy.new(dummy_app) do
@@ -162,7 +182,7 @@ def app
         Rack::ReverseProxy.new(dummy_app) do
           reverse_proxy_options :matching => :all
           reverse_proxy '/test', 'http://example.com/'
-          reverse_proxy /^\/test/, 'http://example.com/'
+          reverse_proxy(/^\/test/, 'http://example.com/')
         end
       end
 
@@ -176,7 +196,7 @@ def app
         Rack::ReverseProxy.new(dummy_app) do
           reverse_proxy_options :matching => :first
           reverse_proxy '/test', 'http://example1.com/'
-          reverse_proxy /^\/test/, 'http://example2.com/'
+          reverse_proxy(/^\/test/, 'http://example2.com/')
         end
       end