diff options
| author | Eileen M. Uchitelle <eileencodes@gmail.com> | 2015-03-02 18:22:31 -0500 |
|---|---|---|
| committer | Eileen M. Uchitelle <eileencodes@gmail.com> | 2015-03-02 18:22:31 -0500 |
| commit | f32b6e243a1b84312bd72618454f79c9878beb19 (patch) | |
| tree | 737723fffa349936ed1f284bf33393850ff021a6 /actionpack/lib/action_dispatch/http | |
| parent | 12f2fc56aa7697311b3259d14f73db23e540aac1 (diff) | |
| parent | 707a433870e9e06af688f85a4aedc64a90791a64 (diff) | |
| download | rails-f32b6e243a1b84312bd72618454f79c9878beb19.tar.gz rails-f32b6e243a1b84312bd72618454f79c9878beb19.tar.bz2 rails-f32b6e243a1b84312bd72618454f79c9878beb19.zip | |
Merge pull request #19147 from gsamokovarov/work-around-ruby-10695
Work around for upstream Ruby bug #10685
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index a895d1ab18..5fe544c60c 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -113,7 +113,9 @@ module ActionDispatch # :nodoc: # The underlying body, as a streamable object. attr_reader :stream - def initialize(status = 200, header = {}, body = [], default_headers: self.class.default_headers) + # Ruby 2.2 bug https://bugs.ruby-lang.org/issues/10685 prevents + # default_headers from being a keyword argument. + def initialize(status = 200, header = {}, body = [], default_headers = self.class.default_headers) super() header = merge_default_headers(header, default_headers) |