Merge 1.1 into master #253
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
... (this is relevant since Bundler >= 1.10.1)
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
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)
* Add Rack::Handler::Servlet::DefaultEnv#get_header Fixes jruby#211 * Update Rack::Handler::Servlet::DefaultEnv Add missing methods to handle ActionController::Base#reset_session
should be a compromise as users using an error app would have been confused by the new ERROR message (wasn't there previously)
* '1.1-stable' of github.com:jruby/jruby-rack: [fix] Don't let getSession cause an infinite loop if it throws IllegalStateException (jruby#216)
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an attempt to merge in all changes from 1.1-stable into master for the next 1.2.x release.
The 1.1-stable branch diverged almost ten years ago, and only had one merge back to master in early 2015. Since then most maintenance and bug-fixing has occurred on the branch. This PR attempts to bring in all the changes for 1.1 and resolve the diff between the two branches so we can move forward with 1.2 releases.