Revert "Correctly handle encoded colons in routes (Fixes #776)"

This reverts commit bd8e07f.
sinatra · Mar 24, 2015 · ca5b2f1 · ca5b2f1
1 parent b0bd782
commit ca5b2f1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 45 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -1631,7 +1631,7 @@ def compile(path)
 
             # Special character handling.
             #
-            pattern = segment.to_str.gsub(/[^\?\%\\\/\:\*\w]|:(?!\w)/) do |c|
+            pattern = segment.to_str.gsub(/[^\?\%\\\/\:\*\w]/) do |c|
               ignore << escaped(c).join if c.match(/[\.@]/)
               patt = encoded(c)
               patt.gsub(/%[\da-fA-F]{2}/) do |match|

diff --git a/test/routing_test.rb b/test/routing_test.rb
@@ -99,50 +99,6 @@ class RoutingTest < Minitest::Test
     assert_body "foo/bar"
   end
 
-  it "it handles encoded colons correctly" do
-    mock_app {
-      get("/:") { 'a' }
-      get("/a/:") { 'b' }
-      get("/a/:/b") { 'c' }
-      get("/a/b:") { 'd' }
-      get("/a/b: ") { 'e' }
-    }
-    get '/:'
-    assert_equal 200, status
-    assert_body "a"
-    get '/%3a'
-    assert_equal 200, status
-    assert_body "a"
-
-    get '/a/:'
-    assert_equal 200, status
-    assert_body "b"
-    get '/a/%3a'
-    assert_equal 200, status
-    assert_body "b"
-
-    get '/a/:/b'
-    assert_equal 200, status
-    assert_body "c"
-    get '/a/%3A/b'
-    assert_equal 200, status
-    assert_body "c"
-
-    get '/a/b:'
-    assert_equal 200, status
-    assert_body "d"
-    get '/a/b%3a'
-    assert_equal 200, status
-    assert_body "d"
-
-    get '/a/b%3a%20'
-    assert_equal 200, status
-    assert_body "e"
-    get '/a/b%3a+'
-    assert_equal 200, status
-    assert_body "e"
-  end
-
   it "overrides the content-type in error handlers" do
     mock_app {
       before { content_type 'text/plain' }