@@ -8,10 +8,7 @@ class SimpleAdapter body = ["hello!"] [ 200, - { - 'Content-Type' => 'text/plain', - 'Content-Length' => body.join.size.to_s, - }, + { 'Content-Type' => 'text/plain' }, body ] end example/adapter.rb @@ -15,10 +15,7 @@ app = proc do |env| [ 200, # Status code - { - 'Content-Type' => 'text/html', # Reponse headers - 'Content-Length' => body.join.size.to_s - }, + { 'Content-Type' => 'text/html' }, # Reponse headers body # Body of the response ] end example/config.ru @@ -5,6 +5,10 @@ module Thin # This class is instanciated by EventMachine on each new connection # that is opened. class Connection < EventMachine::Connection + CONTENT_LENGTH = 'Content-Length'.freeze + TRANSFER_ENCODING = 'Transfer-Encoding'.freeze + CHUNKED_REGEXP = /\bchunked\b/i.freeze + include Logging # Rack application (adapter) served by this connection. @@ -66,6 +70,9 @@ module Thin def post_process(result) return unless result + # Set the Content-Length header if possible + set_content_length(result) if need_content_length?(result) + @response.status, @response.headers, @response.body = result # Make the response persistent if requested by the client @@ -142,5 +149,29 @@ module Thin def socket_address Socket.unpack_sockaddr_in(get_peername)[1] end + + private + def need_content_length?(result) + status, headers, body = result + return false if headers.has_key?(CONTENT_LENGTH) + return false if (100..199).include?(status) || status == 204 || status == 304 + return false if headers.has_key?(TRANSFER_ENCODING) && headers[TRANSFER_ENCODING] =~ CHUNKED_REGEXP + return false unless body.kind_of?(String) || body.kind_of?(Array) + true + end + + def set_content_length(result) + headers, body = result[1..2] + case body + when String + headers[CONTENT_LENGTH] = (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s + when Array + bytes = 0 + body.each do |p| + bytes += p.respond_to?(:bytesize) ? p.bytesize : p.size + end + headers[CONTENT_LENGTH] = bytes.to_s + end + end end end \ No newline at end of file lib/thin/connection.rb @@ -22,8 +22,8 @@ module Thin FORWARDED_FOR = 'HTTP_X_FORWARDED_FOR'.freeze CONTENT_LENGTH = 'CONTENT_LENGTH'.freeze CONNECTION = 'HTTP_CONNECTION'.freeze - KEEP_ALIVE_REGEXP = /keep-alive/i - CLOSE_REGEXP = /close/i + KEEP_ALIVE_REGEXP = /\bkeep-alive\b/i.freeze + CLOSE_REGEXP = /\bclose\b/i.freeze # Freeze some Rack header names RACK_INPUT = 'rack.input'.freeze lib/thin/request.rb @@ -43,10 +43,7 @@ module Thin [ 200, - { - 'Content-Type' => 'text/html', - 'Content-Length' => body.size.to_s - }, + { 'Content-Type' => 'text/html' }, [body] ] end lib/thin/stats.rb @@ -6,7 +6,7 @@ describe Server, "HTTP pipelining" do start_server do |env| calls += 1 body = env['PATH_INFO'] + '-' + calls.to_s - [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body] + [200, { 'Content-Type' => 'text/html' }, body] end @server.maximum_persistent_connections = 1024 end spec/server/pipelining_spec.rb @@ -4,7 +4,7 @@ describe Server, 'robustness' do before do start_server do |env| body = 'hello!' - [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body] + [200, { 'Content-Type' => 'text/html' }, body] end end spec/server/robustness_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Server, "stopping" do before do start_server do |env| - [200, { 'Content-Type' => 'text/html', 'Content-Length' => '2' }, ['ok']] + [200, { 'Content-Type' => 'text/html' }, ['ok']] end end spec/server/stopping_spec.rb @@ -12,7 +12,7 @@ else sleep 2 # HACK ooh boy, I wish I knew how to make those specs more stable... start_server('0.0.0.0', 5555, :backend => Backends::SwiftiplyClient, :wait_for_socket => false) do |env| body = env.inspect + env['rack.input'].read - [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body] + [200, { 'Content-Type' => 'text/html' }, body] end end spec/server/swiftiply_spec.rb @@ -4,19 +4,30 @@ describe Server, 'on TCP socket' do before do start_server do |env| body = env.inspect + env['rack.input'].read - [200, { 'Content-Type' => 'text/html', 'Content-Length' => body.size.to_s }, body] + [200, { 'Content-Type' => 'text/html' }, body] end end - + it 'should GET from Net::HTTP' do get('/?cthis').should include('cthis') end it 'should GET from TCPSocket' do - send_data("GET /?this HTTP/1.1\r\nConnection: close\r\n\r\n"). - should include("HTTP/1.1 200 OK", - "Content-Type: text/html", "Content-Length: ", - "Connection: close", "this") + status, headers, body = parse_response(send_data("GET /?this HTTP/1.0\r\nConnection: close\r\n\r\n")) + status.should == 200 + headers['Content-Type'].should == 'text/html' + headers['Connection'].should == 'close' + body.should include('this') + end + + it "should add the Content-Length to the response when not present" do + status, headers, body = parse_response(send_data("GET / HTTP/1.0\r\nConnection: close\r\n\r\n")) + headers.should have_key('Content-Length') + end + + it 'should set the Content-Length to equal the body size in bytes' do + status, headers, body = parse_response(send_data("GET / HTTP/1.0\r\nConnection: close\r\n\r\n")) + headers['Content-Length'].should == (body.respond_to?(:bytesize) ? body.bytesize : body.size).to_s end it 'should return empty string on incomplete headers' do @@ -35,7 +46,7 @@ describe Server, 'on TCP socket' do big = 'X' * (20 * 1024) post('/', :big => big).should include(big) end - + it "should retreive remote address" do get('/').should include('"REMOTE_ADDR"=>"127.0.0.1"') end spec/server/tcp_spec.rb @@ -6,7 +6,7 @@ describe Server, 'with threads' do start_server DEFAULT_TEST_ADDRESS, DEFAULT_TEST_PORT, :threaded => true do |env| sleep env['PATH_INFO'].delete('/').to_i @requests += 1 - [200, { 'Content-Type' => 'text/html', 'Content-Length' => '2' }, 'hi'] + [200, { 'Content-Type' => 'text/html' }, 'hi'] end end spec/server/threaded_spec.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Server, "on UNIX domain socket" do before do start_server('/tmp/thin_test.sock') do |env| - [200, { 'Content-Type' => 'text/html', 'Content-Length' => env.inspect.size.to_s }, [env.inspect]] + [200, { 'Content-Type' => 'text/html' }, [env.inspect]] end end spec/server/unix_socket_spec.rb @@ -190,6 +190,16 @@ module Helpers out end + def parse_response(response) + raw_headers, body = response.split("\r\n\r\n", 2) + raw_status, raw_headers = raw_headers.split("\r\n", 2) + + status = raw_status.match(%r{\AHTTP/1.1\s+(\d+)\b}).captures.first.to_i + headers = Hash[ *raw_headers.split("\r\n").map { |h| h.split(/:\s+/, 2) }.flatten ] + + [ status, headers, body ] + end + def get(url) if @server.backend.class == Backends::UnixServer send_data("GET #{url} HTTP/1.1\r\nConnection: close\r\n\r\n") spec/spec_helper.rb f99bd54ab90485a5be1bdb3f86600f5fc68728a9 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/macournoyer/thin/commit/affccc93679a419c8fca2f92fc11e006687bdf15 affccc93679a419c8fca2f92fc11e006687bdf15 2008-07-19T06:34:08-07:00 2008-07-18T12:40:18-07:00 Add Content-Length header to response automatically when possible [#74 state:resolved] f2bdb3301514db8c1e743a5b7bdd3d721765e567 macournoyer macournoyer@gmail.com