Merge remote-tracking branch 'refs/remotes/upstream/1.1-stable' into merge-1.1.x-changes

# Conflicts:
#	.travis.yml
#	Appraisals
#	Gemfile
#	Gemfile.lock
#	gemfiles/rails30.gemfile.lock
#	gemfiles/rails31.gemfile.lock
#	gemfiles/rails32.gemfile
#	gemfiles/rails32.gemfile.lock
#	gemfiles/rails40.gemfile
#	gemfiles/rails40.gemfile.lock
#	gemfiles/rails41.gemfile
#	gemfiles/rails41.gemfile.lock
#	gemfiles/rails42.gemfile
#	gemfiles/rails42.gemfile.lock
#	gemfiles/railsNG.gemfile.lock
#	pom.xml
#	src/main/java/org/jruby/rack/RackInput.java
#	src/main/ruby/jruby/rack/booter.rb
#	src/main/ruby/jruby/rack/error_app.rb
#	src/main/ruby/jruby/rack/error_app/show_status.rb
#	src/main/ruby/jruby/rack/response.rb
#	src/main/ruby/jruby/rack/version.rb
#	src/spec/ruby/jruby/rack/booter_spec.rb
#	src/spec/ruby/jruby/rack/rails_booter_spec.rb
#	src/spec/ruby/rack/application_spec.rb

Author: chadlwilson

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

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)