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

1 files changed, 6 insertions, 5 deletions

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 }