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
jruby · Jul 18, 2024 · cb383b3 · cb383b3
2 parents 5748707 + 610d87f
commit cb383b3
Show file tree

Hide file tree

Showing 43 changed files with 650 additions and 579 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"