Merge pull request #628 from nateberkopec/version-header-fix

Fix Version header

Author: nateberkopec

lib/raven/integrations/rack.rb

@@ -101,7 +101,7 @@ def format_headers_for_sentry(env_hash)
         # env['SERVER_PROTOCOL']. But we don't want to ignore a valid header
         # if the request has legitimately sent a Version header themselves.
         # See: https://github.com/rack/rack/blob/028438f/lib/rack/handler/cgi.rb#L29
-        next if key == 'HTTP_VERSION' && value == ENV['SERVER_PROTOCOL']
+        next if key == 'HTTP_VERSION' && value == env_hash['SERVER_PROTOCOL']
 
         next unless key.start_with?('HTTP_') || %w(CONTENT_TYPE CONTENT_LENGTH).include?(key)
         # Rack stores headers as HTTP_WHAT_EVER, we need What-Ever

spec/raven/integrations/rack_spec.rb

@@ -84,6 +84,25 @@
     stack.call(env)
   end
 
+  it 'transforms headers to conform with the interface' do
+    env = { "SERVER_PROTOCOL" => "HTTP/1.1", "HTTP_FOO" => "BAR", "HTTP_VERSION" => "HTTP/1.1" }
+
+    interface = Raven::HttpInterface.new
+    interface.from_rack(env)
+
+    expect(interface.headers["Foo"]).to eq("BAR")
+    expect(interface.headers["Version"]).to be_nil
+  end
+
+  it 'does not ignore version headers which do not match SERVER_PROTOCOL' do
+    env = { "SERVER_PROTOCOL" => "HTTP/1.1", "HTTP_VERSION" => "HTTP/2.0" }
+
+    interface = Raven::HttpInterface.new
+    interface.from_rack(env)
+
+    expect(interface.headers["Version"]).to eq("HTTP/2.0")
+  end
+
   it 'should pass rack/lint' do
     env = Rack::MockRequest.env_for("/test")