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.

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

wants to merge 75 commits into from

Commits on Apr 27, 2015

  1. appraise latest rails versions

    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. 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. Configuration menu
    Copy the full SHA
    564f5f6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0c67f6c View commit details
    Browse the repository at this point in the history
  3. 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. Configuration menu
    Copy the full SHA
    22bb8b2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e369146 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e5ca043 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8da7440 View commit details
    Browse the repository at this point in the history
  5. 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. 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 committed Jun 28, 2015
    Configuration menu
    Copy the full SHA
    29f46b4 View commit details
    Browse the repository at this point in the history
  2. 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 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 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 committed Jun 30, 2015
    Configuration menu
    Copy the full SHA
    1aae207 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    dcecc35 View commit details
    Browse the repository at this point in the history
  3. 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 committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    ff85d14 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3f93d44 View commit details
    Browse the repository at this point in the history
  3. 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. Configuration menu
    Copy the full SHA
    8da098e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9468cb8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9851506 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f547986 View commit details
    Browse the repository at this point in the history
  5. 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 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 committed Jan 21, 2016
    Configuration menu
    Copy the full SHA
    9391d2a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    33fd974 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fb7a4c3 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    4071a01 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    a100eac View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    91245b8 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    4281a98 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    d81684b View commit details
    Browse the repository at this point in the history
  15. 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. Configuration menu
    Copy the full SHA
    4771f92 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3605090 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5c31797 View commit details
    Browse the repository at this point in the history
  4. 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 committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    0c1f3c7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0d40a1b View commit details
    Browse the repository at this point in the history
  7. 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 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 committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    620ac03 View commit details
    Browse the repository at this point in the history
  10. 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. Configuration menu
    Copy the full SHA
    7951186 View commit details
    Browse the repository at this point in the history
  2. 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. Configuration menu
    Copy the full SHA
    3120eeb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    abe79d0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    628bd96 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1e81098 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0afcafd View commit details
    Browse the repository at this point in the history
  6. 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 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. 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 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 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. 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 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. 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 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. 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. Configuration menu
    Copy the full SHA
    a9dac39 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ba0abaf View commit details
    Browse the repository at this point in the history
  3. 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 committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    0a3eb45 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a24d58a View commit details
    Browse the repository at this point in the history
  6. 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 committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    bae8b2c View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    63cf7d0 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    754e7af View commit details
    Browse the repository at this point in the history
  10. 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 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 4, 2024

  1. Configuration menu
    Copy the full SHA
    160e933 View commit details
    Browse the repository at this point in the history