diff --git a/Appraisals b/Appraisals
index 324653b1..fe01ec6c 100644
--- a/Appraisals
+++ b/Appraisals
@@ -7,10 +7,12 @@ appraise "rails30" do
 end
 
 appraise "rails31" do
+  gem "i18n", "< 0.7"
   gem "rails", "~> 3.1.12"
 end
 
 appraise "rails32" do
+  gem "i18n", "< 0.7"
   gem "rails", "~> 3.2.21"
 end
 
@@ -19,11 +21,20 @@ appraise "rails40" do
 end
 
 appraise "rails41" do
-  gem "rails", "~> 4.1.10"
+  gem "rails", "~> 4.1.16"
 end
 
 appraise "rails42" do
-  gem "rails", "~> 4.2.1"
+  gem "mime-types", "< 3", :require => false
+  gem "rails", "~> 4.2.9"
+end
+
+appraise "rails50" do
+  gem "rails", "~> 5.0.5"
+end
+
+appraise "rails51" do
+  gem "rails", "~> 5.1.2"
 end
 
 appraise "railsNG" do
diff --git a/History.md b/History.md
index 2144ec21..98e3d2b5 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,37 @@
+## 1.1.22
+
+- compile using Java 6 source compat
+- update (bundled) rack to 1.6.13
+- avoid NativeException - not used on recent JRuby
+- avoid Fixnum warning - assume recent JRuby
+- Add error message to log when runtime error is handled (#213)
+
+## 1.1.21 (17/09/17)
+
+- update (bundled) rack to 1.6.8
+- add Rack::Handler::Servlet::DefaultEnv#get_header (#212)
+  missing methods to handle ActionController::Base#reset_session
+- can only safely stream natively on ActionDispatch <= 3.2 (#210)
+  (broken Rails streaming for Rails 4.x)
+- when handling OPTION calls ignore both 'Date' and 'Allow' headers (#205)
+
+## 1.1.20 (22/01/16)
+
+- pre-maturely avoid Ruby frozen string literals coming at us ... ''.dup meh!
+- allow to boot when RAILS_ROOT/public directory does not exist (closes #197)
+- for better booter detection - export public path after working dir was changed
+- `ActionController::Base` provides a method `servlet_response` to return the
+  `java.servlet_response` rack env (#201)
+- adjust jruby home dir fallback (for default $LOAD_PATH) correctly on 9K and --2.0
+- servlet env should behave on `fetch` and `[]` like a Hash (nil value can be set)
+
+## 1.1.19 (01/07/15)
+
+- update (bundled) rack to 1.5.5
+- servlet attrs with null/false values should not end up with an '' env value (#195)
+- tune ErrorApp + ShowStatus to respect set 'rack.showstatus.detail' (#194)
+- allow for more `JRuby::Rack::ErrorApp` customizations + retrieve cause when needed
+
 ## 1.1.18 (13/01/15)
 
 - back-port Rack::ShowStatus to be used with out ErrorApp (contains XSS fix #190)
diff --git a/LICENSE.txt b/LICENSE.txt
index 2e1a74da..958f5c32 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
 #--
 # The MIT License
 #
-# Copyright (c) 2012-2014 Karol Bucek, LTD
+# Copyright (c) 2012-2016 Karol Bucek, LTD.
 # Copyright (c) 2010-2012 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 #
diff --git a/Rakefile b/Rakefile
index 629c4892..933b8fa6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -54,11 +54,16 @@ end
 desc "Unpack the rack gem"
 task :unpack_gem => "target" do |t|
   target = File.expand_path(t.prerequisites.first)
-  spec = Gem.loaded_specs["rack"]
-  if spec.respond_to?(:cache_file)
-    gem_file = spec.cache_file
-  else
-    gem_file = File.join(spec.installation_path, 'cache', spec.file_name)
+  spec = Gem.loaded_specs['rack']
+  # JRuby <= 1.7.20 does not handle respond_to? with method_missing right
+  # ... issue with Bundler::StubSpecification wrapping (in bundler 1.10.x)
+  unless ( gem_file = spec.cache_file rescue nil )
+    #if defined?(::Bundler) && ::Bundler.const_defined?(:StubSpecification) # since Bundler 1.10.1
+    #  spec = spec.to_spec if spec.is_a?(::Bundler::StubSpecification)
+    #else
+    #  spec = spec.to_spec if spec.respond_to?(:to_spec)
+    #end
+    gem_file = File.join(spec.base_dir, 'cache', spec.file_name)
   end
   unless uptodate?("#{target}/vendor/rack.rb", [__FILE__, gem_file])
     mkdir_p "target/vendor"
diff --git a/gemfiles/rails23.gemfile b/gemfiles/rails23.gemfile
index 95fff13a..f238fadd 100644
--- a/gemfiles/rails23.gemfile
+++ b/gemfiles/rails23.gemfile
@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
+gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
+gem "jruby-openssl", "~> 0.9.20", :group=>:test
 gem "rails", "~> 2.3.18"
 
diff --git a/gemfiles/rails23.gemfile.lock b/gemfiles/rails23.gemfile.lock
index dff3a162..90f66c6b 100644
--- a/gemfiles/rails23.gemfile.lock
+++ b/gemfiles/rails23.gemfile.lock
@@ -12,6 +12,7 @@ GEM
       activesupport (= 2.3.18)
     activesupport (2.3.18)
     diff-lcs (1.2.5)
+    jruby-openssl (0.9.21-java)
     rack (1.1.6)
     rails (2.3.18)
       actionmailer (= 2.3.18)
@@ -20,7 +21,7 @@ GEM
       activeresource (= 2.3.18)
       activesupport (= 2.3.18)
       rake (>= 0.8.3)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -34,6 +35,10 @@ PLATFORMS
   java
 
 DEPENDENCIES
+  jruby-openssl (~> 0.9.20)
   rails (~> 2.3.18)
-  rake (~> 10.3.1)
+  rake (~> 10.4.2)
   rspec (~> 2.14.1)
+
+BUNDLED WITH
+   1.14.6
diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile
index e2954083..ecf30f7e 100644
--- a/gemfiles/rails30.gemfile
+++ b/gemfiles/rails30.gemfile
@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
+gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
+gem "jruby-openssl", "~> 0.9.20", :group=>:test
 gem "rails", "~> 3.0.20"
 
diff --git a/gemfiles/rails30.gemfile.lock b/gemfiles/rails30.gemfile.lock
index 722f347f..81927341 100644
--- a/gemfiles/rails30.gemfile.lock
+++ b/gemfiles/rails30.gemfile.lock
@@ -34,6 +34,7 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.4)
+    jruby-openssl (0.9.21-java)
     json (1.8.1-java)
     mail (2.2.20)
       activesupport (>= 2.3.6)
@@ -61,7 +62,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.14.1)
@@ -82,6 +83,10 @@ PLATFORMS
   java
 
 DEPENDENCIES
+  jruby-openssl (~> 0.9.20)
   rails (~> 3.0.20)
-  rake (~> 10.3.1)
+  rake (~> 10.4.2)
   rspec (~> 2.14.1)
+
+BUNDLED WITH
+   1.14.6
diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile
index 7ade1cb9..08a6e69a 100644
--- a/gemfiles/rails31.gemfile
+++ b/gemfiles/rails31.gemfile
@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
+gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
+gem "jruby-openssl", "~> 0.9.20", :group=>:test
+gem "i18n", "< 0.7"
 gem "rails", "~> 3.1.12"
 
diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock
index efd2dbfc..d2ba1cb6 100644
--- a/gemfiles/rails31.gemfile.lock
+++ b/gemfiles/rails31.gemfile.lock
@@ -35,13 +35,14 @@ GEM
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.11)
-    json (1.8.1-java)
+    jruby-openssl (0.9.21-java)
+    json (1.8.2-java)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     polyglot (0.3.5)
     rack (1.3.10)
     rack-cache (1.2)
@@ -50,7 +51,7 @@ GEM
       rack (>= 1.0.0)
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (3.1.12)
       actionmailer (= 3.1.12)
@@ -67,7 +68,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.14.1)
@@ -78,7 +79,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sprockets (2.0.4)
+    sprockets (2.0.5)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -87,12 +88,17 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
+    tzinfo (0.3.44)
 
 PLATFORMS
   java
 
 DEPENDENCIES
+  i18n (< 0.7)
+  jruby-openssl (~> 0.9.20)
   rails (~> 3.1.12)
-  rake (~> 10.3.1)
+  rake (~> 10.4.2)
   rspec (~> 2.14.1)
+
+BUNDLED WITH
+   1.14.6
diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
index 26cad906..34a0b91a 100644
--- a/gemfiles/rails32.gemfile
+++ b/gemfiles/rails32.gemfile
@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
+gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
+gem "jruby-openssl", "~> 0.9.20", :group=>:test
+gem "i18n", "< 0.7"
 gem "rails", "~> 3.2.21"
 
diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock
index 40f5fdf0..5cbb592f 100644
--- a/gemfiles/rails32.gemfile.lock
+++ b/gemfiles/rails32.gemfile.lock
@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.21)
-      actionpack (= 3.2.21)
+    actionmailer (3.2.22)
+      actionpack (= 3.2.22)
       mail (~> 2.5.4)
-    actionpack (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
+    actionpack (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -14,18 +14,18 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
+    activemodel (3.2.22)
+      activesupport (= 3.2.22)
       builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
+    activerecord (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-    activesupport (3.2.21)
+    activeresource (3.2.22)
+      activemodel (= 3.2.22)
+      activesupport (= 3.2.22)
+    activesupport (3.2.22)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
@@ -35,36 +35,37 @@ GEM
     hike (1.2.3)
     i18n (0.7.0)
     journey (1.0.4)
-    json (1.8.2-java)
+    jruby-openssl (0.9.21-java)
+    json (1.8.3-java)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.11.0)
+    multi_json (1.11.1)
     polyglot (0.3.5)
-    rack (1.4.5)
+    rack (1.4.7)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.2.21)
-      actionmailer (= 3.2.21)
-      actionpack (= 3.2.21)
-      activerecord (= 3.2.21)
-      activeresource (= 3.2.21)
-      activesupport (= 3.2.21)
+    rails (3.2.22)
+      actionmailer (= 3.2.22)
+      actionpack (= 3.2.22)
+      activerecord (= 3.2.22)
+      activeresource (= 3.2.22)
+      activesupport (= 3.2.22)
       bundler (~> 1.0)
-      railties (= 3.2.21)
-    railties (3.2.21)
-      actionpack (= 3.2.21)
-      activesupport (= 3.2.21)
+      railties (= 3.2.22)
+    railties (3.2.22)
+      actionpack (= 3.2.22)
+      activesupport (= 3.2.22)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.14.1)
@@ -84,293 +85,6 @@ GEM
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
-      polyglot (>= 0.3.1)
       polyglot (>= 0.3.1)
     tzinfo (0.3.44)
 
@@ -378,6 +92,11 @@ PLATFORMS
   java
 
 DEPENDENCIES
+  i18n (< 0.7)
+  jruby-openssl (~> 0.9.20)
   rails (~> 3.2.21)
-  rake (~> 10.3.1)
+  rake (~> 10.4.2)
   rspec (~> 2.14.1)
+
+BUNDLED WITH
+   1.14.6
diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
index b1932544..debd7a5d 100644
--- a/gemfiles/rails40.gemfile
+++ b/gemfiles/rails40.gemfile
@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
+gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
+gem "jruby-openssl", "~> 0.9.20", :group=>:test
 gem "rails", "~> 4.0.13"
 
diff --git a/gemfiles/rails40.gemfile.lock b/gemfiles/rails40.gemfile.lock
index 4e3e4c7d..5d3715d8 100644
--- a/gemfiles/rails40.gemfile.lock
+++ b/gemfiles/rails40.gemfile.lock
@@ -30,12 +30,13 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     i18n (0.7.0)
+    jruby-openssl (0.9.21-java)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.5)
+    mime-types (2.6.1)
     minitest (4.7.5)
-    multi_json (1.11.0)
-    rack (1.5.2)
+    multi_json (1.11.1)
+    rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.0.13)
@@ -51,7 +52,7 @@ GEM
       activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -60,9 +61,9 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sprockets (3.0.2)
+    sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -74,6 +75,10 @@ PLATFORMS
   java
 
 DEPENDENCIES
+  jruby-openssl (~> 0.9.20)
   rails (~> 4.0.13)
-  rake (~> 10.3.1)
+  rake (~> 10.4.2)
   rspec (~> 2.14.1)
+
+BUNDLED WITH
+   1.14.6
diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile
index 4c85f2aa..28928149 100644
--- a/gemfiles/rails41.gemfile
+++ b/gemfiles/rails41.gemfile
@@ -2,7 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
+gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
-gem "rails", "~> 4.1.10"
+gem "jruby-openssl", "~> 0.9.20", :group=>:test
+gem "rails", "~> 4.1.16"
 
diff --git a/gemfiles/rails41.gemfile.lock b/gemfiles/rails41.gemfile.lock
index 9b374054..e223b9be 100644
--- a/gemfiles/rails41.gemfile.lock
+++ b/gemfiles/rails41.gemfile.lock
@@ -1,61 +1,63 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.10)
-      actionpack (= 4.1.10)
-      actionview (= 4.1.10)
+    actionmailer (4.1.16)
+      actionpack (= 4.1.16)
+      actionview (= 4.1.16)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.10)
-      actionview (= 4.1.10)
-      activesupport (= 4.1.10)
+    actionpack (4.1.16)
+      actionview (= 4.1.16)
+      activesupport (= 4.1.16)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.10)
-      activesupport (= 4.1.10)
+    actionview (4.1.16)
+      activesupport (= 4.1.16)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.10)
-      activesupport (= 4.1.10)
+    activemodel (4.1.16)
+      activesupport (= 4.1.16)
       builder (~> 3.1)
-    activerecord (4.1.10)
-      activemodel (= 4.1.10)
-      activesupport (= 4.1.10)
+    activerecord (4.1.16)
+      activemodel (= 4.1.16)
+      activesupport (= 4.1.16)
       arel (~> 5.0.0)
-    activesupport (4.1.10)
+    activesupport (4.1.16)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
-    builder (3.2.2)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5-java)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     i18n (0.7.0)
-    json (1.8.2-java)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.5)
-    minitest (5.6.0)
-    rack (1.5.2)
+    jruby-openssl (0.9.21-java)
+    json (1.8.6-java)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    mime-types (2.6.2)
+    minitest (5.10.3)
+    rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.10)
-      actionmailer (= 4.1.10)
-      actionpack (= 4.1.10)
-      actionview (= 4.1.10)
-      activemodel (= 4.1.10)
-      activerecord (= 4.1.10)
-      activesupport (= 4.1.10)
+    rails (4.1.16)
+      actionmailer (= 4.1.16)
+      actionpack (= 4.1.16)
+      actionview (= 4.1.16)
+      activemodel (= 4.1.16)
+      activerecord (= 4.1.16)
+      activesupport (= 4.1.16)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.10)
+      railties (= 4.1.16)
       sprockets-rails (~> 2.0)
-    railties (4.1.10)
-      actionpack (= 4.1.10)
-      activesupport (= 4.1.10)
+    railties (4.1.16)
+      actionpack (= 4.1.16)
+      activesupport (= 4.1.16)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -64,21 +66,26 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sprockets (3.0.2)
-      rack (~> 1.0)
-    sprockets-rails (2.2.4)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5-java)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6-java)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  rails (~> 4.1.10)
-  rake (~> 10.3.1)
+  jruby-openssl (~> 0.9.20)
+  rails (~> 4.1.16)
+  rake (~> 10.4.2)
   rspec (~> 2.14.1)
+
+BUNDLED WITH
+   1.14.6
diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile
index 114569a6..de51d434 100644
--- a/gemfiles/rails42.gemfile
+++ b/gemfiles/rails42.gemfile
@@ -2,7 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
+gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
-gem "rails", "~> 4.2.1"
+gem "jruby-openssl", "~> 0.9.20", :group=>:test
+gem "mime-types", "< 3", :require=>false
+gem "rails", "~> 4.2.9"
 
diff --git a/gemfiles/rails42.gemfile.lock b/gemfiles/rails42.gemfile.lock
index 8e94e936..c7cc62ad 100644
--- a/gemfiles/rails42.gemfile.lock
+++ b/gemfiles/rails42.gemfile.lock
@@ -1,84 +1,84 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.9)
+      actionview (= 4.2.9)
+      activesupport (= 4.2.9)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.9)
+      activesupport (= 4.2.9)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.9)
+      activesupport (= 4.2.9)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.9)
+      activemodel (= 4.2.9)
+      activesupport (= 4.2.9)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.9)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
-    builder (3.2.2)
+    arel (6.0.4)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5-java)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    globalid (0.3.5)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.2-java)
-    loofah (2.0.1)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    i18n (0.8.6)
+    jruby-openssl (0.9.21-java)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.5)
-    minitest (5.6.0)
-    nokogiri (1.6.6.2-java)
-    rack (1.6.0)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    mime-types (2.99)
+    minitest (5.10.3)
+    nokogiri (1.8.0-java)
+    rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.9)
+      actionmailer (= 4.2.9)
+      actionpack (= 4.2.9)
+      actionview (= 4.2.9)
+      activejob (= 4.2.9)
+      activemodel (= 4.2.9)
+      activerecord (= 4.2.9)
+      activesupport (= 4.2.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.9)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.9)
+      actionpack (= 4.2.9)
+      activesupport (= 4.2.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -87,21 +87,27 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sprockets (3.0.2)
-      rack (~> 1.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5-java)
-    tzinfo (1.2.2)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    thor (0.19.4)
+    thread_safe (0.3.6-java)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  rails (~> 4.2.1)
-  rake (~> 10.3.1)
+  jruby-openssl (~> 0.9.20)
+  mime-types (< 3)
+  rails (~> 4.2.9)
+  rake (~> 10.4.2)
   rspec (~> 2.14.1)
+
+BUNDLED WITH
+   1.14.6
diff --git a/gemfiles/railsNG.gemfile b/gemfiles/railsNG.gemfile
index e20572c8..17a24553 100644
--- a/gemfiles/railsNG.gemfile
+++ b/gemfiles/railsNG.gemfile
@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
+gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
-gem "rails", :github=>"rails/rails", :branch=>"master"
-gem "arel", :github=>"rails/arel", :branch=>"master"
+gem "rails", "5.0.0.beta1"
 
diff --git a/pom.xml b/pom.xml
index 4b86e806..11827f80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,6 +212,11 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+      </plugin>
       <plugin>
         <groupId>org.jruby.maven</groupId>
         <artifactId>bundler-maven-plugin</artifactId>
@@ -257,6 +262,17 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.13</version>
+        <extensions>true</extensions>
+        <configuration>
+           <serverId>ossrh</serverId>
+           <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+           <autoReleaseAfterClose>false</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
@@ -299,6 +315,9 @@
                 <goals>
                   <goal>jar</goal>
                 </goals>
+                <configuration>
+                  <additionalparam>${javadoc.opts}</additionalparam>
+                </configuration>
               </execution>
             </executions>
           </plugin>
@@ -319,7 +338,15 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>java8-disable-doclint</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <properties>
+        <javadoc.opts>-Xdoclint:none</javadoc.opts>
+      </properties>
+    </profile>
   </profiles>
 
 </project>
-
diff --git a/src/main/java/org/jruby/rack/AbstractRackDispatcher.java b/src/main/java/org/jruby/rack/AbstractRackDispatcher.java
index 41fbd2a0..155ffb09 100644
--- a/src/main/java/org/jruby/rack/AbstractRackDispatcher.java
+++ b/src/main/java/org/jruby/rack/AbstractRackDispatcher.java
@@ -46,10 +46,10 @@ protected void handleException(
             final RackResponseEnvironment response) throws IOException {
         
         if ( response.isCommitted() ) {
-            context.log(RackLogger.ERROR, "couldn't handle exception "+ e +" : response is committed");
+            context.log(RackLogger.ERROR, "couldn't handle exception (response is committed)", e);
             return;
         }
-        context.log(RackLogger.DEBUG, "resetting rack response due exception");
+        context.log(RackLogger.INFO, "resetting rack response due exception: " + e);
         response.reset();
 
         afterException(request, e, response);
diff --git a/src/main/java/org/jruby/rack/servlet/ResponseCapture.java b/src/main/java/org/jruby/rack/servlet/ResponseCapture.java
index 3569af15..6fce178c 100644
--- a/src/main/java/org/jruby/rack/servlet/ResponseCapture.java
+++ b/src/main/java/org/jruby/rack/servlet/ResponseCapture.java
@@ -12,8 +12,11 @@
 import java.io.PrintWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
@@ -233,12 +236,14 @@ public boolean isHandled(final HttpServletRequest request) {
                     // not to happen but there's all kind of beasts out there
                     return false;
                 }
+                // Tomcat's DefaultServlet sets 'Allow' header but Jetty also sets the 'Date' header with its servlet
+                // ... if any other headers occur beside 'Allow' and 'Date' we consider this request handled
                 for ( final String headerName : headerNames ) {
-                    if ( ! "Allow".equals( headerName ) ) {
-                        return handled = true; // not just Allow header - consider handled
+                    if ( ! "Allow".equals( headerName ) && ! "Date".equals( headerName ) ) {
+                        return handled = true;
                     }
                 }
-                return false; // OPTIONS with only Allow header set - unhandled
+                return false; // OPTIONS with only 'Allow' (and/or 'Date') header set - unhandled
             }
             return handled = true;
         }
diff --git a/src/main/ruby/jruby/rack/app_layout.rb b/src/main/ruby/jruby/rack/app_layout.rb
index 7ff3342f..7d7ac0f2 100644
--- a/src/main/ruby/jruby/rack/app_layout.rb
+++ b/src/main/ruby/jruby/rack/app_layout.rb
@@ -1,4 +1,5 @@
 #--
+# Copyright (c) 2012-2016 Karol Bucek, LTD.
 # Copyright (c) 2010-2012 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
diff --git a/src/main/ruby/jruby/rack/booter.rb b/src/main/ruby/jruby/rack/booter.rb
index b3cafef4..2d359d26 100644
--- a/src/main/ruby/jruby/rack/booter.rb
+++ b/src/main/ruby/jruby/rack/booter.rb
@@ -1,4 +1,5 @@
 #--
+# Copyright (c) 2012-2016 Karol Bucek, LTD.
 # Copyright (c) 2010-2012 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
@@ -92,8 +93,8 @@ def logger; JRuby::Rack.logger; end
     def boot!
       adjust_gem_path
       ENV['RACK_ENV'] = rack_env
-      export_global_settings
       change_working_directory
+      export_global_settings
       load_settings_from_init_rb
       set_relative_url_root
       run_boot_hooks
diff --git a/src/main/ruby/jruby/rack/capture.rb b/src/main/ruby/jruby/rack/capture.rb
index c17a841b..deee065a 100644
--- a/src/main/ruby/jruby/rack/capture.rb
+++ b/src/main/ruby/jruby/rack/capture.rb
@@ -128,12 +128,5 @@ def capture
       end
     end
 
-    module Native
-      def capture
-        super
-        output.puts "\n--- Java Exception"
-        cause.printStackTrace java.io.PrintStream.new(output.to_outputstream)
-      end
-    end
   end
 end
diff --git a/src/main/ruby/jruby/rack/core_ext.rb b/src/main/ruby/jruby/rack/core_ext.rb
index 0f4a3070..77e5c925 100644
--- a/src/main/ruby/jruby/rack/core_ext.rb
+++ b/src/main/ruby/jruby/rack/core_ext.rb
@@ -22,7 +22,3 @@ class Exception
 class LoadError
   include JRuby::Rack::Capture::LoadPath
 end
-
-class NativeException
-  include JRuby::Rack::Capture::Native
-end
diff --git a/src/main/ruby/jruby/rack/error_app.rb b/src/main/ruby/jruby/rack/error_app.rb
index d64d9c9e..2ae0a639 100644
--- a/src/main/ruby/jruby/rack/error_app.rb
+++ b/src/main/ruby/jruby/rack/error_app.rb
@@ -11,7 +11,11 @@ class ErrorApp
 
       autoload :ShowStatus, 'jruby/rack/error_app/show_status'
 
+      # @private
+      InterruptedException = Java::JavaLang::InterruptedException
+
       EXCEPTION = org.jruby.rack.RackEnvironment::EXCEPTION
+      DEFAULT_EXCEPTION_DETAIL = ''
 
       DEFAULT_RESPONSE_CODE = 500
       DEFAULT_MIME = 'text/plain'
@@ -22,6 +26,8 @@ class ErrorApp
         # org.jruby.rack.RackInitializationException
       ]
 
+      ALLOW_METHODS = 'HEAD, GET, POST, PUT, DELETE, OPTIONS'
+
       attr_reader :root
 
       def initialize(root = nil)
@@ -35,8 +41,7 @@ def initialize(root = nil)
 
       def call(env)
         if env['REQUEST_METHOD'] == 'OPTIONS'
-          allow_methods = 'HEAD, GET, POST, PUT, DELETE, OPTIONS'
-          return [ 200, {'Allow' => allow_methods, 'Content-Length' => '0'}, [] ]
+          return [ 200, {'Allow' => ALLOW_METHODS, 'Content-Length' => '0'}, [] ]
         end
 
         code = response_code(env)
@@ -56,7 +61,14 @@ def call(env)
 
       def response_code(env)
         if exc = env[EXCEPTION]
-          env['rack.showstatus.detail'] = exc.message rescue ''
+          unless env.key?(key = 'rack.showstatus.detail')
+            begin
+              env[key] = exc.message || DEFAULT_EXCEPTION_DETAIL
+            rescue => e
+              env[key] = DEFAULT_EXCEPTION_DETAIL
+              warn e.inspect
+            end
+          end
           map_error_code(exc)
         else
           nil
@@ -85,10 +97,9 @@ def serve(code, path, env)
       protected
 
       def map_error_code(exc)
-        cause = exc.respond_to?(:cause) ? exc.cause : nil
         if UNAVAILABLE_EXCEPTIONS.any? { |type| exc.kind_of?(type) }
           503 # Service Unavailable
-        elsif cause.kind_of?(Java::JavaLang::InterruptedException)
+        elsif exc.respond_to?(:cause) && exc.cause.kind_of?(InterruptedException)
           503 # Service Unavailable
         else
           500
@@ -106,6 +117,8 @@ def respond(status = nil, body = nil, headers = DEFAULT_HEADERS)
 
       class FileBody
 
+        CHUNK_SIZE = 8192
+
         attr_reader :path, :size
         alias to_path path
 
@@ -115,7 +128,7 @@ def each
           File.open(@path, "rb") do |file|
             # file.seek(0)
             remaining = @size || (1.0 / 0)
-            chunk_size = 8192
+            chunk_size = CHUNK_SIZE
             while remaining > 0
               chunk_size = remaining if remaining < chunk_size
               break unless part = file.read(chunk_size)
@@ -141,13 +154,21 @@ def expand_path(path, root = self.root)
 
       begin
         require 'rack/utils'
+        Utils = ::Rack::Utils
+
+        if ''.respond_to?(:bytesize) # Ruby >= 1.9
+          def Utils.bytesize(string); string.bytesize end
+        else
+          def Utils.bytesize(string); string.size end
+        end unless defined? Utils.bytesize
+
         require 'rack/mime'
       rescue LoadError; end
 
-      if defined? Rack::Utils.best_q_match
+      if defined? Utils.best_q_match
 
         def accepts_html?(env)
-          Rack::Utils.best_q_match(env['HTTP_ACCEPT'], %w[text/html])
+          Utils.best_q_match(env['HTTP_ACCEPT'], %w[text/html])
         rescue
           http_accept?(env, 'text/html')
         end
diff --git a/src/main/ruby/jruby/rack/error_app/show_status.rb b/src/main/ruby/jruby/rack/error_app/show_status.rb
index 0f2b6685..289fe393 100644
--- a/src/main/ruby/jruby/rack/error_app/show_status.rb
+++ b/src/main/ruby/jruby/rack/error_app/show_status.rb
@@ -5,26 +5,26 @@ class JRuby::Rack::ErrorApp
   # catches empty responses and replaces them with a site explaining the error.
   #
   # @note kindly adapted from on Rack::ShowStatus
-  # @private internal API - likely won't exist in 1.2.x
+  # @private internal API - likely won't exist in 1.2
   class ShowStatus
 
     def initialize(app)
       require 'rack/request'; require 'rack/utils'
-      @app = app
-      @template = ERB.new(TEMPLATE)
+      @app = app; @template = ERB.new(TEMPLATE, nil, '-')
     end
 
     def call(env)
       status, headers, body = @app.call(env)
-      headers = ::Rack::Utils::HeaderHash.new(headers)
+      headers = Utils::HeaderHash.new(headers)
       empty = headers['Content-Length'].to_i <= 0
 
+      detail = env['rack.showstatus.detail']
       # client or server error, or explicit message
-      if (status.to_i >= 400 && empty) || env["rack.showstatus.detail"]
+      if (status.to_i >= 400 && empty) || detail
         # required erb template variables (captured with binding) :
-        req = req = ::Rack::Request.new(env)
-        message = ::Rack::Utils::HTTP_STATUS_CODES[status.to_i] || status.to_s
-        detail = detail = env["rack.showstatus.detail"] || message
+        request = req = ::Rack::Request.new(env); request && req # avoid un-used warning
+        message = Utils::HTTP_STATUS_CODES[status.to_i] || status.to_s
+        detail = detail.nil? ? message : detail # false for no detail
 
         body = @template.result(binding)
         size = body.bytesize
@@ -36,12 +36,7 @@ def call(env)
 
     # @private
     def h(obj)
-      case obj
-      when String
-        ::Rack::Utils.escape_html(obj)
-      else
-        ::Rack::Utils.escape_html(obj.inspect)
-      end
+      obj.is_a?(String) ? Utils.escape_html(obj) : Utils.escape_html(obj.inspect)
     end
 
     # :stopdoc:
@@ -55,7 +50,7 @@ def h(obj)
 <html lang="en">
 <head>
   <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-  <title><%=h message %> at <%=h req.script_name + req.path_info %></title>
+  <title><%=h message %> at <%=h request.script_name + request.path_info %></title>
   <meta name="robots" content="NONE,NOARCHIVE" />
   <style type="text/css">
     html * { padding:0; margin:0; }
@@ -81,16 +76,16 @@ def h(obj)
     <table class="meta">
       <tr>
         <th>Request Method:</th>
-        <td><%=h req.request_method %></td>
+        <td><%=h request.request_method %></td>
       </tr>
       <tr>
         <th>Request URL:</th>
-      <td><%=h req.url %></td>
+        <td><%=h request.url %></td>
       </tr>
     </table>
   </div>
   <div id="info">
-    <p><%=h detail %></p>
+    <% if detail -%><p><%=h detail %></p><% end %>
   </div>
 
   <div id="explanation">
@@ -102,6 +97,5 @@ def h(obj)
 </html>
 HTML
 
-    # :startdoc:
   end
 end
diff --git a/src/main/ruby/jruby/rack/rails/extensions.rb b/src/main/ruby/jruby/rack/rails/extensions.rb
index 8af6eaa1..1ae698c1 100644
--- a/src/main/ruby/jruby/rack/rails/extensions.rb
+++ b/src/main/ruby/jruby/rack/rails/extensions.rb
@@ -17,6 +17,10 @@ def servlet_request
       request.env['java.servlet_request']
     end
 
+    def servlet_response
+      request.env['java.servlet_response']
+    end
+
     def forward_to(url)
       request.forward_to(url)
     end
diff --git a/src/main/ruby/jruby/rack/rails/railtie.rb b/src/main/ruby/jruby/rack/rails/railtie.rb
index 015b1fa0..1ef002ab 100644
--- a/src/main/ruby/jruby/rack/rails/railtie.rb
+++ b/src/main/ruby/jruby/rack/rails/railtie.rb
@@ -1,4 +1,5 @@
 #--
+# Copyright (c) 2012-2016 Karol Bucek, LTD.
 # Copyright (c) 2010-2012 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
@@ -11,15 +12,14 @@
 module JRuby::Rack
   class Railtie < ::Rails::Railtie
 
-    # settings Rails.public_path in an initializer seems "too" late @see #99
     config.before_configuration do |app|
-      paths, public = app.config.paths, Pathname.new(JRuby::Rack.public_path)
+      paths = app.config.paths; public = JRuby::Rack.public_path
       if paths.respond_to?(:'[]') && paths.respond_to?(:keys)
-        # Rails 3.1/3.2/4.0: paths["app/controllers"] style
+        # Rails 3.1/3.2/4.x: paths["app/controllers"] style
         old_public  = Pathname.new(paths['public'].to_a.first)
         javascripts = Pathname.new(paths['public/javascripts'].to_a.first)
         stylesheets = Pathname.new(paths['public/stylesheets'].to_a.first)
-        paths['public'] = public.to_s
+        paths['public'] = public.to_s; public = Pathname.new(public)
         paths['public/javascripts'] = public.join(javascripts.relative_path_from(old_public)).to_s
         paths['public/stylesheets'] = public.join(stylesheets.relative_path_from(old_public)).to_s
       else
@@ -27,10 +27,10 @@ class Railtie < ::Rails::Railtie
         old_public  = Pathname.new(paths.public.to_a.first)
         javascripts = Pathname.new(paths.public.javascripts.to_a.first)
         stylesheets = Pathname.new(paths.public.stylesheets.to_a.first)
-        paths.public = public.to_s
+        paths.public = public.to_s; public = Pathname.new(public)
         paths.public.javascripts = public.join(javascripts.relative_path_from(old_public)).to_s
         paths.public.stylesheets = public.join(stylesheets.relative_path_from(old_public)).to_s
-      end
+      end if public # nil if /public does not exist
     end
 
     # TODO prefix initializers with 'jruby_rack.' !?
@@ -64,8 +64,8 @@ class Railtie < ::Rails::Railtie
       # - when a *config.relative_url_root* is set we should not interfere ...
       if ( env_url_root = ENV['RAILS_RELATIVE_URL_ROOT'] ) &&
         !( app.config.respond_to?(:relative_url_root) && app.config.relative_url_root )
-        if ( config = app.config ).action_controller
-          config.action_controller.relative_url_root = env_url_root
+        if action_controller = app.config.action_controller
+          action_controller.relative_url_root = env_url_root
         elsif defined?(ActionController::Base) &&
           ActionController::Base.respond_to?(:relative_url_root=)
           # setting the config affects *ActionController::Base.relative_url_root*
diff --git a/src/main/ruby/jruby/rack/session_store.rb b/src/main/ruby/jruby/rack/session_store.rb
index 77f6ab57..860d6bc8 100644
--- a/src/main/ruby/jruby/rack/session_store.rb
+++ b/src/main/ruby/jruby/rack/session_store.rb
@@ -91,7 +91,12 @@ def get_servlet_session(env, create = false)
             unless servlet_request = env['java.servlet_request']
               raise "JavaServletStore expects a servlet request at env['java.servlet_request']"
             end
-            servlet_session = servlet_request.getSession(create)
+            servlet_session =
+              begin
+                servlet_request.getSession(create)
+              rescue java.lang.IllegalStateException => e
+                raise "Failed to obtain session due to IllegalStateException: #{e.message}"
+              end
             env[ENV_SERVLET_SESSION_KEY] = servlet_session
           end
         rescue java.lang.IllegalStateException # cached session invalidated
diff --git a/src/main/ruby/jruby/rack/version.rb b/src/main/ruby/jruby/rack/version.rb
index 60322830..81d765f9 100644
--- a/src/main/ruby/jruby/rack/version.rb
+++ b/src/main/ruby/jruby/rack/version.rb
@@ -1,4 +1,5 @@
 #--
+# Copyright (c) 2012-2017 Karol Bucek, LTD.
 # Copyright (c) 2010-2012 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
diff --git a/src/main/ruby/rack/handler/servlet/default_env.rb b/src/main/ruby/rack/handler/servlet/default_env.rb
index 7180b51e..3ef24ffd 100644
--- a/src/main/ruby/rack/handler/servlet/default_env.rb
+++ b/src/main/ruby/rack/handler/servlet/default_env.rb
@@ -1,4 +1,5 @@
 #--
+# Copyright (c) 2012-2016 Karol Bucek, LTD.
 # Copyright (c) 2010-2012 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
@@ -29,6 +30,8 @@ class DefaultEnv < Hash # The environment must be an instance of Hash !
           SCRIPT_NAME SERVER_NAME SERVER_PORT SERVER_SOFTWARE).
           map!(&:freeze)
 
+        attr_reader :env
+
         # Factory method for creating the Hash.
         # Besides initializing a new env instance this method by default
         # eagerly populates (and returns) the env Hash.
@@ -59,6 +62,16 @@ def initialize(servlet_env = nil)
           end
         end
 
+        # If a block is given, it yields to the block if the value hasn't been set
+        # on the request.
+        def fetch_header(name, &block)
+          @env.fetch(name, &block)
+        end
+
+        def get_header(key)
+          @env[key]
+        end
+
         def populate
           unless @populated ||= false
             populate! if @servlet_env
@@ -74,6 +87,16 @@ def populate!
           self
         end
 
+        def session_options
+          fetch_header(RACK_SESSION_OPTIONS) do |k|
+            set_header RACK_SESSION_OPTIONS, {}
+          end
+        end
+
+        def set_header(name, v)
+          @env[name] = v
+        end
+
         def to_hash(bare = nil)
           if bare
             {}.update(populate)
@@ -82,13 +105,23 @@ def to_hash(bare = nil)
           end
         end
 
+        # @private
+        DEFAULT = Object.new
+        private_constant :DEFAULT rescue nil
+
+        alias_method '_fetch', :fetch; private '_fetch' # Hash#fetch
+        def fetch(key, default = DEFAULT, &block)
+          default.equal?(DEFAULT) ? _fetch(key, &block) : _fetch(key, default, &block)
+        end
+
         def [](key)
-          val = super
-          val.nil? ? load_env_key(self, key) : val
+          value = _fetch(key, DEFAULT)
+          value.equal?(DEFAULT) ? load_env_key(self, key) : value
         end
 
+        alias_method '_key?', :key?; private '_key?'
         def key?(key)
-          super || load_env_key(self, key) != nil
+          _key?(key) || load_env_key(self, key) != nil
         end
         alias_method :has_key?, :key?
         alias_method :include?, :key?
@@ -113,7 +146,7 @@ def load_attributes
             when 'CONTENT_TYPE'
               @env[name] = value if value
             else
-              @env[name] = value ? value : ''
+              @env[name] = value
             end
           end
         end
diff --git a/src/main/ruby/rack/handler/servlet/servlet_env.rb b/src/main/ruby/rack/handler/servlet/servlet_env.rb
index 0cbb9d34..efc469d4 100644
--- a/src/main/ruby/rack/handler/servlet/servlet_env.rb
+++ b/src/main/ruby/rack/handler/servlet/servlet_env.rb
@@ -1,4 +1,5 @@
 #--
+# Copyright (c) 2012-2016 Karol Bucek, LTD.
 # Copyright (c) 2010-2012 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
@@ -100,13 +101,10 @@ def load_parameters
         end
 
         def [](key)
-          value = super(key)
           if key.eql? QUERY_HASH
-            if @parameter_error ||= nil
-              raise @parameter_error
-            end
+            raise @parameter_error if @parameter_error ||= nil
           end
-          value
+          super(key)
         end
         public :[]
 
diff --git a/src/spec/ruby/jruby/rack/error_app_spec.rb b/src/spec/ruby/jruby/rack/error_app_spec.rb
index 539af893..1fae7967 100644
--- a/src/spec/ruby/jruby/rack/error_app_spec.rb
+++ b/src/spec/ruby/jruby/rack/error_app_spec.rb
@@ -11,23 +11,25 @@
 
   before(:all) { require 'jruby/rack/error_app' }
 
+  let(:error_app) { JRuby::Rack::ErrorApp.new } # subject { error_app }
+
   before :each do
     @servlet_request = double "servlet request"
     @env = {'java.servlet_request' => @servlet_request}
+    # for Rack::Request to work (rendered from ShowStatus's TEMPLATE) :
+    @env["rack.url_scheme"] = 'http'
   end
 
-  subject { JRuby::Rack::ErrorApp.new }
-
   it "should determine the response status code based on the exception in the servlet attribute" do
     init_exception
 
-    expect( subject.call(@env)[0] ).to eql 500
+    expect( error_app.call(@env)[0] ).to eql 500
     @env["rack.showstatus.detail"].should == "something went wrong"
   end
 
   it "returns 503 if there is a nested InterruptedException" do
     init_exception java.lang.InterruptedException.new
-    response = subject.call(@env)
+    response = error_app.call(@env)
 
     expect( response[0] ).to eql 503
     expect( response[1] ).to be_a Hash
@@ -38,7 +40,7 @@
     @env[ 'HTTP_ACCEPT' ] = 'text/html'
     @env[ JRuby::Rack::ErrorApp::EXCEPTION ] = org.jruby.rack.AcquireTimeoutException.new('failed')
 
-    response = subject.call(@env)
+    response = error_app.call(@env)
     expect( response[0] ).to eql 503
     expect( response[1] ).to be_a Hash
     expect( response[2] ).to eql []
@@ -80,6 +82,69 @@
     end
   end
 
+  it spec = "still serves when retrieving exception's message fails" do
+    @env[ 'HTTP_ACCEPT' ] = '*/*'
+    @env[ JRuby::Rack::ErrorApp::EXCEPTION ] = InitException.new spec
+
+    response = error_app.call(@env)
+    expect( response[0] ).to eql 500
+    expect( response[1] ).to be_a Hash
+    expect( response[2] ).to eql []
+  end
+
+  class InitException < org.jruby.rack.RackInitializationException
+    def message; raise super.to_s end
+  end
+
+  context 'show-status' do
+
+    let(:show_status) do
+      JRuby::Rack::ErrorApp::ShowStatus.new error_app
+    end
+
+    it "does not alter 'rack.showstatus.detail' when set" do
+      @env[ 'HTTP_ACCEPT' ] = '*/*'; init_exception
+      @env[ 'rack.showstatus.detail' ] = false
+
+      response = show_status.call(@env)
+      expect( response[0] ).to eql 500
+      expect( @env[ 'rack.showstatus.detail' ] ).to be false
+    end
+
+    it "renders template" do
+      @env[ 'HTTP_ACCEPT' ] = '*/*'; init_exception
+
+      response = show_status.call(@env)
+      expect( response[0] ).to eql 500
+      body = response[2][0]
+      expect( body ).to include 'Internal Server Error'
+      expect( body ).to match /<div id="info">\n\s{4}<p>something went wrong<\/p>\n\s{2}<\/div>/m
+    end
+
+    it "does not render detail info when 'rack.showstatus.detail' set to false" do
+      @env[ 'HTTP_ACCEPT' ] = '*/*'; init_exception
+      @env[ 'rack.showstatus.detail' ] = false
+
+      response = show_status.call(@env)
+      expect( response[0] ).to eql 500
+      expect( response[2][0] ).to match /<div id="info">\s*?<\/div>/m
+      expect( @env[ 'rack.showstatus.detail' ] ).to be false
+    end
+
+    it "with response < 400 and 'rack.showstatus.detail' set to false does not render exception" do
+      @env[ 'HTTP_ACCEPT' ] = '*/*'; init_exception
+      @env[ 'rack.showstatus.detail' ] = false
+
+      def error_app.map_error_code(exc); 399 end
+
+      response = show_status.call(@env)
+      expect( response[0] ).to eql 399
+      # 399, {"Content-Type"=>"text/plain", "X-Cascade"=>"pass"}, []
+      expect( @env[ 'rack.showstatus.detail' ] ).to be false
+    end
+
+  end
+
   private
 
   def init_exception(cause = nil)
diff --git a/src/spec/ruby/jruby/rack/rails_booter_spec.rb b/src/spec/ruby/jruby/rack/rails_booter_spec.rb
index 2e6e9fcd..0f29ee01 100644
--- a/src/spec/ruby/jruby/rack/rails_booter_spec.rb
+++ b/src/spec/ruby/jruby/rack/rails_booter_spec.rb
@@ -16,13 +16,17 @@
     JRuby::Rack::RailsBooter.new JRuby::Rack.context = @rack_context
   end
 
+  let(:rails_booter) do
+    rails_booter = booter; def rails_booter.rails2?; nil end; rails_booter
+  end
+
   after { JRuby::Rack.context = nil; JRuby::Rack.logger = nil }
 
   it "should determine RAILS_ROOT from the 'rails.root' init parameter" do
     @rack_context.should_receive(:getInitParameter).with("rails.root").and_return "/WEB-INF"
     @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "./WEB-INF"
-    booter.boot!
-    booter.app_path.should == "./WEB-INF"
+    rails_booter.boot!
+    rails_booter.app_path.should == "./WEB-INF"
   end
 
   before do
@@ -37,62 +41,62 @@
 
   it "should default rails path to /WEB-INF" do
     @rack_context.should_receive(:getRealPath).with("/WEB-INF").and_return "/usr/apps/WEB-INF"
-    booter.boot!
-    booter.app_path.should == "/usr/apps/WEB-INF"
+    rails_booter.boot!
+    rails_booter.app_path.should == "/usr/apps/WEB-INF"
   end
 
   it "leaves ENV['RAILS_ENV'] as is if it was already set" do
     ENV['RAILS_ENV'] = 'staging'
-    booter.boot!
+    rails_booter.boot!
     ENV['RAILS_ENV'].should == 'staging'
-    booter.rails_env.should == "staging"
+    rails_booter.rails_env.should == "staging"
   end
 
   it "determines RAILS_ENV from the 'rails.env' init parameter" do
     ENV['RAILS_ENV'] = nil
     @rack_context.should_receive(:getInitParameter).with("rails.env").and_return "test"
-    booter.boot!
-    booter.rails_env.should == "test"
+    rails_booter.boot!
+    rails_booter.rails_env.should == "test"
   end
 
   it "gets rails environment from rack environmnent" do
     ENV.delete('RAILS_ENV')
     ENV['RACK_ENV'] = 'development'
     @rack_context.stub(:getInitParameter)
-    booter.boot!
-    booter.rails_env.should == 'development'
+    rails_booter.boot!
+    rails_booter.rails_env.should == 'development'
   end
 
   it "default RAILS_ENV to 'production'" do
     ENV.delete('RAILS_ENV'); ENV.delete('RACK_ENV')
-    booter.boot!
-    booter.rails_env.should == "production"
+    rails_booter.boot!
+    rails_booter.rails_env.should == "production"
   end
 
   it "should set RAILS_RELATIVE_URL_ROOT based on the servlet context path" do
     @rack_context.should_receive(:getContextPath).and_return '/myapp'
-    booter.boot!
+    rails_booter.boot!
     ENV['RAILS_RELATIVE_URL_ROOT'].should == '/myapp'
   end
 
   it "should append to RAILS_RELATIVE_URL_ROOT if 'rails.relative_url_append' is set" do
     @rack_context.should_receive(:getContextPath).and_return '/myapp'
     @rack_context.should_receive(:getInitParameter).with("rails.relative_url_append").and_return "/blah"
-    booter.boot!
+    rails_booter.boot!
     ENV['RAILS_RELATIVE_URL_ROOT'].should == '/myapp/blah'
   end
 
   it "should determine the public html root from the 'public.root' init parameter" do
     @rack_context.should_receive(:getInitParameter).with("public.root").and_return "/blah"
     @rack_context.should_receive(:getRealPath).with("/blah").and_return "."
-    booter.boot!
-    booter.public_path.should == "."
+    rails_booter.boot!
+    rails_booter.public_path.should == "."
   end
 
   it "should default public root to '/'" do
     @rack_context.should_receive(:getRealPath).with("/").and_return "."
-    booter.boot!
-    booter.public_path.should == "."
+    rails_booter.boot!
+    rails_booter.public_path.should == "."
   end
 
   it "uses JRuby-Rack's logger by default" do
@@ -102,6 +106,12 @@
     booter.logger.info 'hello-there'
   end
 
+  it "should create a log device that writes messages to the servlet context" do
+    rails_booter.boot!
+    @rack_context.should_receive(:log).with(/hello/)
+    booter.logger.instance_variable_get(:@logdev).write "hello"
+  end
+
   it "detects 2.3" do
     root = File.expand_path('../../../rails23', __FILE__)
     @rack_context.should_receive(:getInitParameter).with("rails.root").and_return root
@@ -118,6 +128,8 @@
 
   describe "Rails 2.3", :lib => :stub do
 
+    RAILS23_ROOT_DIR = File.expand_path("../../../rails23", __FILE__)
+
     before do
       booter.stub(:rails2?).and_return true
     end
@@ -163,12 +175,13 @@
     it "should set the PUBLIC_ROOT constant to the location of the public root",
       :lib => [ :rails23, :stub ] do
 
-      booter.app_path = File.expand_path("../../../rails23", __FILE__)
+      booter.app_path = RAILS23_ROOT_DIR
       booter.boot!
       expect( PUBLIC_ROOT ).to eql booter.public_path
     end
 
     after(:each) do
+      #Object.send :remove_const, :RAILS_ROOT if Object.const_defined? :RAILS_ROOT
       Object.send :remove_const, :PUBLIC_ROOT if Object.const_defined? :PUBLIC_ROOT
     end
 
@@ -177,7 +190,7 @@
       before :each do
         $servlet_context = @servlet_context
         @rack_context.should_receive(:getContextPath).and_return "/foo"
-        booter.app_path = File.expand_path("../../../rails23", __FILE__)
+        booter.app_path = RAILS23_ROOT_DIR
         booter.boot!
         silence_warnings { booter.load_environment }
       end
@@ -212,16 +225,29 @@
 
   end if defined? Rails
 
+  RAILS_ROOT_DIR = File.expand_path("../../../rails3x", __FILE__)
+
   # NOTE: specs currently only test with a stubbed Rails::Railtie
   describe "Rails 3.x", :lib => :stub do
 
+    before :all do
+      $LOAD_PATH.unshift File.join(RAILS_ROOT_DIR, 'stub') # for require 'rails/railtie'
+    end
+
     before :each do
       $servlet_context = @servlet_context
-      booter.app_path = File.expand_path("../../../rails3x", __FILE__)
+      booter.layout_class = JRuby::Rack::FileSystemLayout
+      booter.app_path = RAILS_ROOT_DIR.dup
       booter.boot!
       silence_warnings { booter.load_environment }
     end
 
+    after :each do
+      [ :app_path, :public_path, :context ].each do |name|
+        JRuby::Rack.send :remove_instance_variable, :"@#{name}"
+      end
+    end
+
     after :all do
       $servlet_context = nil
     end
@@ -231,9 +257,8 @@
     end
 
     it "should set the application configuration's public path" do
-      paths = {}
-      for p in %w( public public/javascripts public/stylesheets )
-        paths[p] = [p]
+      paths = %w( public public/javascripts public/stylesheets ).inject({}) do
+        |hash, path| hash[ path ] = [ File.join(RAILS_ROOT_DIR, path) ]; hash
       end
       app = double("app"); app.stub_chain(:config, :paths).and_return(paths)
       public_path = Pathname.new(booter.public_path)
@@ -241,6 +266,7 @@
       Rails::Railtie.config.__before_configuration.size.should == 1
       before_config = Rails::Railtie.config.__before_configuration.first
       before_config.should_not be nil
+
       before_config.call(app)
 
       paths['public'].should == public_path.to_s
@@ -248,6 +274,22 @@
       paths['public/stylesheets'].should == public_path.join("stylesheets").to_s
     end
 
+    it "works when JRuby::Rack.public_path is nil (public does not exist)" do
+      paths = %w( public public/javascripts public/stylesheets ).inject({}) do
+        |hash, path| hash[ path ] = [ path.sub('public', 'NO-SUCH-DiR') ]; hash
+      end
+      app = double("app"); app.stub_chain(:config, :paths).and_return(paths)
+      JRuby::Rack.public_path = nil
+
+      before_config = Rails::Railtie.config.__before_configuration.first
+      before_config.should_not be nil
+      before_config.call(app)
+
+      paths['public'].should == [ public_path = "NO-SUCH-DiR" ]
+      paths['public/javascripts'].should == [ File.join(public_path, "javascripts") ]
+      paths['public/stylesheets'].should ==[ File.join(public_path, "stylesheets") ]
+    end
+
     it "should not set the PUBLIC_ROOT constant" do
       lambda { PUBLIC_ROOT }.should raise_error
     end
@@ -296,12 +338,14 @@ def logger=(logger); @logger = logger; end
       end
 
       it "is wrapped in tagged logging" do # Rails 3.2
-        tagged_logging = ActiveSupport::TaggedLogging rescue nil
+        active_support = defined? ::ActiveSupport
+        tagged_logging = active_support && ActiveSupport::TaggedLogging rescue nil
         begin
           klass = Class.new do # TaggedLogging stub
             def initialize(logger); @logger = logger end
           end
-          ActiveSupport.const_set(:TaggedLogging, klass)
+          module ::ActiveSupport; end
+          ::ActiveSupport.const_set(:TaggedLogging, klass)
           @config.stub(:log_level).and_return(nil)
           @config.stub(:log_formatter).and_return(nil)
 
@@ -310,7 +354,11 @@ def initialize(logger); @logger = logger end
           @app.config.logger.instance_variable_get(:@logger).should be_a(Logger)
         ensure
           if tagged_logging.nil?
-            ActiveSupport.send :remove_const, :TaggedLogging
+            if active_support
+              ActiveSupport.send :remove_const, :TaggedLogging
+            else
+              Object.send :remove_const, :ActiveSupport rescue nil
+            end
           else
             ActiveSupport.const_set(:TaggedLogging, tagged_logging)
           end
@@ -342,14 +390,16 @@ def log_initializer
       before_config.last.call(app)
     end
 
-  end if defined? Rails
+  end # if defined? Rails
 
   # NOTE: specs currently only test with a stubbed Rails::Railtie
   describe "Rails 3.1", :lib => [ :stub ] do
 
     before :each do
       $servlet_context = @servlet_context
-      booter.app_path = File.expand_path("../../../rails3x", __FILE__)
+      #booter.layout_class = JRuby::Rack::FileSystemLayout
+      booter.app_path = RAILS_ROOT_DIR.dup
+      def booter.rails2?; false end
       booter.boot!
       booter.load_environment
     end
@@ -364,24 +414,29 @@ def log_initializer
     #      https://github.com/rails/rails/issues/2435
     #
     it "should not set config.action_controller.relative_url_root if the controller doesn't respond to that method" do
-      ENV['RAILS_RELATIVE_URL_ROOT'] = '/blah'
-      app = double "app"
-      app.stub_chain(:config, :action_controller, :respond_to?)
-      # obviously this only tests whatever rails version is loaded
-      # I'm unsure of the best way right now
-      if ActionController::Base.respond_to?(:relative_url_root=)
-        app.config.action_controller.should_receive(:relative_url_root=)
-      else
-        app.config.action_controller.should_not_receive(:relative_url_root=)
+      require 'action_controller' # stub
+      begin
+        #ActionController::Base.send :remove_method, :relative_url_root=
+        ENV['RAILS_RELATIVE_URL_ROOT'] = '/blah'
+        app = double "app"
+        app.stub_chain(:config, :action_controller)
+        app.config.stub(:action_controller).and_return(nil)
+        # app.config.action_controller.should_not_receive(:relative_url_root=)
+        ActionController::Base.stub(:config).and_return app.config
+
+        app.config.should_receive(:relative_url_root=).with('/blah')
+        ActionController::Base.should_not_receive(:relative_url_root=)
+
+        init = Rails::Railtie.__initializer.detect { |i| i.first =~ /url/ }
+        init.should_not be nil
+        init[1].should == [{:after => "action_controller.set_configs"}]
+        init.last.call(app)
+      ensure
+        #ActionController::Base.send :attr_writer, :relative_url_root
       end
-
-      init = Rails::Railtie.__initializer.detect { |i| i.first =~ /url/ }
-      init.should_not be nil
-      init[1].should == [{:after => "action_controller.set_configs"}]
-      init.last.call(app)
     end
 
-  end if defined? Rails
+  end # if defined? Rails
 
 end
 
@@ -403,7 +458,10 @@ def log_initializer
   let(:servlet_response) { org.jruby.rack.mock.MockHttpServletResponse.new }
 
   before :each do
-    request.stub(:env).and_return 'java.servlet_request' => servlet_request
+    request.stub(:env).and_return({
+        'java.servlet_request' => servlet_request,
+        'java.servlet_response' => servlet_response
+    })
     response.stub(:headers).and_return @headers = {}
   end
 
@@ -412,6 +470,11 @@ def log_initializer
     controller.servlet_request.should == servlet_request
   end
 
+  it "should add a #servlet_response method to ActionController::Base" do
+    controller.should respond_to(:servlet_response)
+    controller.servlet_response.should == servlet_response
+  end
+
   it "should add a #forward_to method for forwarding to another servlet" do
     #@servlet_response = double "servlet response"
     controller.request.should_receive(:forward_to).with("/forward.jsp")
diff --git a/src/spec/ruby/rack/handler/servlet_spec.rb b/src/spec/ruby/rack/handler/servlet_spec.rb
index 5d3c4f66..8a168fc7 100644
--- a/src/spec/ruby/rack/handler/servlet_spec.rb
+++ b/src/spec/ruby/rack/handler/servlet_spec.rb
@@ -368,6 +368,44 @@ def getAttributeNames
       expect( env['org.apache.internal'] ).to be true
     end
 
+    it "sets attributes with false/null values" do
+      @servlet_request.addHeader "Content-Type", "text/plain"
+      @servlet_request.setContentType 'text/html'
+      @servlet_request.setContent ('0' * 100).to_java_bytes rescue nil # 1.6.8 BUG
+      @servlet_request.setAttribute 'org.false', false
+      @servlet_request.setAttribute 'null.attr', nil
+      @servlet_request.setAttribute 'the.truth', java.lang.Boolean::TRUE
+
+      env = servlet.create_env @servlet_env
+
+      expect( env['org.false'] ).to be false
+      expect( env['null.attr'] ).to be nil
+      expect( env['the.truth'] ).to be true
+
+      expect( env.keys ).to include 'org.false'
+
+      pending "TODO: expect( env.keys ).to include 'null.attr'"
+      #expect( env.keys ).to include 'null.attr'
+    end
+
+    it "works like a Hash (fetching values)" do
+      @servlet_request.addHeader "Content-Type", "text/plain"
+      @servlet_request.setContentType 'text/html'
+
+      env = servlet.create_env @servlet_env
+      env['attr1'] = 1
+      env['attr2'] = false
+      env['attr3'] = nil
+
+      expect( env.fetch('attr1', 11) ).to eql 1
+      expect( env.fetch('attr2', true) ).to eql false
+      expect( env['attr2'] ).to eql false
+      expect( env.fetch('attr3', 33) ).to eql nil
+      expect( env['attr4'] ).to eql nil
+      expect( env.fetch('attr4') { 42 } ).to eql 42
+      expect { env.fetch('attr4') }.to raise_error # KeyError
+    end
+
     it "parses strange request parameters (Rack-compat)" do
       servlet_request = @servlet_request
       servlet_request.setMethod 'GET'
diff --git a/src/spec/ruby/rack/servlet/response_capture_spec.rb b/src/spec/ruby/rack/servlet/response_capture_spec.rb
index 606dff43..8ef3e385 100644
--- a/src/spec/ruby/rack/servlet/response_capture_spec.rb
+++ b/src/spec/ruby/rack/servlet/response_capture_spec.rb
@@ -65,6 +65,16 @@
     expect( response_capture.isHandled(servlet_request) ).to be false
   end
 
+  it "is not considered handled when only Allow or Date header is added with OPTIONS" do
+    servlet_request.method = 'OPTIONS'
+
+    # NOTE: Jetty sets both Date and Allow in DefaultServlet#doOptions
+    response_capture.addHeader "Allow", "GET, POST, OPTIONS"
+    response_capture.addHeader "Date", Time.now.httpdate
+
+    expect( response_capture.isHandled(servlet_request) ).to be false
+  end
+
   it "is considered handled when more than Allow header is added with OPTIONS" do
     pending "need Servlet API 3.0" unless servlet_30?
 
@@ -100,4 +110,4 @@ def servlet_30?
     Java::JavaClass.for_name('javax.servlet.AsyncContext') rescue nil
   end
 
-end
\ No newline at end of file
+end
diff --git a/src/spec/ruby/rails23/config/boot.rb b/src/spec/ruby/rails23/config/boot.rb
index 82361503..7713bd40 100644
--- a/src/spec/ruby/rails23/config/boot.rb
+++ b/src/spec/ruby/rails23/config/boot.rb
@@ -3,6 +3,8 @@
 
 RAILS_ROOT = "#{ENV['RAILS_ROOT']}"
 
+def RAILS_ROOT.inspect; "#{super} set at: #{__FILE__}" end
+
 # Simulate the Rails 2.0 boot process here, to test our boot hook
 module Rails
   class << self
diff --git a/src/spec/ruby/rails3x/public/.gitkeep b/src/spec/ruby/rails3x/public/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/src/spec/ruby/rails3x/public/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/src/spec/ruby/rails3x/stub/action_controller.rb b/src/spec/ruby/rails3x/stub/action_controller.rb
new file mode 100644
index 00000000..ced2ff62
--- /dev/null
+++ b/src/spec/ruby/rails3x/stub/action_controller.rb
@@ -0,0 +1,9 @@
+#--
+# Stubbed out Rails classes for testing
+#++
+
+module ActionController
+  class Base
+    attr_accessor :relative_url_root
+  end
+end
diff --git a/src/spec/ruby/rails23/stub/rails/railtie.rb b/src/spec/ruby/rails3x/stub/rails/railtie.rb
similarity index 100%
rename from src/spec/ruby/rails23/stub/rails/railtie.rb
rename to src/spec/ruby/rails3x/stub/rails/railtie.rb
diff --git a/src/spec/ruby/spec_helper.rb b/src/spec/ruby/spec_helper.rb
index 650afbdf..e5867313 100644
--- a/src/spec/ruby/spec_helper.rb
+++ b/src/spec/ruby/spec_helper.rb
@@ -168,10 +168,8 @@ def should_not_eval_as_nil(code, runtime = @runtime) # alias
   end
 rescue LoadError
 end
-# add to load path for stubbed out action_controller, railtie etc
-$LOAD_PATH.unshift File.expand_path('../rails/stub', __FILE__) unless defined?(Rails::VERSION)
 
-# current 'library' environment (based on appraisals) e.g. :rails31
+# current 'library' environment (based on appraisals) e.g. :rails32
 CURRENT_LIB = defined?(Rails::VERSION) ?
   :"rails#{Rails::VERSION::MAJOR}#{Rails::VERSION::MINOR}" : :stub
 
@@ -194,13 +192,7 @@ def should_not_eval_as_nil(code, runtime = @runtime) # alias
   config.filter_run_excluding :lib => lambda { |lib|
     return false if lib.nil? # no :lib => specified run with all
     lib = lib.is_a?(Array) ? lib : [ lib ]
-    if CURRENT_LIB == :rails40
-      if RUBY_VERSION < '1.9'
-        return true # NOTE: no sense running Rails 4.0 on 1.8.x
-      end
-      #return ! lib.include?(:rails32)
-    end
-    ! lib.include?(CURRENT_LIB)
+    return ! lib.include?(CURRENT_LIB)
   }
 
   config.backtrace_exclusion_patterns = [