Upstream commit: https://github.com/sinatra/sinatra/commit/c5c9f6b5501a366d5809faa44e50fad371c14870
Fixes test failure on Ruby 1.9.

Index: ruby-sinatra/test/routing_test.rb
===================================================================
--- ruby-sinatra.orig/test/routing_test.rb	2013-08-15 17:52:13.941606687 +0200
+++ ruby-sinatra/test/routing_test.rb	2013-12-02 21:10:15.918998018 +0100
@@ -90,7 +90,10 @@ class RoutingTest < Test::Unit::TestCase
   end
 
   it "it handles encoded slashes correctly" do
-    mock_app { get("/:a") { |a| a } }
+    mock_app {
+      set :protection, :except => :path_traversal
+      get("/:a") { |a| a }
+    }
     get '/foo%2Fbar'
     assert_equal 200, status
     assert_body "foo/bar"
