@@ -1,4 +1,5 @@ == 1.0.1 ? release + * Defaults SERVER_NAME to localhost like webrick does [#87 state:resolved] * Namespace parser to prevent error when mongrel is required [cliffmoon] * Set RACK_ENV based on environment option when loading rackup file [Curtis Summers] [#83 state:resolved] * Fixes a warning RE relative_url_root when using a prefix with Rails 2.1.1 [seriph] [#85 state:resolved] CHANGELOG @@ -16,6 +16,8 @@ module Thin # Freeze some HTTP header names & values SERVER_SOFTWARE = 'SERVER_SOFTWARE'.freeze + SERVER_NAME = 'SERVER_NAME'.freeze + LOCALHOST = 'localhost'.freeze HTTP_VERSION = 'HTTP_VERSION'.freeze HTTP_1_0 = 'HTTP/1.0'.freeze REMOTE_ADDR = 'REMOTE_ADDR'.freeze @@ -49,6 +51,7 @@ module Thin @body = StringIO.new @env = { SERVER_SOFTWARE => SERVER, + SERVER_NAME => LOCALHOST, # Rack stuff RACK_INPUT => @body, lib/thin/request.rb @@ -59,7 +59,7 @@ describe Request, 'parser' do it 'should parse headers from GET request' do request = R(<<-EOS, true) GET / HTTP/1.1 -Host: localhost:3000 +Host: myhost.com:3000 User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.9) Gecko/20071025 Firefox/2.0.0.9 Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 Accept-Language: en-us,en;q=0.5 @@ -70,8 +70,8 @@ Keep-Alive: 300 Connection: keep-alive EOS - request.env['HTTP_HOST'].should == 'localhost:3000' - request.env['SERVER_NAME'].should == 'localhost' + request.env['HTTP_HOST'].should == 'myhost.com:3000' + request.env['SERVER_NAME'].should == 'myhost.com' request.env['SERVER_PORT'].should == '3000' request.env['HTTP_COOKIE'].should == 'mium=7' @@ -195,4 +195,9 @@ EOS it "should fails on heders larger then MAX_HEADER" do proc { R("GET / HTTP/1.1\r\nFoo: #{'X' * Request::MAX_HEADER}\r\n\r\n") }.should raise_error(InvalidRequest) end + + it "should default SERVER_NAME to localhost" do + request = R("GET / HTTP/1.1\r\n\r\n") + request.env['SERVER_NAME'].should == "localhost" + end end \ No newline at end of file spec/request/parser_spec.rb 6ac518fe765517fc0b5b39ce5d72bf6671f0a1eb macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/7c8e416848e2dfc8f1fb594997be640cf8f398b2 7c8e416848e2dfc8f1fb594997be640cf8f398b2 2008-12-16T18:05:54-08:00 2008-12-16T18:05:54-08:00 Defaults SERVER_NAME to localhost like webrick does [#87 state:resolved] 7571731c2546d62021493999734293f618c70d64 macournoyer macournoyer@gmail.com