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

Jump to bottom

Merge 1.1 into master (redux) #262

Draft
wants to merge 80 commits into
base: master
Choose a base branch
from
Draft

Merge 1.1 into master (redux) #262

wants to merge 80 commits into from

Commits on Apr 27, 2015

  1. appraise latest rails versions

    @kares
    kares committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    954e795 View commit details
    Browse the repository at this point in the history

  2. let us see how we're doing with the travis-ci test matrix

    @kares
    kares committed Apr 27, 2015
    Configuration menu
    Copy the full SHA
    342d4f8 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2015

  1. make sure i18n < 0.7 for Rails 3.x still test run with 1.8 mode

    @kares
    kares committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    564f5f6 View commit details
    Browse the repository at this point in the history

  2. more travis-ci magic to get specs rolling again

    @kares
    kares committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    0c67f6c View commit details
    Browse the repository at this point in the history

  3. just to be sure about travis-ci ... update rake everywhere to 10.4.2

    @kares
    kares committed Apr 28, 2015
    Configuration menu
    Copy the full SHA
    ce31f75 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2015

  1. allow for more JRuby::Rack::ErrorApp customizations + retrieve caus… 

    …e when needed
    @kares
    kares committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    22bb8b2 View commit details
    Browse the repository at this point in the history

  2. tune ErrorApp + ShowStatus (use-d by default) to respect set 'rack.sh… 

    …owstatus.detail'
    @kares
    kares committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    e369146 View commit details
    Browse the repository at this point in the history

  3. avoid failures with rack < 1.5 since it's Rack::Request#scheme would … 

    …be nil
    @kares
    kares committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    e5ca043 View commit details
    Browse the repository at this point in the history

  4. servlet attributes with null/false values should not end up with an '… 

    …' env value (jruby#195)
    @kares
    kares committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    8da7440 View commit details
    Browse the repository at this point in the history

  5. [travis-ci] jruby -G does not work with 1.6.8 ... kind of use ~ bundl… 

    …e exec instead
    @kares
    kares committed Apr 29, 2015
    Configuration menu
    Copy the full SHA
    caf7a38 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2015

  1. [travis-ci] back to rake spec for now (only due 1.6.8)

    @kares
    kares committed Apr 30, 2015
    Configuration menu
    Copy the full SHA
    1a01517 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2015

  1. update (bundled) rack to 1.5.5

    @kares
    kares committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    29f46b4 View commit details
    Browse the repository at this point in the history

  2. use spec.base_dir (instead of installation_path)

    @kares
    kares committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    ee6f164 View commit details
    Browse the repository at this point in the history

  3. work-around respond_to_missing? bug in JRuby 1.7.20 

    ... (this is relevant since Bundler >= 1.10.1)
    @kares
    kares committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    2693ff3 View commit details
    Browse the repository at this point in the history

  4. bundle update jruby-openssl

    @kares
    kares committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    d0323ed View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2015

  1. update appraised rails versions

    @kares
    kares committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    1aae207 View commit details
    Browse the repository at this point in the history

  2. update jruby-maven-plugins' version

    @kares
    kares committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    dcecc35 View commit details
    Browse the repository at this point in the history

  3. update bundler used during mvn build

    @kares
    kares committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    7eda40a View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2015

  1. prepare for 1.1.19

    @kares
    kares committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    ff85d14 View commit details
    Browse the repository at this point in the history

  2. release actually happened on 1.7

    @kares
    kares committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    3f93d44 View commit details
    Browse the repository at this point in the history

  3. update for next development SNAPSHOT

    @kares
    kares committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    fa0f042 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2016

  1. [travis-ci] re-invent - simplify setup + test on 9K

    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    8da098e View commit details
    Browse the repository at this point in the history

  2. seems its easy to avoid the confusing spec failure on 1.6.8 (due BUG)

    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    9468cb8 View commit details
    Browse the repository at this point in the history

  3. [travis-ci] expect rails 4.2 to pass fine

    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    9851506 View commit details
    Browse the repository at this point in the history

  4. update appraisals to their latest

    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    f547986 View commit details
    Browse the repository at this point in the history

  5. servlet env should behave on fetch and [] like a Hash (nil value … 

    …can be set)
    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    864d68e View commit details
    Browse the repository at this point in the history

  6. bundle update jruby-openssl

    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    859a90c View commit details
    Browse the repository at this point in the history

  7. (c) 2016!

    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    9391d2a View commit details
    Browse the repository at this point in the history

  8. adjust jruby home dir fallback (for default $LOAD_PATH) correctly on … 

    …9K and --2.0
    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    33fd974 View commit details
    Browse the repository at this point in the history

  9. Add a ActionController::Base method to return the servlet_response

    @ketan @kares
    ketan authored and kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    fb7a4c3 View commit details
    Browse the repository at this point in the history

  10. stub-ed specs have not been running - change that and re-invent rails… 

    … stub .rb files
    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    4071a01 View commit details
    Browse the repository at this point in the history

  11. adjust stubbing setup - do not unshift LOAD_PATH in spec_helper

    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    a100eac View commit details
    Browse the repository at this point in the history

  12. improvise more rails boot isolation in "stub" spec - now that more of… 

    … it runs
    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    91245b8 View commit details
    Browse the repository at this point in the history

  13. for better booter detection - export public path after working direct… 

    …ory was changed
    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    4281a98 View commit details
    Browse the repository at this point in the history

  14. allow to boot when RAILS_ROOT/public directory does not exist (closes j… 

    …ruby#197)
    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    d81684b View commit details
    Browse the repository at this point in the history

  15. fix broken controller.servlet_response spec from jruby#201

    @kares
    kares committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    2d8a988 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2016

  1. pre-maturely avoid Ruby frozen string literals coming at us ... ''.du… 

    …p meh!
    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    4771f92 View commit details
    Browse the repository at this point in the history

  2. fill in release notes for 1.1.20

    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    3605090 View commit details
    Browse the repository at this point in the history

  3. use recent jruby-openssl that works better with all jrubies

    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    5c31797 View commit details
    Browse the repository at this point in the history

  4. [travis-ci] 1.7.16 has loading issues with jossl thus try 1.7.4 instead

    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    65dc2fc View commit details
    Browse the repository at this point in the history

  5. [travis-ci] let those jossl issues fail until there's time to figure … 

    …out (can not reproduce)
    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    0c1f3c7 View commit details
    Browse the repository at this point in the history

  6. re-invent missing Rack::Utils.bytesize (2.0 will work) + prefix ::Rac… 

    …k constant!
    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    0d40a1b View commit details
    Browse the repository at this point in the history

  7. setup testing against rails 5.0 beta1 (using rack 2.0.alpha)

    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    23a0858 View commit details
    Browse the repository at this point in the history

  8. prepare for 1.1.20

    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    77b4c34 View commit details
    Browse the repository at this point in the history

  9. update for next dev SNAPSHOT

    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    620ac03 View commit details
    Browse the repository at this point in the history

  10. one line is enough ... lines -= 5

    @kares
    kares committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    f2d442e View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. [travis-ci] update JRuby testing targets

    @kares
    kares committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    7951186 View commit details
    Browse the repository at this point in the history

  2. [travis-ci] try to not mess with RG installation on 9K + adjust for s… 

    …anity
    @kares
    kares committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    f2295ce View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. [spec] adjust booter LOAD_PATH expectation to pass on JRuby 9.1

    @kares
    kares committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    3120eeb View commit details
    Browse the repository at this point in the history

  2. [spec] seems LoadError is not being rescued when using base Gemfile

    @kares
    kares committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    abe79d0 View commit details
    Browse the repository at this point in the history

  3. [travis-ci] running with RG 2.6 should get the (problematic) specs green

    @kares
    kares committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    628bd96 View commit details
    Browse the repository at this point in the history

  4. [bundle] upgrade to recent jruby-openssl 0.9

    @kares
    kares committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    1e81098 View commit details
    Browse the repository at this point in the history

  5. update appraised gemfiles - so that we have a working jossl 4all

    @kares
    kares committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    0afcafd View commit details
    Browse the repository at this point in the history

  6. [travis-ci] adjust accepted failures - 1.7.4 no longer failing due jossl

    @kares
    kares committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    91efe06 View commit details
    Browse the repository at this point in the history

  7. When handling OPTION calls ignore both 'Date' and 'Allow' headers 

    to decide if call has been handeled

If not, no OPTION calls will be passed down to the rack app due to the fact
that some implementations of DefaultServlet (i.e. Jetty) also sets 'Date'

Fixes jruby#205
    @retoo @kares
    retoo authored and kares committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    91d7d30 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. fix wrong condition for OPTION to ignore both 'Date' and 'Allow' headers 

    amend for : 91d7d30
    @kares
    kares committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    0e0ba6a View commit details
    Browse the repository at this point in the history

  2. can only safely stream natively on ActionDispatch <= 3.2 

    since 4.0 Response#stream is added and body is wrapped in a buffer 
(which does more than body.each)

resolves jruby#210 (broken Rails streaming for Rails 4.x)
    @kares
    kares committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    49a3673 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2017

  1. Add Rack::Handler::Servlet::DefaultEnv#get_header (jruby#212) 

    * Add Rack::Handler::Servlet::DefaultEnv#get_header

Fixes jruby#211

* Update Rack::Handler::Servlet::DefaultEnv

Add missing methods to handle ActionController::Base#reset_session
    @HarlemSquirrel @kares
    HarlemSquirrel authored and kares committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    15d17ed View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2017

  1. update (bundled) rack to latest in 1.x line ... 1.6.8

    @kares
    kares committed Sep 17, 2017
    Configuration menu
    Copy the full SHA
    714fee2 View commit details
    Browse the repository at this point in the history

  2. prepare for 1.1.21

    @kares
    kares committed Sep 17, 2017
    Configuration menu
    Copy the full SHA
    2774bfc View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2018

  1. Add error message to log when runtime error is handled (fixes jruby#213)

    @daneshd @kares
    daneshd authored and kares committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    4ed7a4e View commit details
    Browse the repository at this point in the history

  2. degrade level (back) to INFO and log trace when commited 

    should be a compromise as users using an error app would have been
confused by the new ERROR message (wasn't there previously)
    @kares
    kares committed Sep 6, 2018
    Configuration menu
    Copy the full SHA
    5854db8 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2020

  1. [fix] Don't let getSession cause an infinite loop if it throws Illega… 

    …lStateException (jruby#216)
    @smellsblue
    smellsblue committed Dec 3, 2020
    Configuration menu
    Copy the full SHA
    b2c7cab View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2022

  1. avoid Fixnum warning - assume recent JRuby

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    a9dac39 View commit details
    Browse the repository at this point in the history

  2. avoid NativeException - not used on recent JRuby

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    ba0abaf View commit details
    Browse the repository at this point in the history

  3. [release] late next dev snapshot update

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    ec34317 View commit details
    Browse the repository at this point in the history

  4. update (bundled) rack to 1.6.13

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    0a3eb45 View commit details
    Browse the repository at this point in the history

  5. [build] update bundler + hook-up mavengem

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    a24d58a View commit details
    Browse the repository at this point in the history

  6. compile using Java 6 source compat

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    c5e2b1b View commit details
    Browse the repository at this point in the history

  7. [release] prepare for 1.1.22

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    bae8b2c View commit details
    Browse the repository at this point in the history

  8. [build] update maven deploy plugin

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    63cf7d0 View commit details
    Browse the repository at this point in the history

  9. [build] try release with nexus plugin

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    754e7af View commit details
    Browse the repository at this point in the history

  10. [build] disable javadoc lint on Java 8

    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    c993abc View commit details
    Browse the repository at this point in the history

  11. Merge branch '1.1-stable' of github.com:jruby/jruby-rack into 1.1-stable 

    * '1.1-stable' of github.com:jruby/jruby-rack:
  [fix] Don't let getSession cause an infinite loop if it throws IllegalStateException (jruby#216)
    @kares
    kares committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    cbee8b5 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Update to latest mavengem 

    Old version still uses the removed rubygems.org v1 dependencies
API, which breaks the build.
    @headius
    headius committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    ff5bad9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request jruby#254 from headius/1.1-stable-build-updates 

    Update to latest mavengem
    @headius
    headius committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    45d6a94 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Use cat19 for 1.1 branch that will fade away soon 

    This fixes jruby#247 without introducing a dependency on the new
catWithCodeRange in JRuby 9.4. It does depend on a now-deprecated
method cat19 that will go away in the next year or so.
    @headius
    headius committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    5d81b71 View commit details
    Browse the repository at this point in the history

  2. Merge pull request jruby#255 from headius/coderange_cat_for_9.3 

    Coderange cat for 9.3
    @headius
    headius committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    610d87f View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. 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
    @chadlwilson
    chadlwilson committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    d72e8b0 View commit details
    Browse the repository at this point in the history

  2. Fix logger tests by changing expectations 

    Not really sure these are correct, but they at least seem to match the intend logger changes
and cant see how they were passing earlier given the changes.
    @chadlwilson
    chadlwilson committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    6abde22 View commit details
    Browse the repository at this point in the history