Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump boost to 1.87 #2582

Open
wants to merge 5 commits into
base: stable-6.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ autom4te.cache
/play
*.orig
/compile_commands.json
/src/cxx_supportlib/vendor-modified/test.cpp
FooBarWidget marked this conversation as resolved.
Show resolved Hide resolved
/src/cxx_supportlib/vendor-modified/test-*.o.tmp
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Release 6.0.25 (Not yet released)
* [Standalone] Adds a config option to specify the stop timeout for Passenger: `--stop-timeout 120` or `PASSENGER_STOP_TIMEOUT=120`.
* [Standalone] Changes Passenger's (not apps') start timeout to 25s (from 15s), stop timeouts default to 60s.
* [Ruby] Fixes an issue where Bundler would try to re-exec the process name instead of the script. Closes GH-2567 and GH-2577.
* Upgrades Boost from 1.86 → 1.87.
* Updated various library versions used in precompiled binaries (used for e.g. gem installs):
- cmake: 3.31.2 -> 3.31.3
- curl: 8.11.0 -> 8.11.1
Expand Down
195 changes: 6 additions & 189 deletions build/support/cxx_dependency_map.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,153 +3,6 @@
{"src/agent/AgentMain.cpp"=>
["src/agent/MainFunctions.h",
"src/cxx_supportlib/Constants.h"],
"src/agent/Core/AdminPanelConnector.h"=>
["src/agent/Core/ApplicationPool/AbstractSession.h",
"src/agent/Core/ApplicationPool/BasicGroupInfo.h",
"src/agent/Core/ApplicationPool/BasicProcessInfo.h",
"src/agent/Core/ApplicationPool/Common.h",
"src/agent/Core/ApplicationPool/Context.h",
"src/agent/Core/ApplicationPool/Group.h",
"src/agent/Core/ApplicationPool/Options.h",
"src/agent/Core/ApplicationPool/Pool.h",
"src/agent/Core/ApplicationPool/Process.h",
"src/agent/Core/ApplicationPool/Session.h",
"src/agent/Core/ApplicationPool/Socket.h",
"src/agent/Core/Controller.h",
"src/agent/Core/Controller/AppResponse.h",
"src/agent/Core/Controller/Client.h",
"src/agent/Core/Controller/Config.h",
"src/agent/Core/Controller/Request.h",
"src/agent/Core/Controller/TurboCaching.h",
"src/agent/Core/ResponseCache.h",
"src/agent/Core/SpawningKit/Config.h",
"src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h",
"src/agent/Core/SpawningKit/Context.h",
"src/agent/Core/SpawningKit/DirectSpawner.h",
"src/agent/Core/SpawningKit/DummySpawner.h",
"src/agent/Core/SpawningKit/Exceptions.h",
"src/agent/Core/SpawningKit/Factory.h",
"src/agent/Core/SpawningKit/Handshake/BackgroundIOCapturer.h",
"src/agent/Core/SpawningKit/Handshake/Perform.h",
"src/agent/Core/SpawningKit/Handshake/Prepare.h",
"src/agent/Core/SpawningKit/Handshake/Session.h",
"src/agent/Core/SpawningKit/Handshake/WorkDir.h",
"src/agent/Core/SpawningKit/Journey.h",
"src/agent/Core/SpawningKit/PipeWatcher.h",
"src/agent/Core/SpawningKit/Result.h",
"src/agent/Core/SpawningKit/Result/AutoGeneratedCode.h",
"src/agent/Core/SpawningKit/SmartSpawner.h",
"src/agent/Core/SpawningKit/Spawner.h",
"src/agent/Core/SpawningKit/UserSwitchingRules.h",
"src/agent/Shared/ApplicationPoolApiKey.h",
"src/cxx_supportlib/Algorithms/Hasher.h",
"src/cxx_supportlib/Algorithms/MovingAverage.h",
"src/cxx_supportlib/AppLocalConfigFileUtils.h",
"src/cxx_supportlib/ConfigKit/AsyncUtils.h",
"src/cxx_supportlib/ConfigKit/Common.h",
"src/cxx_supportlib/ConfigKit/ConfigKit.h",
"src/cxx_supportlib/ConfigKit/DummyTranslator.h",
"src/cxx_supportlib/ConfigKit/Schema.h",
"src/cxx_supportlib/ConfigKit/SchemaUtils.h",
"src/cxx_supportlib/ConfigKit/Store.h",
"src/cxx_supportlib/ConfigKit/Translator.h",
"src/cxx_supportlib/ConfigKit/Utils.h",
"src/cxx_supportlib/Constants.h",
"src/cxx_supportlib/DataStructures/HashedStaticString.h",
"src/cxx_supportlib/DataStructures/LString.h",
"src/cxx_supportlib/DataStructures/StringKeyTable.h",
"src/cxx_supportlib/Exceptions.h",
"src/cxx_supportlib/FileDescriptor.h",
"src/cxx_supportlib/FileTools/FileManip.h",
"src/cxx_supportlib/FileTools/PathManip.h",
"src/cxx_supportlib/Hooks.h",
"src/cxx_supportlib/IOTools/BufferedIO.h",
"src/cxx_supportlib/IOTools/IOUtils.h",
"src/cxx_supportlib/IOTools/MessageIO.h",
"src/cxx_supportlib/IOTools/MessageSerialization.h",
"src/cxx_supportlib/InstanceDirectory.h",
"src/cxx_supportlib/Integrations/LibevJsonUtils.h",
"src/cxx_supportlib/JsonTools/JsonUtils.h",
"src/cxx_supportlib/LoggingKit/Assert.h",
"src/cxx_supportlib/LoggingKit/Config.h",
"src/cxx_supportlib/LoggingKit/Context.h",
"src/cxx_supportlib/LoggingKit/Forward.h",
"src/cxx_supportlib/LoggingKit/Logging.h",
"src/cxx_supportlib/LoggingKit/LoggingKit.h",
"src/cxx_supportlib/LveLoggingDecorator.h",
"src/cxx_supportlib/MemoryKit/mbuf.h",
"src/cxx_supportlib/MemoryKit/palloc.h",
"src/cxx_supportlib/ProcessManagement/Ruby.h",
"src/cxx_supportlib/ProcessManagement/Spawn.h",
"src/cxx_supportlib/ProcessManagement/Utils.h",
"src/cxx_supportlib/RandomGenerator.h",
"src/cxx_supportlib/ResourceLocator.h",
"src/cxx_supportlib/SafeLibev.h",
"src/cxx_supportlib/SecurityKit/MemZeroGuard.h",
"src/cxx_supportlib/ServerKit/Channel.h",
"src/cxx_supportlib/ServerKit/Client.h",
"src/cxx_supportlib/ServerKit/ClientRef.h",
"src/cxx_supportlib/ServerKit/Config.h",
"src/cxx_supportlib/ServerKit/Context.h",
"src/cxx_supportlib/ServerKit/CookieUtils.h",
"src/cxx_supportlib/ServerKit/Errors.h",
"src/cxx_supportlib/ServerKit/FdSinkChannel.h",
"src/cxx_supportlib/ServerKit/FdSourceChannel.h",
"src/cxx_supportlib/ServerKit/FileBufferedChannel.h",
"src/cxx_supportlib/ServerKit/FileBufferedFdSinkChannel.h",
"src/cxx_supportlib/ServerKit/HeaderTable.h",
"src/cxx_supportlib/ServerKit/Hooks.h",
"src/cxx_supportlib/ServerKit/HttpChunkedBodyParser.h",
"src/cxx_supportlib/ServerKit/HttpChunkedBodyParserState.h",
"src/cxx_supportlib/ServerKit/HttpClient.h",
"src/cxx_supportlib/ServerKit/HttpHeaderParser.h",
"src/cxx_supportlib/ServerKit/HttpHeaderParserState.h",
"src/cxx_supportlib/ServerKit/HttpRequest.h",
"src/cxx_supportlib/ServerKit/HttpRequestRef.h",
"src/cxx_supportlib/ServerKit/HttpServer.h",
"src/cxx_supportlib/ServerKit/Server.h",
"src/cxx_supportlib/ServerKit/llerrors.h",
"src/cxx_supportlib/ServerKit/llhttp.h",
"src/cxx_supportlib/ServerKit/url_parser.h",
"src/cxx_supportlib/StaticString.h",
"src/cxx_supportlib/StrIntTools/DateParsing.h",
"src/cxx_supportlib/StrIntTools/StrIntUtils.h",
"src/cxx_supportlib/StrIntTools/StringScanning.h",
"src/cxx_supportlib/SystemTools/ProcessMetricsCollector.h",
"src/cxx_supportlib/SystemTools/SystemMetricsCollector.h",
"src/cxx_supportlib/SystemTools/SystemTime.h",
"src/cxx_supportlib/SystemTools/UserDatabase.h",
"src/cxx_supportlib/Utils.h",
"src/cxx_supportlib/Utils/AnsiColorConstants.h",
"src/cxx_supportlib/Utils/AsyncSignalSafeUtils.h",
"src/cxx_supportlib/Utils/FastStringStream.h",
"src/cxx_supportlib/Utils/HttpConstants.h",
"src/cxx_supportlib/Utils/IniFile.h",
"src/cxx_supportlib/Utils/Lock.h",
"src/cxx_supportlib/Utils/MessagePassing.h",
"src/cxx_supportlib/Utils/ScopeGuard.h",
"src/cxx_supportlib/Utils/SpeedMeter.h",
"src/cxx_supportlib/Utils/Timer.h",
"src/cxx_supportlib/Utils/VariantMap.h",
"src/cxx_supportlib/WebSocketCommandReverseServer.h",
"src/cxx_supportlib/WrapperRegistry/Entry.h",
"src/cxx_supportlib/WrapperRegistry/Registry.h",
"src/cxx_supportlib/oxt/backtrace.hpp",
"src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
"src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
"src/cxx_supportlib/oxt/detail/context.hpp",
"src/cxx_supportlib/oxt/detail/spin_lock_darwin.hpp",
"src/cxx_supportlib/oxt/detail/spin_lock_gcc_x86.hpp",
"src/cxx_supportlib/oxt/detail/spin_lock_portable.hpp",
"src/cxx_supportlib/oxt/detail/spin_lock_pthreads.hpp",
"src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
"src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
"src/cxx_supportlib/oxt/dynamic_thread_group.hpp",
"src/cxx_supportlib/oxt/macros.hpp",
"src/cxx_supportlib/oxt/spin_lock.hpp",
"src/cxx_supportlib/oxt/system_calls.hpp",
"src/cxx_supportlib/oxt/thread.hpp",
"src/cxx_supportlib/oxt/tracable_exception.hpp"],
"src/agent/Core/ApiServer.h"=>
["src/agent/Core/ApplicationPool/AbstractSession.h",
"src/agent/Core/ApplicationPool/BasicGroupInfo.h",
Expand Down Expand Up @@ -3188,7 +3041,7 @@
"src/cxx_supportlib/oxt/system_calls.hpp",
"src/cxx_supportlib/oxt/tracable_exception.hpp"],
"src/agent/Core/Config.h"=>
["src/agent/Core/AdminPanelConnector.h",
[
"src/agent/Core/ApiServer.h",
"src/agent/Core/ApplicationPool/AbstractSession.h",
"src/agent/Core/ApplicationPool/BasicGroupInfo.h",
Expand Down Expand Up @@ -3327,7 +3180,6 @@
"src/cxx_supportlib/Utils/SpeedMeter.h",
"src/cxx_supportlib/Utils/Timer.h",
"src/cxx_supportlib/Utils/VariantMap.h",
"src/cxx_supportlib/WebSocketCommandReverseServer.h",
"src/cxx_supportlib/WrapperRegistry/Entry.h",
"src/cxx_supportlib/WrapperRegistry/Registry.h",
"src/cxx_supportlib/oxt/backtrace.hpp",
Expand All @@ -3347,7 +3199,7 @@
"src/cxx_supportlib/oxt/thread.hpp",
"src/cxx_supportlib/oxt/tracable_exception.hpp"],
"src/agent/Core/ConfigChange.cpp"=>
["src/agent/Core/AdminPanelConnector.h",
[
"src/agent/Core/ApiServer.h",
"src/agent/Core/ApplicationPool/AbstractSession.h",
"src/agent/Core/ApplicationPool/BasicGroupInfo.h",
Expand Down Expand Up @@ -3487,7 +3339,6 @@
"src/cxx_supportlib/Utils/SpeedMeter.h",
"src/cxx_supportlib/Utils/Timer.h",
"src/cxx_supportlib/Utils/VariantMap.h",
"src/cxx_supportlib/WebSocketCommandReverseServer.h",
"src/cxx_supportlib/WrapperRegistry/Entry.h",
"src/cxx_supportlib/WrapperRegistry/Registry.h",
"src/cxx_supportlib/oxt/backtrace.hpp",
Expand Down Expand Up @@ -5851,7 +5702,7 @@
"src/cxx_supportlib/oxt/thread.hpp",
"src/cxx_supportlib/oxt/tracable_exception.hpp"],
"src/agent/Core/CoreMain.cpp"=>
["src/agent/Core/AdminPanelConnector.h",
[
"src/agent/Core/ApiServer.h",
"src/agent/Core/ApplicationPool/AbstractSession.h",
"src/agent/Core/ApplicationPool/BasicGroupInfo.h",
Expand Down Expand Up @@ -6007,7 +5858,6 @@
"src/cxx_supportlib/Utils/SpeedMeter.h",
"src/cxx_supportlib/Utils/Timer.h",
"src/cxx_supportlib/Utils/VariantMap.h",
"src/cxx_supportlib/WebSocketCommandReverseServer.h",
"src/cxx_supportlib/WrapperRegistry/Entry.h",
"src/cxx_supportlib/WrapperRegistry/Registry.h",
"src/cxx_supportlib/oxt/backtrace.hpp",
Expand Down Expand Up @@ -7602,7 +7452,7 @@
"src/cxx_supportlib/oxt/thread.hpp",
"src/cxx_supportlib/oxt/tracable_exception.hpp"],
"src/agent/Watchdog/Config.h"=>
["src/agent/Core/AdminPanelConnector.h",
[
"src/agent/Core/ApiServer.h",
"src/agent/Core/ApplicationPool/AbstractSession.h",
"src/agent/Core/ApplicationPool/BasicGroupInfo.h",
Expand Down Expand Up @@ -7743,7 +7593,6 @@
"src/cxx_supportlib/Utils/SpeedMeter.h",
"src/cxx_supportlib/Utils/Timer.h",
"src/cxx_supportlib/Utils/VariantMap.h",
"src/cxx_supportlib/WebSocketCommandReverseServer.h",
"src/cxx_supportlib/WrapperRegistry/Entry.h",
"src/cxx_supportlib/WrapperRegistry/Registry.h",
"src/cxx_supportlib/oxt/backtrace.hpp",
Expand Down Expand Up @@ -7793,7 +7642,7 @@
"src/cxx_supportlib/Utils/AsyncSignalSafeUtils.h",
"src/cxx_supportlib/oxt/macros.hpp"],
"src/agent/Watchdog/WatchdogMain.cpp"=>
["src/agent/Core/AdminPanelConnector.h",
[
"src/agent/Core/ApiServer.h",
"src/agent/Core/ApplicationPool/AbstractSession.h",
"src/agent/Core/ApplicationPool/BasicGroupInfo.h",
Expand Down Expand Up @@ -7948,7 +7797,6 @@
"src/cxx_supportlib/Utils/SpeedMeter.h",
"src/cxx_supportlib/Utils/Timer.h",
"src/cxx_supportlib/Utils/VariantMap.h",
"src/cxx_supportlib/WebSocketCommandReverseServer.h",
"src/cxx_supportlib/WrapperRegistry/Entry.h",
"src/cxx_supportlib/WrapperRegistry/Registry.h",
"src/cxx_supportlib/oxt/backtrace.hpp",
Expand Down Expand Up @@ -10539,36 +10387,6 @@
"src/cxx_supportlib/oxt/system_calls.hpp",
"src/cxx_supportlib/oxt/thread.hpp",
"src/cxx_supportlib/oxt/tracable_exception.hpp"],
"src/cxx_supportlib/WebSocketCommandReverseServer.h"=>
["src/cxx_supportlib/Algorithms/Hasher.h",
"src/cxx_supportlib/ConfigKit/AsyncUtils.h",
"src/cxx_supportlib/ConfigKit/Common.h",
"src/cxx_supportlib/ConfigKit/ConfigKit.h",
"src/cxx_supportlib/ConfigKit/DummyTranslator.h",
"src/cxx_supportlib/ConfigKit/Schema.h",
"src/cxx_supportlib/ConfigKit/Store.h",
"src/cxx_supportlib/ConfigKit/Translator.h",
"src/cxx_supportlib/ConfigKit/Utils.h",
"src/cxx_supportlib/DataStructures/HashedStaticString.h",
"src/cxx_supportlib/DataStructures/StringKeyTable.h",
"src/cxx_supportlib/Exceptions.h",
"src/cxx_supportlib/FileTools/FileManip.h",
"src/cxx_supportlib/FileTools/PathManip.h",
"src/cxx_supportlib/LoggingKit/Assert.h",
"src/cxx_supportlib/LoggingKit/Forward.h",
"src/cxx_supportlib/LoggingKit/Logging.h",
"src/cxx_supportlib/LoggingKit/LoggingKit.h",
"src/cxx_supportlib/StaticString.h",
"src/cxx_supportlib/StrIntTools/StrIntUtils.h",
"src/cxx_supportlib/Utils.h",
"src/cxx_supportlib/Utils/FastStringStream.h",
"src/cxx_supportlib/oxt/backtrace.hpp",
"src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
"src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
"src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
"src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
"src/cxx_supportlib/oxt/macros.hpp",
"src/cxx_supportlib/oxt/tracable_exception.hpp"],
"src/cxx_supportlib/WrapperRegistry/CBindings.cpp"=>
["src/cxx_supportlib/Algorithms/Hasher.h",
"src/cxx_supportlib/Constants.h",
Expand Down Expand Up @@ -10853,7 +10671,7 @@
"src/ruby_native_extension/passenger_native_support.c"=>
[],
"src/schema_printer/SchemaPrinterMain.cpp"=>
["src/agent/Core/AdminPanelConnector.h",
[
"src/agent/Core/ApiServer.h",
"src/agent/Core/ApplicationPool/AbstractSession.h",
"src/agent/Core/ApplicationPool/BasicGroupInfo.h",
Expand Down Expand Up @@ -10995,7 +10813,6 @@
"src/cxx_supportlib/Utils/SpeedMeter.h",
"src/cxx_supportlib/Utils/Timer.h",
"src/cxx_supportlib/Utils/VariantMap.h",
"src/cxx_supportlib/WebSocketCommandReverseServer.h",
"src/cxx_supportlib/WrapperRegistry/Entry.h",
"src/cxx_supportlib/WrapperRegistry/Registry.h",
"src/cxx_supportlib/oxt/backtrace.hpp",
Expand Down
4 changes: 2 additions & 2 deletions dev/boost-patches/0003-drop-windows-headers-from-asio.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Subject: [PATCH] drop windows headers from asio

diff --git src/cxx_supportlib/vendor-modified/boost/asio.hpp src/cxx_supportlib/vendor-modified/boost/asio.hpp
index 7b889de4a..b32ead6ae 100644
--- src/cxx_supportlib/vendor-modified/boost/asio.hpp
+++ src/cxx_supportlib/vendor-modified/boost/asio.hpp
--- a/src/cxx_supportlib/vendor-modified/boost/asio.hpp
+++ b/src/cxx_supportlib/vendor-modified/boost/asio.hpp
@@ -182,15 +182,6 @@
#include <boost/asio/uses_executor.hpp>
#include <boost/asio/version.hpp>
Expand Down
Loading
Loading