[DRE-commits] [passenger] 01/05: Merge tag 'upstream/5.0.30'
Felix Geyer
fgeyer at moszumanska.debian.org
Sun Aug 21 17:47:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
fgeyer pushed a commit to branch master
in repository passenger.
commit 17c1f427918c2d5fd2aa677a6164db33c133b89b
Merge: 35ca238 2f5be66
Author: Felix Geyer <fgeyer at debian.org>
Date: Sun Aug 21 18:39:47 2016 +0200
Merge tag 'upstream/5.0.30'
Upstream version 5.0.30
# gpg: Signature made So 21 Aug 2016 18:39:44 CEST
# gpg: using RSA key 0xFE22C6FD83135D45
# gpg: Good signature from "Felix Geyer <felix at fobos.de>" [ultimate]
# gpg: aka "Felix Geyer <debfx-pkg at fobos.de>" [ultimate]
# gpg: aka "Felix Geyer <debfx at kubuntu.org>" [ultimate]
# gpg: aka "Felix Geyer <debfx at fobos.de>" [ultimate]
# gpg: aka "Felix Geyer <debfx at ubuntu.com>" [ultimate]
# gpg: aka "Felix Geyer <felix.geyer at fobos.de>" [ultimate]
# gpg: aka "Felix Geyer <fgeyer at debian.org>" [ultimate]
# Primary key fingerprint: 164C 7051 2F79 2947 6764 AB56 FE22 C6FD 8313 5D45
.editorconfig | 5 +
CHANGELOG | 37 +-
CONTRIBUTORS | 2 +
Rakefile | 11 +-
build/agent.rb | 2 +-
build/apache2.rb | 6 +-
build/basics.rb | 77 +-
build/common_library.rb | 6 +-
build/misc.rb | 4 +-
build/nginx.rb | 27 +-
build/packaging.rb | 21 +-
.../{cplusplus_support.rb => support/cplusplus.rb} | 0
build/{ => support}/cxx_dependency_map.rb | 89 +-
build/support/general.rb | 145 ++
.../cxxcodebuilder/CxxCodeBuilder.sublime-project | 8 +
build/support/vendor/cxxcodebuilder/Gemfile | 4 +
build/support/vendor/cxxcodebuilder/Gemfile.lock | 28 +
build/support/vendor/cxxcodebuilder/LICENSE.md | 19 +
build/support/vendor/cxxcodebuilder/README.md | 98 ++
build/support/vendor/cxxcodebuilder/Rakefile | 4 +
.../vendor/cxxcodebuilder/lib/cxxcodebuilder.rb | 23 +
.../cxxcodebuilder/lib/cxxcodebuilder/builder.rb | 574 ++++++++
.../lib/cxxcodebuilder/initializer_builder.rb | 166 +++
build/test_basics.rb | 3 +-
dev/ci/run_travis.sh | 9 +
dev/vagrant/nginx_rakefile | 2 +-
resources/templates/standalone/server.erb | 10 +-
src/agent/Core/ApplicationPool/Options.h | 4 +
src/agent/Core/Controller.h | 1 +
src/agent/Core/Controller/BufferBody.cpp | 26 +
src/agent/Core/Controller/CheckoutSession.cpp | 3 +-
src/agent/Core/Controller/ForwardResponse.cpp | 12 +-
src/agent/Core/Controller/Hooks.cpp | 3 +-
src/agent/Core/Controller/InitRequest.cpp | 1 +
src/agent/Core/SpawningKit/DirectSpawner.h | 12 +
src/agent/Core/SpawningKit/SmartSpawner.h | 15 +-
src/agent/Core/SpawningKit/Spawner.h | 35 +
src/agent/Core/SpawningKit/UserSwitchingRules.h | 18 +-
src/agent/Watchdog/WatchdogMain.cpp | 10 -
src/apache2_module/ConfigurationCommands.cpp | 422 +++---
.../ConfigurationCommands.cpp.cxxcodebuilder | 127 ++
src/apache2_module/ConfigurationCommands.cpp.erb | 109 --
src/apache2_module/ConfigurationFields.hpp | 186 ++-
.../ConfigurationFields.hpp.cxxcodebuilder | 113 ++
src/apache2_module/ConfigurationFields.hpp.erb | 98 --
src/apache2_module/ConfigurationSetters.cpp | 839 ++++++------
.../ConfigurationSetters.cpp.cxxcodebuilder | 144 ++
src/apache2_module/ConfigurationSetters.cpp.erb | 128 --
src/apache2_module/CreateDirConfig.cpp | 100 +-
.../CreateDirConfig.cpp.cxxcodebuilder | 81 ++
src/apache2_module/CreateDirConfig.cpp.erb | 72 -
src/apache2_module/Hooks.cpp | 14 -
src/apache2_module/MergeDirConfig.cpp | 355 ++---
.../MergeDirConfig.cpp.cxxcodebuilder | 97 ++
src/apache2_module/MergeDirConfig.cpp.erb | 82 --
src/apache2_module/SetHeaders.cpp | 230 ++--
src/apache2_module/SetHeaders.cpp.cxxcodebuilder | 106 ++
src/apache2_module/SetHeaders.cpp.erb | 91 --
src/cxx_supportlib/Constants.h | 230 ++--
.../cxx_supportlib/Constants.h.cxxcodebuilder | 52 +-
src/cxx_supportlib/Constants.h.erb | 41 -
src/cxx_supportlib/DataStructures/LString.h | 63 +-
src/cxx_supportlib/Logging.h | 19 +-
src/cxx_supportlib/LveLoggingDecorator.h | 92 ++
src/cxx_supportlib/MemoryKit/mbuf.cpp | 150 ++-
src/cxx_supportlib/MemoryKit/mbuf.h | 82 +-
src/cxx_supportlib/ServerKit/CookieUtils.h | 39 +-
src/cxx_supportlib/ServerKit/FileBufferedChannel.h | 13 +-
.../ServerKit/FileBufferedFdSinkChannel.h | 5 +
src/cxx_supportlib/ServerKit/HeaderTable.h | 10 +-
src/cxx_supportlib/ServerKit/HttpRequest.h | 1 +
src/cxx_supportlib/ServerKit/HttpServer.h | 25 +-
src/cxx_supportlib/WatchdogLauncher.cpp | 8 +-
src/cxx_supportlib/WatchdogLauncher.h | 5 +-
src/cxx_supportlib/vendor-copy/adhoc_lve.h | 304 +++++
src/nginx_module/CacheLocationConfig.c | 1403 +++++++++-----------
.../CacheLocationConfig.c.cxxcodebuilder | 214 +++
src/nginx_module/CacheLocationConfig.c.erb | 171 ---
src/nginx_module/Configuration.c | 8 +
src/nginx_module/Configuration.h | 2 +-
src/nginx_module/ConfigurationCommands.c | 939 ++++++-------
.../ConfigurationCommands.c.cxxcodebuilder | 157 +++
src/nginx_module/ConfigurationCommands.c.erb | 144 --
src/nginx_module/ConfigurationFields.h | 145 --
src/nginx_module/ConfigurationFields.h.erb | 112 --
src/nginx_module/CreateLocationConfig.c | 288 ++--
.../CreateLocationConfig.c.cxxcodebuilder | 98 ++
src/nginx_module/CreateLocationConfig.c.erb | 78 --
src/nginx_module/LocationConfig.h | 97 ++
src/nginx_module/LocationConfig.h.cxxcodebuilder | 131 ++
src/nginx_module/MergeLocationConfig.c | 435 +++---
.../MergeLocationConfig.c.cxxcodebuilder | 144 ++
src/nginx_module/MergeLocationConfig.c.erb | 118 --
src/nginx_module/config | 38 +-
src/nginx_module/ngx_http_passenger_module.c | 14 +-
src/ruby_supportlib/phusion_passenger.rb | 20 +-
.../phusion_passenger/admin_tools/memory_stats.rb | 2 +-
.../phusion_passenger/apache2/config_options.rb | 8 +
.../phusion_passenger/common_library.rb | 4 +-
.../phusion_passenger/config/about_command.rb | 27 +-
.../phusion_passenger/config/main.rb | 2 +
.../config/validate_install_command.rb | 4 +-
src/ruby_supportlib/phusion_passenger/constants.rb | 10 +-
src/ruby_supportlib/phusion_passenger/packaging.rb | 4 +-
.../phusion_passenger/platform_info/compiler.rb | 6 +
.../platform_info/cxx_portability.rb | 1 +
.../phusion_passenger/standalone/start_command.rb | 35 +-
.../standalone/start_command/nginx_engine.rb | 2 +-
.../phusion_passenger/utils/unseekable_socket.rb | 4 +
.../vendor/crash_watch/gdb_controller.rb | 3 +-
.../phusion_passenger/vendor/daemon_controller.rb | 122 +-
.../vendor/daemon_controller/lock_file.rb | 2 +-
.../vendor/daemon_controller/spawn.rb | 8 +-
.../vendor/daemon_controller/version.rb | 2 +-
.../lib/union_station_hooks_core/api.rb | 10 +-
115 files changed, 6220 insertions(+), 4845 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/passenger.git
More information about the Pkg-ruby-extras-commits
mailing list