Small fix for the new FastCGI options

darcs-hash:20071118195145-4fc50-722d5e021e3f8fe1614930d5506363ddfada6303.gz
scootklein · Nov 18, 2007 · c9f9347 · c9f9347
1 parent 380d907
commit c9f9347
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/bin/rackup b/bin/rackup
@@ -98,6 +98,10 @@ when nil
   # Guess.
   if ENV.include?("PHP_FCGI_CHILDREN")
     server = Rack::Handler::FastCGI
+
+    # We already speak FastCGI
+    options.delete :File
+    options.delete :Port
   elsif ENV.include?("REQUEST_METHOD")
     server = Rack::Handler::CGI
   else

diff --git a/lib/rack/handler/fastcgi.rb b/lib/rack/handler/fastcgi.rb
@@ -3,7 +3,7 @@
 module Rack
   module Handler
     class FastCGI
-      def self.run(app, options=nil)
+      def self.run(app, options={})
         file = options[:File] and STDIN.reopen(UNIXServer.new(file))
         port = options[:Port] and STDIN.reopen(TCPServer.new(port))
         FCGI.each { |request|