[DRE-commits] [ruby-passenger] 01/05: Merge tag 'upstream/4.0.37'

[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 2b91d036ab7688c4ad4b13ff1b2640a0f050a771
Merge: bb6e724 e628080
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Mar 8 17:11:37 2014 +0100

    Merge tag 'upstream/4.0.37'
    
    Upstream version 4.0.37
    
    # gpg: Signature made Sa 08 Mär 2014 17:11:22 CET 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>"

 NEWS                                               |  70 ++++++
 README.md                                          |   4 +-
 build/integration_tests.rb                         |   6 +-
 build/packaging.rb                                 |  27 ++-
 build/test_basics.rb                               |   4 +-
 dev/run_travis.sh                                  |   3 +
 doc/Users guide Apache.html                        |  21 +-
 doc/Users guide Apache.txt                         |  10 +-
 doc/Users guide Nginx.html                         |  29 ++-
 doc/Users guide Nginx.txt                          |  16 +-
 doc/Users guide Standalone.html                    | 245 +++++++++++++++++++++
 doc/Users guide Standalone.idmap.txt               |   4 +
 doc/Users guide Standalone.txt                     | 186 ++++++++++++++++
 doc/users_guide_snippets/installation.txt          |   3 +-
 ext/common/ApplicationPool2/Group.h                |   6 +-
 ext/common/ApplicationPool2/Implementation.cpp     |  31 ++-
 ext/common/ApplicationPool2/Options.h              |  12 +-
 ext/common/ApplicationPool2/Pool.h                 |  29 ++-
 ext/common/ApplicationPool2/Process.h              |  49 ++++-
 ext/common/Constants.h                             |   2 +-
 ext/common/MultiLibeio.cpp                         |   4 +
 ext/common/ServerInstanceDir.h                     |   2 +-
 ext/common/Utils.cpp                               |  29 +++
 ext/common/Utils.h                                 |   8 +-
 ext/common/Utils/BufferedIO.h                      |  13 ++
 ext/common/agents/HelperAgent/Main.cpp             |  13 +-
 ext/common/agents/HelperAgent/RequestHandler.h     |  33 ++-
 ext/common/agents/LoggingAgent/Main.cpp            |   3 +
 ext/common/agents/TempDirToucher.c                 |  27 ++-
 ext/common/agents/Watchdog/Main.cpp                |  31 ++-
 helper-scripts/meteor-loader.rb                    | 136 +++++++++++-
 helper-scripts/node-loader.js                      |   8 +-
 helper-scripts/wsgi-loader.py                      |  34 ++-
 lib/phusion_passenger.rb                           |   2 +-
 .../config/detach_process_command.rb               |  96 ++++++++
 lib/phusion_passenger/config/main.rb               |   1 +
 lib/phusion_passenger/request_handler.rb           |  15 +-
 lib/phusion_passenger/standalone/command.rb        |   9 +-
 lib/phusion_passenger/standalone/start_command.rb  |   6 +-
 node_lib/phusion_passenger/httplib_emulation.js    |  34 +--
 resources/templates/standalone/config.erb          |   3 +-
 test/cxx/RequestHandlerTest.cpp                    |  80 +++++++
 test/integration_tests/apache2_tests.rb            |  57 +++++
 test/integration_tests/nginx_tests.rb              |  62 ++++++
 test/node/httplib_emulation_spec.js                | 142 +++++++++++-
 test/node/spec_helper.js                           |  13 ++
 test/stub/.DS_Store                                | Bin 6148 -> 6148 bytes
 test/stub/node/app.js                              | 125 +++++++++++
 test/stub/node/public/.gitignore                   |   0
 test/stub/node/tmp/.gitignore                      |   0
 test/stub/rack/config.ru                           |  19 ++
 test/stub/wsgi/passenger_wsgi.py                   |  38 +++-
 52 files changed, 1669 insertions(+), 131 deletions(-)

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