[DRE-commits] [ruby-passenger] 01/03: Merge tag 'upstream/4.0.50'

[Felix Geyer]

This is an automated email from the git hooks/post-receive script.

fgeyer pushed a commit to branch master
in repository ruby-passenger.

commit aa23884a5bf5603a1e228f16287bea69f3a24e2d
Merge: 2b9b7dd 5a4ae9c
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun Aug 31 16:17:39 2014 +0200

    Merge tag 'upstream/4.0.50'
    
    Upstream version 4.0.50
    
    # gpg: Signature made So 31 Aug 2014 16:17:37 CEST using RSA key ID 83135D45
    # gpg: Good signature from "Felix Geyer <felix at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx-pkg at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx at kubuntu.org>"
    # gpg:                 aka "Felix Geyer <debfx at fobos.de>"
    # gpg:                 aka "Felix Geyer <debfx at ubuntu.com>"
    # gpg:                 aka "Felix Geyer <felix.geyer at fobos.de>"
    # gpg:                 aka "Felix Geyer <fgeyer at debian.org>"

 CHANGELOG                                          |   7 ++
 build/test_basics.rb                               |   1 +
 ext/common/ApplicationPool2/Options.h              |  81 ++++++-------
 ext/common/Constants.h                             |   2 +-
 helper-scripts/classic-rails-loader.rb             |   3 +-
 helper-scripts/classic-rails-preloader.rb          |   3 +-
 helper-scripts/node-loader.js                      |  32 ++++-
 helper-scripts/rack-loader.rb                      |   3 +-
 helper-scripts/rack-preloader.rb                   |   3 +-
 helper-scripts/wsgi-loader.py                      |  37 ++++--
 lib/phusion_passenger.rb                           |   2 +-
 .../active_support3_extensions/init.rb             |   1 +
 lib/phusion_passenger/preloader_shared_helpers.rb  |  40 +++++--
 lib/phusion_passenger/request_handler.rb           |  55 +++++----
 lib/phusion_passenger/utils.rb                     |  30 +++--
 test/ruby/rails4.1/loader_spec.rb                  |  28 +++++
 test/ruby/rails4.1/preloader_spec.rb               |  34 ++++++
 test/ruby/request_handler_spec.rb                  |  52 +++++----
 test/stub/rails4.1/.gitignore                      |  16 +++
 test/stub/rails4.1/Gemfile                         |  45 +++++++
 test/stub/rails4.1/Gemfile.lock                    | 129 +++++++++++++++++++++
 test/stub/rails4.1/README.rdoc                     |  28 +++++
 test/stub/rails4.1/Rakefile                        |   6 +
 test/stub/rails4.1/app/assets/images/.keep         |   0
 .../rails4.1/app/assets/javascripts/application.js |  16 +++
 .../app/assets/stylesheets/application.css         |  13 +++
 .../app/controllers/application_controller.rb      |   5 +
 test/stub/rails4.1/app/controllers/concerns/.keep  |   0
 .../rails4.1/app/helpers/application_helper.rb     |   2 +
 test/stub/rails4.1/app/mailers/.keep               |   0
 test/stub/rails4.1/app/models/.keep                |   0
 test/stub/rails4.1/app/models/concerns/.keep       |   0
 .../app/views/layouts/application.html.erb         |  14 +++
 test/stub/rails4.1/bin/bundle                      |   3 +
 test/stub/rails4.1/bin/rails                       |   4 +
 test/stub/rails4.1/bin/rake                        |   4 +
 test/stub/rails4.1/config.ru                       |   4 +
 test/stub/rails4.1/config/application.rb           |  23 ++++
 test/stub/rails4.1/config/boot.rb                  |   4 +
 test/stub/rails4.1/config/database.yml             |  25 ++++
 test/stub/rails4.1/config/environment.rb           |   5 +
 .../rails4.1/config/environments/development.rb    |  29 +++++
 .../rails4.1/config/environments/production.rb     |  80 +++++++++++++
 test/stub/rails4.1/config/environments/test.rb     |  36 ++++++
 .../config/initializers/backtrace_silencers.rb     |   7 ++
 .../initializers/filter_parameter_logging.rb       |   4 +
 .../rails4.1/config/initializers/inflections.rb    |  16 +++
 .../rails4.1/config/initializers/mime_types.rb     |   5 +
 .../stub/rails4.1/config/initializers/passenger.rb |   5 +
 .../rails4.1/config/initializers/secret_token.rb   |  12 ++
 .../rails4.1/config/initializers/session_store.rb  |   3 +
 .../config/initializers/wrap_parameters.rb         |  14 +++
 test/stub/rails4.1/config/locales/en.yml           |  23 ++++
 test/stub/rails4.1/config/routes.rb                |  57 +++++++++
 test/stub/rails4.1/db/seeds.rb                     |   7 ++
 test/stub/rails4.1/lib/assets/.keep                |   0
 test/stub/rails4.1/lib/tasks/.keep                 |   0
 test/stub/rails4.1/log/.keep                       |   0
 test/stub/rails4.1/public/404.html                 |  58 +++++++++
 test/stub/rails4.1/public/422.html                 |  58 +++++++++
 test/stub/rails4.1/public/500.html                 |  57 +++++++++
 test/stub/rails4.1/public/favicon.ico              |   0
 test/stub/rails4.1/public/robots.txt               |   5 +
 test/stub/rails4.1/test/controllers/.keep          |   0
 test/stub/rails4.1/test/fixtures/.keep             |   0
 test/stub/rails4.1/test/helpers/.keep              |   0
 test/stub/rails4.1/test/integration/.keep          |   0
 test/stub/rails4.1/test/mailers/.keep              |   0
 test/stub/rails4.1/test/models/.keep               |   0
 test/stub/rails4.1/test/test_helper.rb             |  15 +++
 test/stub/rails4.1/vendor/assets/javascripts/.keep |   0
 test/stub/rails4.1/vendor/assets/stylesheets/.keep |   0
 72 files changed, 1127 insertions(+), 124 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-passenger.git