Merge pull request rack#302 from lgierth/rack-static-bug

Don't implicitly respond with index file. Fixes rack#301
rkyrychuk · Jan 7, 2012 · 5c60fc5 · 5c60fc5
2 parents e20baec + 5ab871f
commit 5c60fc5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/rack/static.rb b/lib/rack/static.rb
@@ -38,7 +38,7 @@ class Static
     def initialize(app, options={})
       @app = app
       @urls = options[:urls] || ["/favicon.ico"]
-      @index = options[:index] || "index.html"
+      @index = options[:index]
       root = options[:root] || Dir.pwd
       cache_control = options[:cache_control]
       @file_server = Rack::File.new(root, cache_control)

diff --git a/test/spec_static.rb b/test/spec_static.rb
@@ -40,6 +40,11 @@ def call(env)
     res.should.be.ok
     res.body.should =~ /index!/
   end
+
+  it "doesn't call index file if :index option was omitted" do
+    res = @request.get("/")
+    res.body.should == "Hello World"
+  end
 
   it "serves hidden files" do
     res = @hash_request.get("/cgi/sekret")