Skip to content

Commit 160e933

Browse files
headiusheadius
committed
Merge remote-tracking branch 'origin/1.1-stable' into merge-1.1-stable
2 parents faaabb6 + cbee8b5 commit 160e933

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1269
-581
lines changed

‎.travis.yml

+152-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,18 @@ branches:
99
- /.*stable$/
1010
- /^test-.*$/
1111
rvm:
12+
<<<<<<< HEAD
1213
# NOTE: do not use jruby-19mode otherwise some specs might fail
1314
# @see ruby/rack/application_spec.rb for an explanation on this
1415
#- jruby-18mode
1516
#- jruby-19mode
1617
- jruby-1.7.16
1718
- jruby-head
19+
=======
20+
- jruby-1.6.8
21+
- jruby-1.7.26
22+
#- jruby-9.1.8.0 see include matrix
23+
>>>>>>> origin/1.1-stable
1824
jdk:
1925
- openjdk6
2026
- oraclejdk7
@@ -27,20 +33,26 @@ gemfile:
2733
- gemfiles/rails32.gemfile
2834
- gemfiles/rails40.gemfile
2935
- gemfiles/rails41.gemfile
30-
env:
31-
- JRUBY_OPTS="--1.8 $JRUBY_OPTS"
32-
- JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION" # for mvn's jruby plugins
36+
- gemfiles/rails42.gemfile
37+
#env:
38+
##- JRUBY_OPTS="--1.8 $JRUBY_OPTS"
39+
#- JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION" # for mvn's jruby plugins
3340
before_script:
41+
<<<<<<< HEAD
3442
- export JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false -J-XX:MaxPermSize=128m"
3543
- export JRUBY_VERSION="1.7.13"
3644
- jruby -S gem env || true
45+
=======
46+
- export JRUBY_OPTS="-Xcompile.invokedynamic=false -J-XX:MaxPermSize=96M"
47+
>>>>>>> origin/1.1-stable
3748
before_install:
3849
# NOTE: RubyGems 2.4.x fails us at application_spec's gem_install_rack_unless_installed !
39-
- (jruby --1.9 -S gem update --system 2.2.3) || true
50+
- ((jruby -v | grep -v 9.[0-9].[0-9].[0-9]) && jruby --1.9 -S gem update --system 2.6.12) || true
4051
- ((jruby -v | grep 1.8.7) && jruby --1.9 -S gem update --system 2.1.11) || true
4152
- ((echo $BUNDLE_GEMFILE | grep rails23) && jruby --1.9 -S gem update --system 1.8.29) || true
4253
matrix:
4354
allow_failures:
55+
<<<<<<< HEAD
4456
#- gemfile: gemfiles/rails41.gemfile
4557
exclude:
4658
## avoid jruby-head with JDK6 :
@@ -125,15 +137,138 @@ matrix:
125137
- rvm: jruby-1.7.16
126138
gemfile: gemfiles/rails41.gemfile
127139
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
140+
=======
141+
- rvm: jruby-1.6.8
142+
- gemfile: Gemfile
143+
- gemfile: gemfiles/railsNG.gemfile
144+
include:
145+
# jruby-9.1.8.0
146+
- rvm: jruby-9.1.8.0
147+
gemfile: gemfiles/rails32.gemfile
148+
jdk: oraclejdk7
149+
- rvm: jruby-9.1.8.0
150+
gemfile: gemfiles/rails32.gemfile
151+
jdk: oraclejdk8
152+
- rvm: jruby-9.1.8.0
153+
gemfile: gemfiles/rails40.gemfile
154+
jdk: oraclejdk7
155+
- rvm: jruby-9.1.8.0
156+
gemfile: gemfiles/rails40.gemfile
157+
jdk: oraclejdk8
158+
- rvm: jruby-9.1.8.0
159+
gemfile: gemfiles/rails41.gemfile
160+
jdk: oraclejdk7
161+
- rvm: jruby-9.1.8.0
162+
gemfile: gemfiles/rails41.gemfile
163+
jdk: oraclejdk8
164+
- rvm: jruby-9.1.8.0
165+
gemfile: gemfiles/rails42.gemfile
166+
jdk: oraclejdk7
167+
- rvm: jruby-9.1.8.0
168+
gemfile: gemfiles/rails42.gemfile
169+
jdk: oraclejdk8
170+
# rails NG
171+
- rvm: jruby-9.1.8.0
172+
gemfile: gemfiles/railsNG.gemfile
173+
jdk: oraclejdk7
174+
- rvm: jruby-9.1.8.0
175+
gemfile: gemfiles/railsNG.gemfile
176+
jdk: oraclejdk8
177+
## rails 2.3 --1.8
178+
- rvm: jruby-1.7.4
179+
gemfile: gemfiles/rails23.gemfile
180+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
181+
jdk: oraclejdk7
182+
- rvm: jruby-1.7.4
183+
gemfile: gemfiles/rails23.gemfile
184+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
185+
jdk: oraclejdk8
186+
## rails 3.1 --1.8
187+
- rvm: jruby-1.7.4
188+
gemfile: gemfiles/rails31.gemfile
189+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
190+
jdk: openjdk6
191+
- rvm: jruby-1.7.4
192+
gemfile: gemfiles/rails31.gemfile
193+
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
194+
jdk: oraclejdk7
195+
- rvm: jruby-1.7.26
196+
gemfile: gemfiles/rails32.gemfile
197+
env: JRUBY_OPTS="--2.0 $JRUBY_OPTS"
198+
jdk: oraclejdk8
199+
exclude:
200+
# ## avoid jruby-9K with JDK6 :
201+
# - rvm: jruby-9.1.8.0
202+
# gemfile: Gemfile
203+
# jdk: openjdk6
204+
# - rvm: jruby-9.1.8.0
205+
# gemfile: gemfiles/rails23.gemfile
206+
# jdk: openjdk6
207+
# - rvm: jruby-9.1.8.0
208+
# gemfile: gemfiles/rails30.gemfile
209+
# jdk: openjdk6
210+
# - rvm: jruby-9.1.8.0
211+
# gemfile: gemfiles/rails31.gemfile
212+
# jdk: openjdk6
213+
# - rvm: jruby-9.1.8.0
214+
# gemfile: gemfiles/rails32.gemfile
215+
# jdk: openjdk6
216+
# - rvm: jruby-9.1.8.0
217+
# gemfile: gemfiles/rails40.gemfile
218+
# jdk: openjdk6
219+
# - rvm: jruby-9.1.8.0
220+
# gemfile: gemfiles/rails41.gemfile
221+
# jdk: openjdk6
222+
# - rvm: jruby-9.1.8.0
223+
# gemfile: gemfiles/rails42.gemfile
224+
# jdk: openjdk6
225+
## avoid jruby-1.6.8 with JDK8 :
226+
- rvm: jruby-1.6.8
227+
gemfile: Gemfile
228+
jdk: oraclejdk8
229+
- rvm: jruby-1.6.8
230+
gemfile: gemfiles/rails23.gemfile
231+
jdk: oraclejdk8
232+
- rvm: jruby-1.6.8
233+
gemfile: gemfiles/rails30.gemfile
234+
jdk: oraclejdk8
235+
- rvm: jruby-1.6.8
236+
gemfile: gemfiles/rails31.gemfile
237+
jdk: oraclejdk8
238+
- rvm: jruby-1.6.8
239+
gemfile: gemfiles/rails32.gemfile
240+
jdk: oraclejdk8
241+
- rvm: jruby-1.6.8
242+
gemfile: gemfiles/rails40.gemfile
243+
jdk: oraclejdk8
244+
- rvm: jruby-1.6.8
245+
gemfile: gemfiles/rails41.gemfile
246+
jdk: oraclejdk8
247+
- rvm: jruby-1.6.8
248+
gemfile: gemfiles/rails42.gemfile
249+
jdk: oraclejdk8
250+
## rails 4.0 won't run on JRuby 1.6
251+
- rvm: jruby-1.6.8
252+
gemfile: gemfiles/rails40.gemfile
253+
jdk: openjdk6
254+
- rvm: jruby-1.6.8
255+
gemfile: gemfiles/rails40.gemfile
256+
jdk: oraclejdk7
257+
- rvm: jruby-1.6.8
258+
gemfile: gemfiles/rails40.gemfile
259+
jdk: oraclejdk8
260+
## rails 4.1 won't run on JRuby 1.6
261+
- rvm: jruby-1.6.8
262+
gemfile: gemfiles/rails41.gemfile
263+
>>>>>>> origin/1.1-stable
128264
jdk: openjdk6
129265
- rvm: jruby-1.7.16
130266
gemfile: gemfiles/rails41.gemfile
131-
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
132267
jdk: oraclejdk7
133268
- rvm: jruby-1.7.16
134269
gemfile: gemfiles/rails41.gemfile
135-
env: JRUBY_OPTS="--1.8 $JRUBY_OPTS"
136270
jdk: oraclejdk8
271+
<<<<<<< HEAD
137272
## rails 4.0 does not run on --1.8 (jruby-head)
138273
#- rvm: jruby-head
139274
# gemfile: gemfiles/rails40.gemfile
@@ -296,4 +431,15 @@ matrix:
296431
- rvm: jruby-head
297432
gemfile: gemfiles/rails31.gemfile
298433
env: JRUBY_OPTS="$JRUBY_OPTS" JAVA_OPTS="-Djruby.version=$JRUBY_VERSION"
434+
=======
435+
## rails 4.2 won't run on JRuby 1.6
436+
- rvm: jruby-1.6.8
437+
gemfile: gemfiles/rails42.gemfile
438+
jdk: openjdk6
439+
- rvm: jruby-1.6.8
440+
gemfile: gemfiles/rails42.gemfile
441+
jdk: oraclejdk7
442+
- rvm: jruby-1.6.8
443+
gemfile: gemfiles/rails42.gemfile
444+
>>>>>>> origin/1.1-stable
299445
jdk: oraclejdk8

‎Appraisals

+13-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ appraise "rails30" do
77
end
88

99
appraise "rails31" do
10+
gem "i18n", "< 0.7"
1011
gem "rails", "~> 3.1.12"
1112
end
1213

1314
appraise "rails32" do
15+
gem "i18n", "< 0.7"
1416
gem "rails", "~> 3.2.21"
1517
end
1618

@@ -19,11 +21,20 @@ appraise "rails40" do
1921
end
2022

2123
appraise "rails41" do
22-
gem "rails", "~> 4.1.10"
24+
gem "rails", "~> 4.1.16"
2325
end
2426

2527
appraise "rails42" do
26-
gem "rails", "~> 4.2.1"
28+
gem "mime-types", "< 3", :require => false
29+
gem "rails", "~> 4.2.9"
30+
end
31+
32+
appraise "rails50" do
33+
gem "rails", "~> 5.0.5"
34+
end
35+
36+
appraise "rails51" do
37+
gem "rails", "~> 5.1.2"
2738
end
2839

2940
appraise "railsNG" do

‎Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GEM
2222
rspec-support (3.13.1)
2323

2424
PLATFORMS
25-
universal-java-1.8
25+
universal-java-22
2626

2727
DEPENDENCIES
2828
appraisal (< 1.0)

‎History.md

+34
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
## 1.1.22
2+
3+
- compile using Java 6 source compat
4+
- update (bundled) rack to 1.6.13
5+
- avoid NativeException - not used on recent JRuby
6+
- avoid Fixnum warning - assume recent JRuby
7+
- Add error message to log when runtime error is handled (#213)
8+
9+
## 1.1.21 (17/09/17)
10+
11+
- update (bundled) rack to 1.6.8
12+
- add Rack::Handler::Servlet::DefaultEnv#get_header (#212)
13+
missing methods to handle ActionController::Base#reset_session
14+
- can only safely stream natively on ActionDispatch <= 3.2 (#210)
15+
(broken Rails streaming for Rails 4.x)
16+
- when handling OPTION calls ignore both 'Date' and 'Allow' headers (#205)
17+
18+
## 1.1.20 (22/01/16)
19+
20+
- pre-maturely avoid Ruby frozen string literals coming at us ... ''.dup meh!
21+
- allow to boot when RAILS_ROOT/public directory does not exist (closes #197)
22+
- for better booter detection - export public path after working dir was changed
23+
- `ActionController::Base` provides a method `servlet_response` to return the
24+
`java.servlet_response` rack env (#201)
25+
- adjust jruby home dir fallback (for default $LOAD_PATH) correctly on 9K and --2.0
26+
- servlet env should behave on `fetch` and `[]` like a Hash (nil value can be set)
27+
28+
## 1.1.19 (01/07/15)
29+
30+
- update (bundled) rack to 1.5.5
31+
- servlet attrs with null/false values should not end up with an '' env value (#195)
32+
- tune ErrorApp + ShowStatus to respect set 'rack.showstatus.detail' (#194)
33+
- allow for more `JRuby::Rack::ErrorApp` customizations + retrieve cause when needed
34+
135
## 1.1.18 (13/01/15)
236

337
- back-port Rack::ShowStatus to be used with out ErrorApp (contains XSS fix #190)

‎LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#--
22
# The MIT License
33
#
4-
# Copyright (c) 2012-2014 Karol Bucek, LTD
4+
# Copyright (c) 2012-2016 Karol Bucek, LTD.
55
# Copyright (c) 2010-2012 Engine Yard, Inc.
66
# Copyright (c) 2007-2009 Sun Microsystems, Inc.
77
#

‎Rakefile

+10-5
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,16 @@ end
5454
desc "Unpack the rack gem"
5555
task :unpack_gem => "target" do |t|
5656
target = File.expand_path(t.prerequisites.first)
57-
spec = Gem.loaded_specs["rack"]
58-
if spec.respond_to?(:cache_file)
59-
gem_file = spec.cache_file
60-
else
61-
gem_file = File.join(spec.installation_path, 'cache', spec.file_name)
57+
spec = Gem.loaded_specs['rack']
58+
# JRuby <= 1.7.20 does not handle respond_to? with method_missing right
59+
# ... issue with Bundler::StubSpecification wrapping (in bundler 1.10.x)
60+
unless ( gem_file = spec.cache_file rescue nil )
61+
#if defined?(::Bundler) && ::Bundler.const_defined?(:StubSpecification) # since Bundler 1.10.1
62+
# spec = spec.to_spec if spec.is_a?(::Bundler::StubSpecification)
63+
#else
64+
# spec = spec.to_spec if spec.respond_to?(:to_spec)
65+
#end
66+
gem_file = File.join(spec.base_dir, 'cache', spec.file_name)
6267
end
6368
unless uptodate?("#{target}/vendor/rack.rb", [__FILE__, gem_file])
6469
mkdir_p "target/vendor"

‎gemfiles/rails23.gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
5+
gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
66
gem "rspec", "~> 2.14.1", :group=>:test
7+
gem "jruby-openssl", "~> 0.9.20", :group=>:test
78
gem "rails", "~> 2.3.18"
89

‎gemfiles/rails23.gemfile.lock

+7-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ GEM
1212
activesupport (= 2.3.18)
1313
activesupport (2.3.18)
1414
diff-lcs (1.2.5)
15+
jruby-openssl (0.9.21-java)
1516
rack (1.1.6)
1617
rails (2.3.18)
1718
actionmailer (= 2.3.18)
@@ -20,7 +21,7 @@ GEM
2021
activeresource (= 2.3.18)
2122
activesupport (= 2.3.18)
2223
rake (>= 0.8.3)
23-
rake (10.3.2)
24+
rake (10.4.2)
2425
rspec (2.14.1)
2526
rspec-core (~> 2.14.0)
2627
rspec-expectations (~> 2.14.0)
@@ -34,6 +35,10 @@ PLATFORMS
3435
java
3536

3637
DEPENDENCIES
38+
jruby-openssl (~> 0.9.20)
3739
rails (~> 2.3.18)
38-
rake (~> 10.3.1)
40+
rake (~> 10.4.2)
3941
rspec (~> 2.14.1)
42+
43+
BUNDLED WITH
44+
1.14.6

‎gemfiles/rails30.gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
5+
gem "rake", "~> 10.4.2", :group=>:test, :require=>nil
66
gem "rspec", "~> 2.14.1", :group=>:test
7+
gem "jruby-openssl", "~> 0.9.20", :group=>:test
78
gem "rails", "~> 3.0.20"
89

‎gemfiles/rails30.gemfile.lock

+7-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ GEM
3434
erubis (2.6.6)
3535
abstract (>= 1.0.0)
3636
i18n (0.5.4)
37+
jruby-openssl (0.9.21-java)
3738
json (1.8.1-java)
3839
mail (2.2.20)
3940
activesupport (>= 2.3.6)
@@ -61,7 +62,7 @@ GEM
6162
rake (>= 0.8.7)
6263
rdoc (~> 3.4)
6364
thor (~> 0.14.4)
64-
rake (10.3.2)
65+
rake (10.4.2)
6566
rdoc (3.12.2)
6667
json (~> 1.4)
6768
rspec (2.14.1)
@@ -82,6 +83,10 @@ PLATFORMS
8283
java
8384

8485
DEPENDENCIES
86+
jruby-openssl (~> 0.9.20)
8587
rails (~> 3.0.20)
86-
rake (~> 10.3.1)
88+
rake (~> 10.4.2)
8789
rspec (~> 2.14.1)
90+
91+
BUNDLED WITH
92+
1.14.6

0 commit comments

Comments
 (0)