Merge pull request #675 from keithduncan/fix-clean-path-for-slash

Fix `clean_path_info` for paths with only a slash

2 files changed, 5 insertions, 1 deletions

diff --git a/lib/rack/utils.rb b/lib/rack/utils.rb
index 1be818b4..264b6b62 100644
--- a/lib/rack/utils.rb
+++ b/lib/rack/utils.rb
@@ -639,7 +639,7 @@ module Rack
         part == '..' ? clean.pop : clean << part
       end
 
-      clean.unshift '/' if parts.first.empty?
+      clean.unshift '/' if parts.empty? || parts.first.empty?
 
       ::File.join(*clean)
     end
diff --git a/test/spec_utils.rb b/test/spec_utils.rb
index 38ffc861..de12f83d 100644
--- a/test/spec_utils.rb
+++ b/test/spec_utils.rb
@@ -409,6 +409,10 @@ describe Rack::Utils do
   should "not clean directory traversal with encoded periods" do
     Rack::Utils.clean_path_info("/%2E%2E/README").should.equal "/%2E%2E/README"
   end
+
+  should "clean slash only paths" do
+    Rack::Utils.clean_path_info("/").should.equal "/"
+  end
 end
 
 describe Rack::Utils, "byte_range" do