Revert "Lower-case all reseponse headers from Sprockets::Server"

This reverts commit cdab3b8.

The lower-case response header in Rack 3 is incompatible with Rack 2.
Since Sprockets don't support Rack 3 yet, it is better to keep the
behavior compatible with Rack 2.

Fix #746.

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprockets/blob/master/UPGRADING.md
 
+- Fix `Sprockets::Server` to return response headers to compatible with with Rack::Lint 2.0.
+
 ## 4.1.0
 
 - Allow age to be altered in asset:clean rake task.

lib/sprockets/server.rb

@@ -148,39 +148,39 @@ def not_modified_response(env, etag)
       # Returns a 400 Forbidden response tuple
       def bad_request_response(env)
         if head_request?(env)
-          [ 400, { "content-type" => "text/plain", "content-length" => "0" }, [] ]
+          [ 400, { "Content-Type" => "text/plain", "Content-Length" => "0" }, [] ]
         else
-          [ 400, { "content-type" => "text/plain", "content-length" => "11" }, [ "Bad Request" ] ]
+          [ 400, { "Content-Type" => "text/plain", "Content-Length" => "11" }, [ "Bad Request" ] ]
         end
       end
 
       # Returns a 403 Forbidden response tuple
       def forbidden_response(env)
         if head_request?(env)
-          [ 403, { "content-type" => "text/plain", "content-length" => "0" }, [] ]
+          [ 403, { "Content-Type" => "text/plain", "Content-Length" => "0" }, [] ]
         else
-          [ 403, { "content-type" => "text/plain", "content-length" => "9" }, [ "Forbidden" ] ]
+          [ 403, { "Content-Type" => "text/plain", "Content-Length" => "9" }, [ "Forbidden" ] ]
         end
       end
 
       # Returns a 404 Not Found response tuple
       def not_found_response(env)
         if head_request?(env)
-          [ 404, { "content-type" => "text/plain", "content-length" => "0", "x-cascade" => "pass" }, [] ]
+          [ 404, { "Content-Type" => "text/plain", "Content-Length" => "0", "X-Cascade" => "pass" }, [] ]
         else
-          [ 404, { "content-type" => "text/plain", "content-length" => "9", "x-cascade" => "pass" }, [ "Not found" ] ]
+          [ 404, { "Content-Type" => "text/plain", "Content-Length" => "9", "X-Cascade" => "pass" }, [ "Not found" ] ]
         end
       end
 
       def method_not_allowed_response
-        [ 405, { "content-type" => "text/plain", "content-length" => "18" }, [ "Method Not Allowed" ] ]
+        [ 405, { "Content-Type" => "text/plain", "Content-Length" => "18" }, [ "Method Not Allowed" ] ]
       end
 
       def precondition_failed_response(env)
         if head_request?(env)
-          [ 412, { "content-type" => "text/plain", "content-length" => "0", "x-cascade" => "pass" }, [] ]
+          [ 412, { "Content-Type" => "text/plain", "Content-Length" => "0", "X-Cascade" => "pass" }, [] ]
         else
-          [ 412, { "content-type" => "text/plain", "content-length" => "19", "x-cascade" => "pass" }, [ "Precondition Failed" ] ]
+          [ 412, { "Content-Type" => "text/plain", "Content-Length" => "19", "X-Cascade" => "pass" }, [ "Precondition Failed" ] ]
         end
       end
 
@@ -189,7 +189,7 @@ def precondition_failed_response(env)
       def javascript_exception_response(exception)
         err  = "#{exception.class.name}: #{exception.message}\n  (in #{exception.backtrace[0]})"
         body = "throw Error(#{err.inspect})"
-        [ 200, { "content-type" => "application/javascript", "content-length" => body.bytesize.to_s }, [ body ] ]
+        [ 200, { "Content-Type" => "application/javascript", "Content-Length" => body.bytesize.to_s }, [ body ] ]
       end
 
       # Returns a CSS response that hides all elements on the page and
@@ -242,7 +242,7 @@ def css_exception_response(exception)
           }
         CSS
 
-        [ 200, { "content-type" => "text/css; charset=utf-8", "content-length" => body.bytesize.to_s }, [ body ] ]
+        [ 200, { "Content-Type" => "text/css; charset=utf-8", "Content-Length" => body.bytesize.to_s }, [ body ] ]
       end
 
       # Escape special characters for use inside a CSS content("...") string
@@ -258,18 +258,18 @@ def cache_headers(env, etag)
         headers = {}
 
         # Set caching headers
-        headers["cache-control"] = +"public"
-        headers["etag"]          = %("#{etag}")
+        headers["Cache-Control"] = +"public"
+        headers["ETag"]          = %("#{etag}")
 
         # If the request url contains a fingerprint, set a long
         # expires on the response
         if path_fingerprint(env["PATH_INFO"])
-          headers["cache-control"] << ", max-age=31536000, immutable"
+          headers["Cache-Control"] << ", max-age=31536000, immutable"
 
         # Otherwise set `must-revalidate` since the asset could be modified.
         else
-          headers["cache-control"] << ", must-revalidate"
-          headers["vary"] = "Accept-Encoding"
+          headers["Cache-Control"] << ", must-revalidate"
+          headers["Vary"] = "Accept-Encoding"
         end
 
         headers
@@ -279,15 +279,15 @@ def headers(env, asset, length)
         headers = {}
 
         # Set content length header
-        headers["content-length"] = length.to_s
+        headers["Content-Length"] = length.to_s
 
         # Set content type header
         if type = asset.content_type
           # Set charset param for text/* mime types
           if type.start_with?("text/") && asset.charset
             type += "; charset=#{asset.charset}"
           end
-          headers["content-type"] = type
+          headers["Content-Type"] = type
         end
 
         headers.merge(cache_headers(env, asset.etag))

test/test_server.rb

@@ -36,15 +36,15 @@ def app
   test "serve single source file" do
     get "/assets/foo.js"
     assert_equal 200, last_response.status
-    assert_equal "9", last_response.headers['content-length']
-    assert_equal "Accept-Encoding", last_response.headers['vary']
+    assert_equal "9", last_response.headers['Content-Length']
+    assert_equal "Accept-Encoding", last_response.headers['Vary']
     assert_equal "var foo;\n", last_response.body
   end
 
   test "serve single self file" do
     get "/assets/foo.self.js"
     assert_equal 200, last_response.status
-    assert_equal "9", last_response.headers['content-length']
+    assert_equal "9", last_response.headers['Content-Length']
     assert_equal "var foo;\n", last_response.body
   end
 
@@ -64,30 +64,30 @@ def app
     assert_equal 200, last_response.status
     assert_equal "\n(function() {\n  application.boot();\n})();\n",
       last_response.body
-    assert_equal "43", last_response.headers['content-length']
+    assert_equal "43", last_response.headers['Content-Length']
   end
 
   test "serve source with content type headers" do
     get "/assets/application.js"
-    assert_equal "application/javascript", last_response.headers['content-type']
+    assert_equal "application/javascript", last_response.headers['Content-Type']
 
     get "/assets/bootstrap.css"
-    assert_equal "text/css; charset=utf-8", last_response.headers['content-type']
+    assert_equal "text/css; charset=utf-8", last_response.headers['Content-Type']
   end
 
   test "serve source with etag headers" do
     digest = @env['application.js'].etag
 
     get "/assets/application.js"
     assert_equal "\"#{digest}\"",
-      last_response.headers['etag']
+      last_response.headers['ETag']
   end
 
   test "not modified partial response when if-none-match etags match" do
     get "/assets/application.js"
     assert_equal 200, last_response.status
     etag, cache_control, expires, vary = last_response.headers.values_at(
-      'etag', 'cache-control', 'Expires', 'vary'
+      'ETag', 'Cache-Control', 'Expires', 'Vary'
     )
 
     assert_nil expires
@@ -97,14 +97,14 @@ def app
     assert_equal 304, last_response.status
 
     # Allow 304 headers
-    assert_equal cache_control, last_response.headers['cache-control']
-    assert_equal etag, last_response.headers['etag']
+    assert_equal cache_control, last_response.headers['Cache-Control']
+    assert_equal etag, last_response.headers['ETag']
     assert_nil last_response.headers['Expires']
-    assert_equal vary, last_response.headers['vary']
+    assert_equal vary, last_response.headers['Vary']
 
     # Disallowed 304 headers
-    refute last_response.headers['content-type']
-    refute last_response.headers['content-length']
+    refute last_response.headers['Content-Type']
+    refute last_response.headers['Content-Length']
     refute last_response.headers['Content-Encoding']
   end
 
@@ -113,15 +113,15 @@ def app
       'HTTP_IF_NONE_MATCH' => "nope"
 
     assert_equal 200, last_response.status
-    assert_equal '"b452c9ae1d5c8d9246653e0d93bc83abce0ee09ef725c0f0a29a41269c217b83"', last_response.headers['etag']
-    assert_equal '52', last_response.headers['content-length']
+    assert_equal '"b452c9ae1d5c8d9246653e0d93bc83abce0ee09ef725c0f0a29a41269c217b83"', last_response.headers['ETag']
+    assert_equal '52', last_response.headers['Content-Length']
   end
 
   test "not modified partial response with fingerprint and if-none-match etags match" do
     get "/assets/application.js"
     assert_equal 200, last_response.status
 
-    etag   = last_response.headers['etag']
+    etag   = last_response.headers['ETag']
     digest = etag[/"(.+)"/, 1]
 
     get "/assets/application-#{digest}.js", {},
@@ -133,7 +133,7 @@ def app
     get "/assets/prehashed-988881adc9fc3655077dc2d4d757d480b5ea0e11.js"
     assert_equal 200, last_response.status
 
-    etag = last_response.headers['etag']
+    etag = last_response.headers['ETag']
     digest = etag[/"(.+)"/, 1]
 
     assert_equal 'edabfd0f1ac5fcdae82cc7d92d1c52abb671797a3948fa9040aec1db8e61c327', digest
@@ -153,7 +153,7 @@ def app
     get "/assets/application.js"
     assert_equal 200, last_response.status
 
-    etag   = last_response.headers['etag']
+    etag   = last_response.headers['ETag']
     digest = etag[/"(.+)"/, 1]
 
     get "/assets/application-#{digest}.js", {},
@@ -177,7 +177,7 @@ def app
     get "/assets/application.js"
     assert_equal 200, last_response.status
 
-    etag = last_response.headers['etag']
+    etag = last_response.headers['ETag']
 
     get "/assets/application-0000000000000000000000000000000000000000.js", {},
       'HTTP_IF_NONE_MATCH' => etag
@@ -187,22 +187,22 @@ def app
   test "ok partial response when if-match etags match" do
     get "/assets/application.js"
     assert_equal 200, last_response.status
-    etag = last_response.headers['etag']
+    etag = last_response.headers['ETag']
 
     get "/assets/application.js", {},
       'HTTP_IF_MATCH' => etag
 
     assert_equal 200, last_response.status
-    assert_equal '"b452c9ae1d5c8d9246653e0d93bc83abce0ee09ef725c0f0a29a41269c217b83"', last_response.headers['etag']
-    assert_equal '52', last_response.headers['content-length']
+    assert_equal '"b452c9ae1d5c8d9246653e0d93bc83abce0ee09ef725c0f0a29a41269c217b83"', last_response.headers['ETag']
+    assert_equal '52', last_response.headers['Content-Length']
   end
 
   test "precondition failed with if-match is a mismatch" do
     get "/assets/application.js", {},
       'HTTP_IF_MATCH' => '"000"'
     assert_equal 412, last_response.status
 
-    refute last_response.headers['etag']
+    refute last_response.headers['ETag']
   end
 
   test "not found with if-match" do
@@ -225,23 +225,23 @@ def app
 
   test "fingerprint digest sets expiration to the future" do
     get "/assets/application.js"
-    digest = last_response.headers['etag'][/"(.+)"/, 1]
+    digest = last_response.headers['ETag'][/"(.+)"/, 1]
 
     get "/assets/application-#{digest}.js"
     assert_equal 200, last_response.status
-    assert_match %r{max-age}, last_response.headers['cache-control']
-    assert_match %r{immutable}, last_response.headers['cache-control']
+    assert_match %r{max-age}, last_response.headers['Cache-Control']
+    assert_match %r{immutable}, last_response.headers['Cache-Control']
   end
 
   test "fingerprint digest of file self" do
     get "/assets/application.self.js"
-    digest = last_response.headers['etag'][/"(.+)"/, 1]
+    digest = last_response.headers['ETag'][/"(.+)"/, 1]
 
     get "/assets/application.self-#{digest}.js"
     assert_equal 200, last_response.status
     assert_equal "\n(function() {\n  application.boot();\n})();\n", last_response.body
-    assert_equal "43", last_response.headers['content-length']
-    assert_match %r{max-age}, last_response.headers['cache-control']
+    assert_equal "43", last_response.headers['Content-Length']
+    assert_match %r{max-age}, last_response.headers['Cache-Control']
   end
 
   test "bad fingerprint digest returns a 404" do
@@ -250,14 +250,14 @@ def app
 
     head "/assets/application-0000000000000000000000000000000000000000.js"
     assert_equal 404, last_response.status
-    assert_equal "0", last_response.headers['content-length']
+    assert_equal "0", last_response.headers['Content-Length']
     assert_equal "", last_response.body
   end
 
   test "missing source" do
     get "/assets/none.js"
     assert_equal 404, last_response.status
-    assert_equal "pass", last_response.headers['x-cascade']
+    assert_equal "pass", last_response.headers['X-Cascade']
   end
 
   test "re-throw JS exceptions in the browser" do
@@ -302,7 +302,7 @@ def app
 
     head "/assets/.-0000000./etc/passwd"
     assert_equal 403, last_response.status
-    assert_equal "0", last_response.headers['content-length']
+    assert_equal "0", last_response.headers['Content-Length']
     assert_equal "", last_response.body
   end
 
@@ -336,7 +336,7 @@ def app
   test "serving static assets" do
     get "/assets/logo.png"
     assert_equal 200, last_response.status
-    assert_equal "image/png", last_response.headers['content-type']
+    assert_equal "image/png", last_response.headers['Content-Type']
     refute last_response.headers['Content-Encoding']
     assert_equal File.binread(fixture_path("server/app/images/logo.png")), last_response.body
   end
@@ -347,8 +347,8 @@ def app
 
     head "/assets/foo.js"
     assert_equal 200, last_response.status
-    assert_equal "application/javascript", last_response.headers['content-type']
-    assert_equal "0", last_response.headers['content-length']
+    assert_equal "application/javascript", last_response.headers['Content-Type']
+    assert_equal "0", last_response.headers['Content-Length']
     assert_equal "", last_response.body
 
     post "/assets/foo.js"