Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.1 into master #253

Open
wants to merge 75 commits into
base: master
Choose a base branch
from
Open

Merge 1.1 into master #253

Changes from 1 commit
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
954e795
appraise latest rails versions
kares Apr 27, 2015
342d4f8
let us see how we're doing with the travis-ci test matrix
kares Apr 27, 2015
564f5f6
make sure i18n < 0.7 for Rails 3.x still test run with 1.8 mode
kares Apr 28, 2015
0c67f6c
more travis-ci magic to get specs rolling again
kares Apr 28, 2015
ce31f75
just to be sure about travis-ci ... update rake everywhere to 10.4.2
kares Apr 28, 2015
22bb8b2
allow for more `JRuby::Rack::ErrorApp` customizations + retrieve caus…
kares Apr 28, 2015
e369146
tune ErrorApp + ShowStatus (use-d by default) to respect set 'rack.sh…
kares Apr 28, 2015
e5ca043
avoid failures with rack < 1.5 since it's Rack::Request#scheme would …
kares Apr 29, 2015
8da7440
servlet attributes with null/false values should not end up with an '…
kares Apr 29, 2015
caf7a38
[travis-ci] jruby -G does not work with 1.6.8 ... kind of use ~ bundl…
kares Apr 29, 2015
1a01517
[travis-ci] back to `rake spec` for now (only due 1.6.8)
kares Apr 30, 2015
29f46b4
update (bundled) rack to 1.5.5
kares Jun 28, 2015
ee6f164
use spec.base_dir (instead of installation_path)
kares Jun 28, 2015
2693ff3
work-around respond_to_missing? bug in JRuby 1.7.20
kares Jun 28, 2015
d0323ed
bundle update jruby-openssl
kares Jun 28, 2015
1aae207
update appraised rails versions
kares Jun 30, 2015
dcecc35
update jruby-maven-plugins' version
kares Jun 30, 2015
7eda40a
update bundler used during mvn build
kares Jun 30, 2015
ff85d14
prepare for 1.1.19
kares Jul 1, 2015
3f93d44
release actually happened on 1.7
kares Jul 1, 2015
fa0f042
update for next development SNAPSHOT
kares Jul 1, 2015
8da098e
[travis-ci] re-invent - simplify setup + test on 9K
kares Jan 21, 2016
9468cb8
seems its easy to avoid the confusing spec failure on 1.6.8 (due BUG)
kares Jan 21, 2016
9851506
[travis-ci] expect rails 4.2 to pass fine
kares Jan 21, 2016
f547986
update appraisals to their latest
kares Jan 21, 2016
864d68e
servlet env should behave on `fetch` and `[]` like a Hash (nil value …
kares Jan 21, 2016
859a90c
bundle update jruby-openssl
kares Jan 21, 2016
9391d2a
(c) 2016!
kares Jan 21, 2016
33fd974
adjust jruby home dir fallback (for default $LOAD_PATH) correctly on …
kares Jan 21, 2016
fb7a4c3
Add a `ActionController::Base` method to return the `servlet_response`
ketan Dec 25, 2015
4071a01
stub-ed specs have not been running - change that and re-invent rails…
kares Jan 21, 2016
a100eac
adjust stubbing setup - do not unshift LOAD_PATH in spec_helper
kares Jan 21, 2016
91245b8
improvise more rails boot isolation in "stub" spec - now that more of…
kares Jan 21, 2016
4281a98
for better booter detection - export public path after working direct…
kares Jan 21, 2016
d81684b
allow to boot when RAILS_ROOT/public directory does not exist (closes…
kares Jan 21, 2016
2d8a988
fix broken controller.servlet_response spec from #201
kares Jan 21, 2016
4771f92
pre-maturely avoid Ruby frozen string literals coming at us ... ''.du…
kares Jan 22, 2016
3605090
fill in release notes for 1.1.20
kares Jan 22, 2016
5c31797
use recent jruby-openssl that works better with all jrubies
kares Jan 22, 2016
65dc2fc
[travis-ci] 1.7.16 has loading issues with jossl thus try 1.7.4 instead
kares Jan 22, 2016
0c1f3c7
[travis-ci] let those jossl issues fail until there's time to figure …
kares Jan 22, 2016
0d40a1b
re-invent missing Rack::Utils.bytesize (2.0 will work) + prefix ::Rac…
kares Jan 22, 2016
23a0858
setup testing against rails 5.0 beta1 (using rack 2.0.alpha)
kares Jan 22, 2016
77b4c34
prepare for 1.1.20
kares Jan 22, 2016
620ac03
update for next dev SNAPSHOT
kares Jan 22, 2016
f2d442e
one line is enough ... `lines -= 5`
kares Jan 22, 2016
7951186
[travis-ci] update JRuby testing targets
kares Aug 1, 2017
f2295ce
[travis-ci] try to not mess with RG installation on 9K + adjust for s…
kares Aug 1, 2017
3120eeb
[spec] adjust booter LOAD_PATH expectation to pass on JRuby 9.1
kares Aug 2, 2017
abe79d0
[spec] seems LoadError is not being rescued when using base Gemfile
kares Aug 2, 2017
628bd96
[travis-ci] running with RG 2.6 should get the (problematic) specs green
kares Aug 2, 2017
1e81098
[bundle] upgrade to recent jruby-openssl 0.9
kares Aug 2, 2017
0afcafd
update appraised gemfiles - so that we have a working jossl 4all
kares Aug 2, 2017
91efe06
[travis-ci] adjust accepted failures - 1.7.4 no longer failing due jossl
kares Aug 2, 2017
91d7d30
When handling OPTION calls ignore both 'Date' and 'Allow' headers
retoo Aug 2, 2017
0e0ba6a
fix wrong condition for OPTION to ignore both 'Date' and 'Allow' headers
kares Aug 3, 2017
49a3673
can only safely stream natively on ActionDispatch <= 3.2
kares Aug 3, 2017
15d17ed
Add Rack::Handler::Servlet::DefaultEnv#get_header (#212)
HarlemSquirrel Aug 17, 2017
714fee2
update (bundled) rack to latest in 1.x line ... 1.6.8
kares Sep 17, 2017
2774bfc
prepare for 1.1.21
kares Sep 17, 2017
4ed7a4e
Add error message to log when runtime error is handled (fixes #213)
daneshd Jan 9, 2018
5854db8
degrade level (back) to INFO and log trace when commited
kares Sep 6, 2018
b2c7cab
[fix] Don't let getSession cause an infinite loop if it throws Illega…
smellsblue Dec 3, 2020
a9dac39
avoid Fixnum warning - assume recent JRuby
kares Aug 16, 2022
ba0abaf
avoid NativeException - not used on recent JRuby
kares Aug 16, 2022
ec34317
[release] late next dev snapshot update
kares Aug 16, 2022
0a3eb45
update (bundled) rack to 1.6.13
kares Aug 16, 2022
a24d58a
[build] update bundler + hook-up mavengem
kares Aug 16, 2022
c5e2b1b
compile using Java 6 source compat
kares Aug 16, 2022
bae8b2c
[release] prepare for 1.1.22
kares Aug 16, 2022
63cf7d0
[build] update maven deploy plugin
kares Aug 16, 2022
754e7af
[build] try release with nexus plugin
kares Aug 16, 2022
c993abc
[build] disable javadoc lint on Java 8
kares Aug 16, 2022
cbee8b5
Merge branch '1.1-stable' of github.com:jruby/jruby-rack into 1.1-stable
kares Aug 16, 2022
160e933
Merge remote-tracking branch 'origin/1.1-stable' into merge-1.1-stable
headius Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update (bundled) rack to latest in 1.x line ... 1.6.8
  • Loading branch information
@kares
kares committed Sep 17, 2017
commit 714fee27c683cc26d218ebc97faf093737115500
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ group :default do
if rack_version = ENV['RACK_VERSION']
gem 'rack', rack_version
else
gem 'rack', '~> 1.5.2'
gem 'rack', '~> 1.6.8'
end
end

4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ GEM
rake
diff-lcs (1.2.5)
jruby-openssl (0.9.21-java)
rack (1.5.5)
rack (1.6.8)
rake (10.4.2)
rspec (2.14.1)
rspec-core (~> 2.14.0)
@@ -23,7 +23,7 @@ PLATFORMS
DEPENDENCIES
appraisal
jruby-openssl (~> 0.9.20)
rack (~> 1.5.2)
rack (~> 1.6.8)
rake (~> 10.4.2)
rspec (~> 2.14.1)