From 3be4d733aabbab11ff35e39bd3d2e623a5903527 Mon Sep 17 00:00:00 2001 From: Mike Pastore Date: Wed, 10 Feb 2016 00:12:17 -0600 Subject: [PATCH] Fix issue with passed routes and provides --- lib/sinatra/base.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb index 7f182e2907..bdc637fdbc 100644 --- a/lib/sinatra/base.rb +++ b/lib/sinatra/base.rb @@ -968,10 +968,14 @@ def route!(base = settings, pass_block = nil) returned_pass_block = process_route(pattern, keys, conditions) do |*args| env['sinatra.route'] = block.instance_variable_get(:@route_name) route_eval { block[*args] } + # prevent passed route from pinning the content type + response['Content-Type'] = nil end - # don't wipe out pass_block in superclass - pass_block = returned_pass_block if returned_pass_block + if returned_pass_block + # don't wipe out pass_block in superclass + pass_block = returned_pass_block + end end end