return correct content-length when response includes multibyte charac…

…ters
rack · Dec 7, 2017 · 967f5ae · 967f5ae
1 parent 40b0842
commit 967f5ae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/rack/contrib/not_found.rb b/lib/rack/contrib/not_found.rb
@@ -19,7 +19,7 @@ def initialize(path = nil, content_type = 'text/html')
       else
         @content = F.read(path)
       end
-      @length = @content.size.to_s
+      @length = @content.bytesize.to_s
 
       @content_type = content_type
     end

diff --git a/test/spec_rack_not_found.rb b/test/spec_rack_not_found.rb
@@ -1,6 +1,7 @@
 require 'minitest/autorun'
 require 'rack/mock'
 require 'rack/contrib/not_found'
+require 'tempfile'
 
 describe "Rack::NotFound" do
 
@@ -40,4 +41,18 @@
     response.status.must_equal(404)
   end
 
+  specify "should return correct size" do
+    Tempfile.open('test') do |f|
+      f.write '<!DOCTYPE html>'
+      f.write '<meta charset=utf-8>'
+      f.write '☃ snowman'
+      f.close
+      app = Rack::Builder.new do
+        use Rack::Lint
+        run Rack::NotFound.new(f.path)
+      end
+      response = Rack::MockRequest.new(app).get('/')
+      response.headers['Content-Length'].must_equal('46')
+    end
+  end
 end