0
@@ -5,9 +5,9 @@ end
0
 require 'rack'
0
 
0
 require 'rubygems'
0
-require 'uri'
0
 require 'time'
0
 require 'ostruct'
0
+require "uri"
0
 
0
 if ENV['SWIFT']
0
  require 'swiftcore/swiftiplied_mongrel'
0
@@ -217,14 +217,14 @@ module Sinatra
0
             
0
     def invoke(request)
0
       return unless File.file?(
0
-        Sinatra.application.options.public + request.path_info
0
+        Sinatra.application.options.public + request.path_info.http_unescape
0
       )
0
       Result.new(block, {}, 200)
0
     end
0
     
0
     def block
0
       Proc.new do
0
-        send_file Sinatra.application.options.public + request.path_info,
0
+        send_file Sinatra.application.options.public + request.path_info.http_unescape,
0
           :disposition => nil
0
       end
0
     end
0
@@ -1174,14 +1174,16 @@ class String
0
   # Converts +self+ to an escaped URI parameter value
0
   #   'Foo Bar'.to_param # => 'Foo%20Bar'
0
   def to_param
0
-    URI.escape(self)
0
+    Rack::Utils.escape(self)
0
   end
0
+  alias :http_escape :to_param
0
   
0
   # Converts +self+ from an escaped URI parameter value
0
   #   'Foo%20Bar'.from_param # => 'Foo Bar'
0
   def from_param
0
-    URI.unescape(self)
0
+    Rack::Utils.unescape(self)
0
   end
0
+  alias :http_unescape :from_param
0
   
0
 end
0
 

0
@@ -77,6 +77,12 @@ context "Static files (by default)" do
0
     headers['Content-Transfer-Encoding'].should.be.nil
0
   end
0
 
0
+  specify "should be served even if their path is url escaped" do
0
+	get_it('/fo%6f.xml')
0
+	should.be.ok
0
+    body.should.equal "<foo></foo>\n"
0
+  end
0
+
0
 end
0
 
0
 context "SendData" do