From 1fb8ba7592c6a231bac62e1623645fd18b1eb951 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Thu, 15 Sep 2005 22:51:43 +0000 Subject: Don't set the :MimeTypes option if it is nil (causes routing errors on stylesheets and javascripts, somehow) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2251 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/webrick_server.rb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/webrick_server.rb b/railties/lib/webrick_server.rb index f3938b7419..0b82a99075 100644 --- a/railties/lib/webrick_server.rb +++ b/railties/lib/webrick_server.rb @@ -46,11 +46,12 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet def self.dispatch(options = {}) Socket.do_not_reverse_lookup = true # patch for OS X - server = WEBrick::HTTPServer.new(:Port => options[:port].to_i, - :ServerType => options[:server_type], - :BindAddress => options[:ip], - :MimeTypes => options[:mime_types] - ) + params = { :Port => options[:port].to_i, + :ServerType => options[:server_type], + :BindAddress => options[:ip] } + params[:MimeTypes] = options[:mime_types] if options[:mime_types] + + server = WEBrick::HTTPServer.new(params) server.mount('/', DispatchServlet, options) trap("INT") { server.shutdown } -- cgit v1.2.3