@@ -3,6 +3,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__)) require 'fileutils' require 'timeout' require 'stringio' +require 'time' require 'rubygems' require 'eventmachine' lib/thin.rb @@ -16,6 +16,14 @@ module Thin def []=(key, value) if !@sent.has_key?(key) || ALLOWED_DUPLICATES.include?(key) @sent[key] = true + value = case value + when Time + value.rfc822 + when NilClass + return + else + value.to_s + end @out << HEADER_FORMAT % [key, value] end end lib/thin/headers.rb @@ -26,4 +26,15 @@ describe Headers do @headers.to_s.should == "Host: localhost:3000\r\nSet-Cookie: twice\r\nSet-Cookie: is cooler the once\r\n" end + + it 'should ignore nil values' do + @headers['Something'] = nil + @headers.to_s.should_not include('Something: ') + end + + it 'should format Time values correctly' do + time = Time.now + @headers['Modified-At'] = time + @headers.to_s.should include("Modified-At: #{time.rfc822}") + end end \ No newline at end of file spec/headers_spec.rb b9ec90108045101501a436cb124599d4a70fcbdb Aman Gupta aman@tmm1.net http://github.com/macournoyer/thin/commit/a8a71b8770bcefe38daecd3be903846084c60051 a8a71b8770bcefe38daecd3be903846084c60051 2008-07-25T12:39:11-07:00 2008-07-25T12:39:11-07:00 Handle nil and Time header values correctly 890f503c21248114c1697bf530eb3e3ab3268657 Aman Gupta aman@tmm1.net