github-migration
/
rack-livereload
1
0
Fork 0
Code Issues 11 Pull Requests 4 Packages Projects Releases Wiki Activity

Merge pull request #30 from pdf/dont_mess_with_chunk_endcoded 

Don't force iterating chunked (streamed) responses
This commit is contained in:
John Bintz 2013-03-19 06:31:40 -07:00
parent c1415c32cb 6b93954231
commit 306e5cd275
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/rack/livereload.rb
View File

@ -59,7 +59,11 @@ module Rack
else
status, headers, body = result = @app.call(env)
return result if headers['Content-Type'] and headers['Content-Type']['text/event-stream']
if (headers['Content-Type'] and headers['Content-Type']['text/event-stream']) or
headers['Transfer-Encoding'] == 'chunked' or
headers['Content-Disposition'] =~ %r{^inline}
return result
end
body.close if body.respond_to?(:close)

30
spec/rack/livereload_spec.rb
View File

@ -79,6 +79,36 @@ describe Rack::LiveReload do
end
end
context 'chunked response' do
let(:body) { [ '<head></head>' ] }
let(:ret) { [ 200, { 'Transfer-Encoding' => 'chunked' }, body ] }
before do
app.stubs(:call).with(env).returns(ret)
body.expects(:close).never
body.stubs(:respond_to?).with(:close).returns(true)
end
it 'should pass through' do
middleware.call(env).should == ret
end
end
context 'inline disposition' do
let(:body) { [ '<head></head>' ] }
let(:ret) { [ 200, { 'Content-Disposition' => 'inline; filename=my_inlined_file' }, body ] }
before do
app.stubs(:call).with(env).returns(ret)
body.expects(:close).never
body.stubs(:respond_to?).with(:close).returns(true)
end
it 'should pass through' do
middleware.call(env).should == ret
end
end
context 'unknown Content-Type' do
let(:ret) { [ 200, {}, [ 'hey ho' ] ] }