From 83b06c0ab4c9a3a22e22146492a52330a395f24f Mon Sep 17 00:00:00 2001
From: Zachary Scott <e@zzak.io>
Date: Fri, 19 Jun 2015 09:08:46 -0400
Subject: [PATCH 1/2] Bump Rack to 1.5.x, but not 1.6 since it doesn't work on
 1.8.7: https://travis-ci.org/sinatra/sinatra/jobs/67398284#L155

/cc #1009
---
 sinatra.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sinatra.gemspec b/sinatra.gemspec
index 26d2e25f..3309eebb 100644
--- a/sinatra.gemspec
+++ b/sinatra.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
   s.extra_rdoc_files  = s.files.select { |p| p =~ /^README/ } << 'LICENSE'
   s.rdoc_options      = %w[--line-numbers --inline-source --title Sinatra --main README.rdoc --encoding=UTF-8]
 
-  s.add_dependency 'rack', '~> 1.4'
+  s.add_dependency 'rack', '~> 1.5', '>= 1.5.4', '< 1.6'
   s.add_dependency 'tilt', '>= 1.3', '< 3'
   s.add_dependency 'rack-protection', '~> 1.4'
 end

From 099de71f29060fbae82365d58fc05ea1fa69599b Mon Sep 17 00:00:00 2001
From: Zachary Scott <e@zzak.io>
Date: Fri, 19 Jun 2015 09:20:37 -0400
Subject: [PATCH 2/2] Don't test Rack 1.4, since we won't use it.

Also don't test Rack master on 1.9.3, since they've dropped support.
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06f8c9cb..5d667d16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,7 @@ sudo: false
 
 matrix:
   include:
-    - { rvm: 1.9.3, env: rack=1.4.0  }
     - { rvm: 1.8.7, env: tilt=master }
-    - { rvm: 1.9.3, env: rack=master }
     - { rvm: 1.9.3, env: tilt=master }
     - { rvm: 2.2, env: rack=master }
     - { rvm: 2.2, env: tilt=master }