Send Etag header in 304 response, according to HTTP 1.1 specs

skinandbones · Feb 6, 2011 · 31539eb · 31539eb
1 parent bc1b73f
commit 31539eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/rack/gridfs/endpoint/base.rb b/lib/rack/gridfs/endpoint/base.rb
@@ -33,7 +33,7 @@ def gridfs_request(id, request)
           grid = Mongo::GridFileSystem.new(db)
           file = grid.open(id, 'r')
           if request.env['If-None-Match'] == file.files_id.to_s || request.env['If-Modified-Since'] == file.upload_date.httpdate
-            [304, {'Content-Type' => 'text/plain'}, ['Not modified']]
+            [304, {'Content-Type' => 'text/plain', 'Etag' => file.files_id.to_s}, ['Not modified']]
           else
             [200, headers(file), [file.read]]
           end

diff --git a/test/gridfs_test.rb b/test/gridfs_test.rb
@@ -160,6 +160,7 @@ def app; setup_app end
         gridfile = Mongo::Grid.new(db).get(image_id)
         get "/gridfs/3wolfmoon.jpg", nil, {'If-Modified-Since' => gridfile.upload_date.httpdate}
         assert_equal 304, last_response.status
+        assert_equal gridfile.files_id.to_s, last_response.headers['Etag']
       end
     end