passenger 6.0.20 → 6.0.22

data/dev/copy_boost_headers

@@ -203,28 +203,42 @@ def prepare
 end
 
 def cleanup
-  FileUtils.rm_rf("boost/thread/win32")
-  FileUtils.rm_rf("boost/src/win32")
+  FileUtils.rm_rf("boost/asio/detail/old_win_sdk_compat.hpp")
   FileUtils.rm_rf("boost/asio/win32")
+  FileUtils.rm_rf("boost/asio/windows")
   FileUtils.rm_rf("boost/atomic/detail/caps_windows.hpp")
+  FileUtils.rm_rf("boost/atomic/detail/core_ops_windows.hpp")
+  FileUtils.rm_rf("boost/atomic/detail/fence_ops_windows.hpp")
   FileUtils.rm_rf("boost/atomic/detail/ops_windows.hpp")
-  FileUtils.rm_rf("boost/smart_ptr/detail/spinlock_w32.hpp")
-  FileUtils.rm_rf("boost/smart_ptr/detail/sp_counted_base_w32.hpp")
-  FileUtils.rm_rf("boost/smart_ptr/detail/atomic_count_win32.hpp")
-  FileUtils.rm_rf("boost/config/platform/win32.hpp")
+  FileUtils.rm_rf("boost/atomic/detail/wait_caps_windows.hpp")
+  FileUtils.rm_rf("boost/atomic/detail/wait_ops_windows.hpp")
   FileUtils.rm_rf("boost/chrono/detail/inlined/win")
+  FileUtils.rm_rf("boost/config/platform/cygwin.hpp")
+  FileUtils.rm_rf("boost/config/platform/win32.hpp")
+  FileUtils.rm_rf("boost/core/detail/sp_win32_sleep.hpp")
+  FileUtils.rm_rf("boost/smart_ptr/detail/atomic_count_win32.hpp")
+  FileUtils.rm_rf("boost/smart_ptr/detail/sp_counted_base_w32.hpp")
+  FileUtils.rm_rf("boost/smart_ptr/detail/spinlock_w32.hpp")
+  FileUtils.rm_rf("boost/src/win32")
+  FileUtils.rm_rf("boost/thread/win32")
   File.unlink("test.cpp") rescue nil
 end
 
 # Compile PROGRAM_SOURCE and copy whatever missing header files the compiler needs.
 def copy_dependencies(cflags)
+  if RUBY_PLATFORM =~ /darwin/
+    openssl_path = `brew --prefix openssl`.strip
+  else
+    openssl_path = '/usr/include/openssl'
+  end
   done = false
   while !done
-    compiler_output = `c++ test.cpp -c -I. -I.. #{cflags.join(" ")} 2>&1`
+    compiler_output = `c++ test.cpp -c -I#{openssl_path}/include -I. -I.. #{cflags.join(" ")} 2>&1`
     File.unlink('test.o') if File.exist?('test.o')
     missing_headers = compiler_output.
                         split("\n").
                         grep(/(error: .*: No such file|fatal error: '.*' file not found)/).
+                        reject{|s| s =~ /\/usr\/include\// }.
                         map do |line|
       if line =~ /error: (.*): No such file/
         file = $1

data/dev/nginx_version_sha256

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2024 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+require 'openssl'
+require 'open-uri'
+require 'gpgme'
+require 'rubygems/version.rb'
+
+VERSION = ARGV[0]
+debug = !ENV["VERBOSE"].nil?
+if Gem::Version.new(VERSION).segments[1].odd?
+  puts "Only use LTS Nginx versions (even numbered minor versions, eg: 1.26.3)"
+  exit 1
+end
+DL_URL = "https://nginx.org/download/nginx-#{VERSION}.tar.gz"
+SIG_URL = "#{DL_URL}.asc"
+KEY_URLS = [
+  # https://nginx.org/en/pgp_keys.html
+  "https://nginx.org/keys/nginx_signing.key",
+  "https://nginx.org/keys/thresh.key",
+  "https://nginx.org/keys/sb.key",
+  "https://nginx.org/keys/pluknet.key",
+  "https://nginx.org/keys/arut.key",
+  "https://nginx.org/keys/maxim.key",
+]
+
+puts DL_URL if debug
+data = URI.open(DL_URL) do |f| f.read end
+File.write("./dl.tar.gz",data) if debug
+puts SIG_URL if debug
+sig = URI.open(SIG_URL) do |f| f.read end
+
+KEY_URLS.each do |key_url|
+  puts key_url if debug
+  key = URI.open(key_url) do |f| f.read end
+  GPGME::Key.import(key) #only needed if the key has not been imported previously
+end
+
+crypto = GPGME::Crypto.new
+valid = false
+crypto.verify(sig, signed_text: data) do |signature|
+  valid = signature.valid?
+end
+
+if valid
+  puts Digest::SHA256.hexdigest(data)
+else
+  puts "invalid sig, maybe you need to add a new key to the list?"
+  exit 1
+end

data/src/agent/AgentMain.cpp

@@ -28,15 +28,9 @@
 #include <cstring>
 #include <Constants.h>
 
-using namespace std;
+#include <MainFunctions.h>
 
-int watchdogMain(int argc, char *argv[]);
-int coreMain(int argc, char *argv[]);
-int systemMetricsMain(int argc, char *argv[]);
-int tempDirToucherMain(int argc, char *argv[]);
-int spawnEnvSetupperMain(int argc, char *argv[]);
-int execHelperMain(int argc, char *argv[]);
-int fileReadHelperMain(int argc, char *argv[]);
+using namespace std;
 
 static bool
 isHelp(const char *arg) {

data/src/agent/Core/AdminPanelConnector.h

@@ -437,8 +437,7 @@ private:
 				files = Json::nullValue;
 			}
 			if (!files.isNull()) {
-				string usernameOrUid = lookupSystemUsernameByUid(ids.first,
-					P_STATIC_STRING("%d"));
+				string usernameOrUid = lookupSystemUsernameByUid(ids.first, true);
 
 				foreach (Json::Value file, files) {
 					string f = file.asString();
@@ -472,7 +471,7 @@ private:
 						pipe.second.close();
 						closeAllFileDescriptors(2);
 
-						execvp(execArgs[0], (char * const *) &execArgs[0]);
+						execvp(execArgs[0], const_cast<char * const *>(&execArgs[0]));
 
 						int e = errno;
 						char buf[256];

data/src/agent/Core/ApiServer.h

@@ -641,7 +641,7 @@ protected:
 		TRACE_POINT();
 		StaticString path = req->getPathWithoutQueryString();
 
-		P_INFO("API request: " << http_method_str(req->method) <<
+		P_INFO("API request: " << llhttp_method_name(req->method) <<
 			" " << StaticString(req->path.start->data, req->path.size));
 
 		try {

data/src/agent/Core/ApplicationPool/Pool/StateInspection.cpp

@@ -81,8 +81,15 @@ Pool::inspectProcessList(const InspectOptions &options, stringstream &result,
 
 		 if (process->metrics.isValid()) {
 			snprintf(cpubuf, sizeof(cpubuf), "%d%%", (int) process->metrics.cpu);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-truncation"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+			//don't worry about format-truncation here, no one has 9.3PB RAM
 			snprintf(membuf, sizeof(membuf), "%ldM",
 				(unsigned long) (process->metrics.realMemory() / 1024));
+#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 		} else {
 			snprintf(cpubuf, sizeof(cpubuf), "0%%");
 			snprintf(membuf, sizeof(membuf), "0M");
@@ -107,7 +114,7 @@ Pool::inspectProcessList(const InspectOptions &options, stringstream &result,
 			result << "    Shutting down..." << endl;
 		}
 
-		const Socket *socket;
+		const Socket *socket = NULL;//shut up compiler
 		if (options.verbose && (socket = process->getSockets().findFirstSocketWithProtocol("http")) != NULL) {
 			result << "    URL     : http://" << replaceString(socket->address, "tcp://", "") << endl;
 			result << "    Password: " << group->getApiKey().toStaticString() << endl;

data/src/agent/Core/Config.h

@@ -40,6 +40,7 @@
 #include <ConfigKit/TableTranslator.h>
 #include <ConfigKit/PrefixTranslator.h>
 #include <ServerKit/Context.h>
+#include <ServerKit/llversion.h>
 #include <ServerKit/HttpServer.h>
 #include <WrapperRegistry/Registry.h>
 #include <Core/Controller/Config.h>
@@ -165,7 +166,7 @@ using namespace std;
  *   security_update_checker_interval                                unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                               string             -          -
  *   security_update_checker_url                                     string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                 string             -          default("Phusion_Passenger/6.0.20")
+ *   server_software                                                 string             -          default("Phusion_Passenger/6.0.22")
  *   show_version_in_header                                          boolean            -          default(true)
  *   single_app_mode_app_root                                        string             -          default,read_only
  *   single_app_mode_app_start_command                               string             -          read_only
@@ -272,8 +273,6 @@ private:
 	static void validateSingleAppMode(const ConfigKit::Store &config,
 		const WrapperRegistry::Registry *wrapperRegistry, vector<ConfigKit::Error> &errors)
 	{
-		typedef ConfigKit::Error Error;
-
 		if (config["multi_app"].asBool()) {
 			return;
 		}
@@ -368,6 +367,10 @@ private:
 
 		Json::Value updates;
 		updates["server_software"] = serverSoftware;
+		if (effectiveValues["integration_mode"].asString() == "standalone" &&
+			effectiveValues["standalone_engine"].asString()=="builtin") {
+			updates["web_server_version"] = llhttp_version();
+		}
 		return updates;
 	}
 

data/src/agent/Core/Controller/AppResponse.h

@@ -30,7 +30,6 @@
 #include <boost/cstdint.hpp>
 #include <boost/atomic.hpp>
 #include <sys/uio.h>
-#include <ServerKit/http_parser.h>
 #include <ServerKit/Hooks.h>
 #include <ServerKit/Client.h>
 #include <ServerKit/HeaderTable.h>

data/src/agent/Core/Controller/Config.h

@@ -116,7 +116,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   multi_app                                           boolean            -          default(true),read_only
  *   request_freelist_limit                              unsigned integer   -          default(1024)
  *   response_buffer_high_watermark                      unsigned integer   -          default(134217728)
- *   server_software                                     string             -          default("Phusion_Passenger/6.0.20")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.0.22")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)
@@ -192,7 +192,7 @@ private:
 				"The user that PassengerDefaultUser refers to, '" +
 				config["default_user"].asString() + "', does not exist.");
 		}
-		return lookupSystemGroupnameByGid(osUser.pwd.pw_gid, P_STATIC_STRING("%d"));
+		return lookupSystemGroupnameByGid(osUser.pwd.pw_gid, true);
 	}
 
 	static void validate(const ConfigKit::Store &config,

data/src/agent/Core/Controller/SendRequest.cpp

@@ -332,7 +332,7 @@ Controller::determineMaxHeaderSizeForSessionProtocol(Request *req,
 		}
 	}
 	state.queryString = req->getQueryString();
-	state.methodStr   = StaticString(http_method_str(req->method));
+	state.methodStr   = StaticString(llhttp_method_name(req->method));
 	state.remoteAddr  = req->secureHeaders.lookup(REMOTE_ADDR);
 	state.remotePort  = req->secureHeaders.lookup(REMOTE_PORT);
 	state.remoteUser  = req->secureHeaders.lookup(REMOTE_USER);
@@ -700,7 +700,7 @@ Controller::constructHeaderBuffersForHttpProtocol(Request *req, struct iovec *bu
 	dataSize = 0;
 
 	if (!cache.cached) {
-		cache.methodStr  = http_method_str(req->method);
+		cache.methodStr  = llhttp_method_name(req->method);
 		cache.remoteAddr = req->secureHeaders.lookup(REMOTE_ADDR);
 		cache.setCookie  = req->headers.lookup(ServerKit::HTTP_SET_COOKIE);
 		cache.cached     = true;

data/src/agent/Core/CoreMain.cpp

@@ -78,6 +78,7 @@
 #include <Shared/ApiServerUtils.h>
 #include <Constants.h>
 #include <LoggingKit/Context.h>
+#include <MainFunctions.h>
 #include <ConfigKit/SubComponentUtils.h>
 #include <ServerKit/Server.h>
 #include <ServerKit/AcceptLoadBalancer.h>

data/src/agent/Core/ResponseCache.h

@@ -31,7 +31,7 @@
 #include <cassert>
 #include <cstring>
 #include <DataStructures/HashedStaticString.h>
-#include <ServerKit/http_parser.h>
+#include <ServerKit/url_parser.h>
 #include <ServerKit/CookieUtils.h>
 #include <StaticString.h>
 #include <StrIntTools/DateParsing.h>
@@ -310,7 +310,7 @@ private:
 			}
 		}
 
-		return now + DEFAULT_HEURISTIC_FRESHNESS;
+		return lround(now) + DEFAULT_HEURISTIC_FRESHNESS;
 	}
 
 	bool isFresh(const Entry &entry, ev_tstamp now) const {
@@ -344,6 +344,7 @@ private:
 		if (psg_lstr_first_byte(value) != '/') {
 			// Maybe it is a full URL. Parse the host name.
 			struct http_parser_url url;
+			http_parser_url_init(&url);
 			int ret = http_parser_parse_url(value->start->data, value->size,
 				0, &url);
 			if (ret != 0) {

data/src/agent/Core/SecurityUpdateChecker.h

@@ -594,7 +594,7 @@ public:
 			long responseCode;
 			CURLcode code;
 
-			if (!verifyFileReadable((char *) clientCertPath.c_str())) {
+			if (!verifyFileReadable(const_cast<char *>(clientCertPath.c_str()))) {
 				logUpdateFail("File not readable: " + clientCertPath);
 				break;
 			}

data/src/agent/Core/SpawningKit/Handshake/Perform.h

@@ -1414,14 +1414,14 @@ private:
 		if (fileExists(stepDir + "/begin_time_monotonic")) {
 			value = safeReadFile(stepDirFd, "begin_time_monotonic",
 				SPAWNINGKIT_MAX_JOURNEY_STEP_FILE_SIZE).first;
-			MonotonicTimeUsec beginTimeMonotonic = atof(value.c_str()) * 1000000;
+			MonotonicTimeUsec beginTimeMonotonic = llround(atof(value.c_str()) * 1000000);
 			P_DEBUG("[App " << pid << " journey] Step " << journeyStepToString(step)
 				<< ": monotonic begin time is \"" << cEscapeString(value) << "\"");
 			session.journey.setStepBeginTime(step, beginTimeMonotonic);
 		} else if (fileExists(stepDir + "/begin_time")) {
 			value = safeReadFile(stepDirFd, "begin_time",
 				SPAWNINGKIT_MAX_JOURNEY_STEP_FILE_SIZE).first;
-			unsigned long long beginTime = atof(value.c_str()) * 1000000;
+			unsigned long long beginTime = llround(atof(value.c_str()) * 1000000);
 			MonotonicTimeUsec beginTimeMonotonic = usecTimestampToMonoTime(beginTime);
 			P_DEBUG("[App " << pid << " journey] Step " << journeyStepToString(step)
 				<< ": begin time is \"" << cEscapeString(value) << "\", monotonic conversion is "
@@ -1436,14 +1436,14 @@ private:
 		if (fileExists(stepDir + "/end_time_monotonic")) {
 			value = safeReadFile(stepDirFd, "end_time_monotonic",
 				SPAWNINGKIT_MAX_JOURNEY_STEP_FILE_SIZE).first;
-			MonotonicTimeUsec endTimeMonotonic = atof(value.c_str()) * 1000000;
+			MonotonicTimeUsec endTimeMonotonic = llround(atof(value.c_str()) * 1000000);
 			P_DEBUG("[App " << pid << " journey] Step " << journeyStepToString(step)
 				<< ": monotonic end time is \"" << cEscapeString(value) << "\"");
 			session.journey.setStepEndTime(step, endTimeMonotonic);
 		} else if (fileExists(stepDir + "/end_time")) {
 			value = safeReadFile(stepDirFd, "end_time",
 				SPAWNINGKIT_MAX_JOURNEY_STEP_FILE_SIZE).first;
-			unsigned long long endTime = atof(value.c_str()) * 1000000;
+			unsigned long long endTime = llround(atof(value.c_str()) * 1000000);
 			MonotonicTimeUsec endTimeMonotonic = usecTimestampToMonoTime(endTime);
 			P_DEBUG("[App " << pid << " journey] Step " << journeyStepToString(step)
 				<< ": end time is \"" << cEscapeString(value) << "\", monotonic conversion is "

data/src/agent/Core/SpawningKit/UserSwitchingRules.h

@@ -90,7 +90,7 @@ prepareUserSwitching(const AppPoolOptions &options,
 
 		info.enabled = false;
 		info.username = userInfo->pw_name;
-		info.groupname = lookupSystemGroupnameByGid(userInfo->pw_gid, P_STATIC_STRING("%d"));
+		info.groupname = lookupSystemGroupnameByGid(userInfo->pw_gid, true);
 		info.uid = geteuid();
 		info.gid = getegid();
 		return info;
@@ -247,7 +247,7 @@ prepareUserSwitching(const AppPoolOptions &options,
 	UPDATE_TRACE_POINT();
 	info.enabled = true;
 	info.username = userInfo->pw_name;
-	info.groupname = lookupSystemGroupnameByGid(groupId, P_STATIC_STRING("%d"));
+	info.groupname = lookupSystemGroupnameByGid(groupId, true);
 	info.uid = userInfo->pw_uid;
 	info.gid = groupId;
 

data/src/agent/ExecHelper/ExecHelperMain.cpp

@@ -38,6 +38,7 @@
 #include <boost/scoped_array.hpp>
 
 #include <Constants.h>
+#include <MainFunctions.h>
 #include <ProcessManagement/Utils.h>
 #include <Utils/OptionParsing.h>
 #include <StrIntTools/StrIntUtils.h>
@@ -250,15 +251,22 @@ switchUser(uid_t uid, const struct passwd *userInfo) {
 	}
 }
 
+} // namespace ExecHelper
+} // namespace Passenger
+
 int
 execHelperMain(int argc, char *argv[]) {
+
+	using namespace Passenger;
+	using namespace Passenger::ExecHelper;
+
 	if (argc < 3) {
 		usage();
 		exit(1);
 	}
 
 	Options options;
-	if (!parseOptions(argc, (const char **) argv, options)) {
+	if (!parseOptions(argc, const_cast<const char **>(argv), options)) {
 		fprintf(stderr, "Error parsing arguments.\n");
 		usage();
 		exit(1);
@@ -281,18 +289,8 @@ execHelperMain(int argc, char *argv[]) {
 		(char * const *) &argv[options.programArgStart]);
 	int e = errno;
 	fprintf(stderr, "ERROR: unable to execute %s: %s (errno=%d)\n",
-		describeCommand(argc, (const char **) argv, options).c_str(),
+		describeCommand(argc, const_cast<const char **>(argv), options).c_str(),
 		strerror(e),
 		e);
 	return 1;
 }
-
-
-} // namespace ExecHelper
-} // namespace Passenger
-
-
-int
-execHelperMain(int argc, char *argv[]) {
-	return Passenger::ExecHelper::execHelperMain(argc, argv);
-}

data/src/agent/FileReadHelper/FileReadHelperMain.cpp

@@ -53,6 +53,7 @@
 #include <unistd.h>
 
 #include <Constants.h>
+#include <MainFunctions.h>
 #include <ProcessManagement/Utils.h>
 #include <IOTools/IOUtils.h>
 #include <Utils/OptionParsing.h>
@@ -121,8 +122,14 @@ parseOptions(int argc, const char *argv[], Options &options) {
 	return true;
 }
 
+} // namespace FileReadHelper
+} // namespace Passenger
+
 int
 fileReadHelperMain(int argc, char *argv[]) {
+	using namespace Passenger;
+	using namespace Passenger::FileReadHelper;
+
 	if (argc < 3) {
 		usage();
 		exit(1);
@@ -186,13 +193,3 @@ fileReadHelperMain(int argc, char *argv[]) {
 
 	return 0;
 }
-
-
-} // namespace FileReadHelper
-} // namespace Passenger
-
-
-int
-fileReadHelperMain(int argc, char *argv[]) {
-	return Passenger::FileReadHelper::fileReadHelperMain(argc, argv);
-}

data/src/agent/MainFunctions.h

@@ -0,0 +1,38 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2024 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+
+#ifndef _PASSENGER_AGENT_MAIN_FUNCTIONS_H_
+#define _PASSENGER_AGENT_MAIN_FUNCTIONS_H_
+
+int coreMain(int argc, char *argv[]);
+int execHelperMain(int argc, char *argv[]);
+int fileReadHelperMain(int argc, char *argv[]);
+int spawnEnvSetupperMain(int argc, char *argv[]);
+int systemMetricsMain(int argc, char *argv[]);
+int tempDirToucherMain(int argc, char *argv[]);
+int watchdogMain(int argc, char *argv[]);
+
+#endif

data/src/agent/Shared/ApiServerUtils.h

@@ -67,6 +67,7 @@
 #include <Exceptions.h>
 #include <DataStructures/LString.h>
 #include <DataStructures/StringKeyTable.h>
+#include <ServerKit/llhttp.h>
 #include <ServerKit/Server.h>
 #include <ServerKit/HeaderTable.h>
 #include <LoggingKit/LoggingKit.h>
@@ -285,7 +286,7 @@ struct ApiServerInternalHttpRequest {
 	Request *req;
 
 	string address;
-	http_method method;
+	llhttp_method_t method;
 	string uri;
 	StringKeyTable<string> headers;
 	boost::function<void (ApiServerInternalHttpResponse<Server, Client, Request>)> callback;
@@ -375,7 +376,7 @@ apiServerMakeInternalHttpRequestThreadMain(ApiServerInternalHttpRequest<Server,
 		BufferedIO io(conn);
 
 		string header;
-		header.append(http_method_str(req.method));
+		header.append(llhttp_method_name(req.method));
 		header.append(" ", 1);
 		header.append(req.uri);
 		header.append(" HTTP/1.1\r\n");

data/src/agent/Shared/Fundamentals/Initialization.cpp

@@ -588,7 +588,7 @@ initializeAgent(int argc, char **argv[], const char *processName,
 			context->feedbackFdAvailable = true;
 			readConfigFromFd(FEEDBACK_FD, config);
 		} else if (optionParser != NULL) {
-			optionParser(argc, (const char **) *argv, config);
+			optionParser(argc, const_cast<const char **>(*argv), config);
 		} else {
 			readConfigFromJsonPassedToArgs(argc, argv, argStartIndex, config);
 		}

data/src/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp

@@ -59,6 +59,7 @@
 
 #include <LoggingKit/LoggingKit.h>
 #include <LoggingKit/Context.h>
+#include <MainFunctions.h>
 #include <ProcessManagement/Spawn.h>
 #include <FileTools/FileManip.h>
 #include <FileTools/PathManip.h>
@@ -108,8 +109,6 @@ readArgsJson(const string &workDir) {
 		P_CRITICAL("Cannot parse " << workDir << "/args.json: "
 			<< reader.getFormattedErrorMessages());
 		exit(1);
-		// Never reached
-		return Json::Value();
 	}
 }
 
@@ -686,7 +685,7 @@ setCurrentWorkingDirectory(const Context &context) {
 	setenv("PWD", appRoot.c_str(), 1);
 }
 
-string
+static string
 findRubyopt(const Json::Value &args) {
 	if (!args.isMember("environment_variables")) return "";
 	const Json::Value &envvars = args["environment_variables"];

data/src/agent/SystemMetrics/SystemMetricsMain.cpp

@@ -29,6 +29,7 @@
 #include <cstdio>
 #include <cstring>
 
+#include <MainFunctions.h>
 #include <SystemTools/SystemMetricsCollector.h>
 #include <Utils.h>
 #include <StrIntTools/StrIntUtils.h>

data/src/agent/TempDirToucher/TempDirToucherMain.cpp

@@ -40,7 +40,9 @@
 #include <limits.h>
 #include <errno.h>
 #include <string.h>
+
 #include <Constants.h>
+#include <MainFunctions.h>
 
 #define ERROR_PREFIX "*** TempDirToucher error"
 
@@ -336,10 +338,11 @@ maybeWritePidfile() {
 
 static int
 dirExists(const char *dir) {
-	up_privilege(); // raise priv. to stat file
 	struct stat buf;
-	return stat(dir, &buf) == 0 && S_ISDIR(buf.st_mode);
+	up_privilege(); // raise priv. to stat file
+	bool retVal = stat(dir, &buf) == 0 && S_ISDIR(buf.st_mode);
 	down_privilege(); // drop priv now that unneeded
+	return retVal;
 }
 
 static void
@@ -407,7 +410,6 @@ doSleep(int sec) {
 		fprintf(stderr, ERROR_PREFIX ": cannot select(): %s (errno %d)\n",
 			strerror(e), e);
 		exit(1);
-		return -1; /* Never reached */
 	} else {
 		return ret == 0;
 	}
@@ -461,7 +463,7 @@ performCleanup(const char *dir) {
 	}
 }
 
-void
+static void
 maybeWaitForNginxToExit() {
 	// If a PID was specified, wait for kill to tell us it's gone.
 	if (nginxPid == 0) {

data/src/agent/Watchdog/ApiServer.h

@@ -275,7 +275,7 @@ protected:
 	virtual void onRequestBegin(Client *client, Request *req) {
 		const StaticString path(req->path.start->data, req->path.size);
 
-		P_INFO("API request: " << http_method_str(req->method) <<
+		P_INFO("API request: " << llhttp_method_name(req->method) <<
 			" " << StaticString(req->path.start->data, req->path.size));
 
 		try {

data/src/agent/Watchdog/Config.h

@@ -154,7 +154,7 @@ using namespace std;
  *   security_update_checker_interval                                         unsigned integer   -          default(86400)
  *   security_update_checker_proxy_url                                        string             -          -
  *   security_update_checker_url                                              string             -          default("https://securitycheck.phusionpassenger.com/v1/check.json")
- *   server_software                                                          string             -          default("Phusion_Passenger/6.0.20")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.22")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only