passenger 6.0.26 → 6.1.0

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

@@ -118,7 +118,7 @@ parseControllerBenchmarkMode(const StaticString &mode) {
  *   old_routing                                         boolean            -          default(false),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.26")
+ *   server_software                                     string             -          default("Phusion_Passenger/6.1.0")
  *   show_version_in_header                              boolean            -          default(true)
  *   start_reading_after_accept                          boolean            -          default(true)
  *   stat_throttle_rate                                  unsigned integer   -          default(10)

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

@@ -23,6 +23,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#include <Constants.h>
 #include <Core/Controller.h>
 
 /*************************************************************************
@@ -123,6 +124,10 @@ Controller::reinitializeRequest(Client *client, Request *req) {
 	// bodyBuffer is initialized in Controller::beginBufferingBody().
 	// appSink and appSource are initialized in Controller::checkoutSession().
 
+
+	req->connectedWatcher.active = false;
+	req->connectedWatcherTimout.active = false;
+
 	req->startedAt = 0;
 	req->state = Request::ANALYZING_REQUEST;
 	req->dechunkResponse = false;
@@ -134,6 +139,7 @@ Controller::reinitializeRequest(Client *client, Request *req) {
 	req->appResponseInitialized = false;
 	req->strip100ContinueHeader = false;
 	req->hasPragmaHeader = false;
+	req->connectTimeout = DEFAULT_CONNECT_TIMEOUT;
 	req->host = NULL;
 	req->config = requestConfig;
 	req->bodyBytesBuffered = 0;
@@ -154,6 +160,13 @@ Controller::reinitializeRequest(Client *client, Request *req) {
 
 void
 Controller::deinitializeRequest(Client *client, Request *req) {
+	if (req->connectedWatcher.active) {
+		ev_io_stop(getLoop(), &req->connectedWatcher);
+	}
+	if (req->connectedWatcherTimout.active) {
+		ev_timer_stop(getLoop(), &req->connectedWatcherTimout);
+	}
+
 	req->session.reset();
 	req->config.reset();
 

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

@@ -465,6 +465,8 @@ Controller::onRequestBegin(Client *client, Request *req) {
 		req->startedAt = ev_now(getLoop());
 		req->bodyChannel.stop();
 
+		fillPoolOption(req, req->connectTimeout, "!~PASSENGER_APP_CONNECT_TIMEOUT");
+
 		initializeFlags(client, req, analysis);
 		if (respondFromTurboCache(client, req)) {
 			return;

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

@@ -167,6 +167,18 @@ Controller::endRequestAsBadGateway(Client **client, Request **req) {
 	}
 }
 
+void
+Controller::endRequestAsGatewayTimeout(Client **client, Request **req) {
+	if ((*req)->responseBegun) {
+		disconnectWithError(client, "gateway timeout");
+	} else {
+		ServerKit::HeaderTable headers = getHeadersWithContentType(*req);
+		headers.insert((*req)->pool, "cache-control", "no-cache, no-store, must-revalidate");
+		writeSimpleResponse(*client, 504, &headers, getFormattedMessage(*req, "Gateway Timeout"));
+		endRequest(client, req);
+	}
+}
+
 void
 Controller::writeBenchmarkResponse(Client **client, Request **req, bool end) {
 	if (canKeepAlive(*req)) {

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

@@ -27,8 +27,6 @@
 #define _PASSENGER_REQUEST_HANDLER_REQUEST_H_
 
 #include <ev++.h>
-#include <string>
-#include <cstring>
 
 #include <ServerKit/HttpRequest.h>
 #include <ServerKit/FdSinkChannel.h>
@@ -78,11 +76,14 @@ public:
 	bool appResponseInitialized: 1;
 	bool strip100ContinueHeader: 1;
 	bool hasPragmaHeader: 1;
+	unsigned int connectTimeout;
 
 	Options options;
 	AbstractSessionPtr session;
 	const LString *host;
 	ControllerRequestConfigPtr config;
+	ev_io connectedWatcher;
+	ev_timer connectedWatcherTimout;
 
 	ServerKit::FdSinkChannel appSink;
 	ServerKit::FdSourceChannel appSource;

data/src/agent/Core/Controller.h

@@ -44,22 +44,14 @@
 #include <boost/cstdint.hpp>
 #include <oxt/macros.hpp>
 #include <ev++.h>
-#include <ostream>
-
-#if defined(__GLIBCXX__) || defined(__APPLE__)
-	#include <cxxabi.h>
-	#define CXX_ABI_API_AVAILABLE
-#endif
 
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <utility>
-#include <typeinfo>
+#include <exception>
 #include <cstdio>
 #include <cstdlib>
 #include <cstddef>
-#include <cassert>
-#include <cctype>
 
 #include <LoggingKit/LoggingKit.h>
 #include <IOTools/MessageSerialization.h>
@@ -109,10 +101,6 @@ private:
 	typedef ServerKit::FileBufferedChannel FileBufferedChannel;
 	typedef ServerKit::FileBufferedFdSinkChannel FileBufferedFdSinkChannel;
 
-	// If you change this value, make sure that Request::sessionCheckoutTry
-	// has enough bits.
-	static const unsigned int MAX_SESSION_CHECKOUT_TRY = 10;
-
 	ControllerMainConfig mainConfig;
 	ControllerRequestConfigPtr requestConfig;
 	StringKeyTable< boost::shared_ptr<Options> > poolOptionsCache;
@@ -204,9 +192,13 @@ private:
 		const AbstractSessionPtr &session, const ExceptionPtr &e);
 	void maybeSend100Continue(Client *client, Request *req);
 	void initiateSession(Client *client, Request *req);
+	void finishInitiatingSession(Client *client, Request *req);
+	static void onSessionSocketConnected(EV_P_ ev_io *io, int revents);
+	static void onSessionSocketConnectTimeout(EV_P_ ev_timer *io, int flag);
 	static void checkoutSessionLater(Request *req);
 	void reportSessionCheckoutError(Client *client, Request *req,
 		const ExceptionPtr &e);
+	void handleSessionInitiationError(Client *client, Request *req, const std::exception &e);
 	int lookupCodeFromHeader(Request *req, const char* header, int statusCode);
 	void writeRequestQueueFullExceptionErrorResponse(Client *client,
 		Request *req, const boost::shared_ptr<RequestQueueFullException> &e);
@@ -320,6 +312,7 @@ private:
 	void endRequestWithSimpleResponse(Client **c, Request **r,
 		const StaticString &body, int code = 200);
 	void endRequestAsBadGateway(Client **client, Request **req);
+	void endRequestAsGatewayTimeout(Client **client, Request **req);
 	void writeBenchmarkResponse(Client **client, Request **req,
 		bool end = true);
 	bool getBoolOption(Request *req, const HashedStaticString &name,
@@ -364,9 +357,15 @@ protected:
 
 	virtual void asyncGetFromApplicationPool(Request *req,
 		ApplicationPool2::GetCallback callback);
+	virtual int getSessionSocketConnectIoWatchConditions() const;
+	virtual double getSessionSocketEffectiveConnectTimeout(Request *req) const;
 
 
 public:
+	// If you change this value, make sure that Request::sessionCheckoutTry
+	// has enough bits.
+	static constexpr unsigned int MAX_SESSION_CHECKOUT_TRY = 10;
+
 	typedef ControllerConfigChangeRequest ConfigChangeRequest;
 
 	// Dependencies

data/src/agent/Core/CoreMain.cpp

@@ -45,21 +45,17 @@
 #include <sys/un.h>
 #include <sys/resource.h>
 #include <cstring>
-#include <cassert>
 #include <cerrno>
 #include <stdlib.h>
 #include <unistd.h>
-#include <limits.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <grp.h>
 
-#include <set>
 #include <vector>
 #include <string>
 #include <algorithm>
 #include <iostream>
-#include <sstream>
 #include <stdexcept>
 
 #include <curl/curl.h>
@@ -92,6 +88,7 @@
 #include <Utils.h>
 #include <Utils/Timer.h>
 #include <IOTools/MessageIO.h>
+#include <IOTools/IOUtils.h>
 #include <Core/OptionParser.h>
 #include <Core/Controller.h>
 #include <Core/ApiServer.h>
@@ -100,7 +97,6 @@
 #include <Core/ApplicationPool/Pool.h>
 #include <Core/SecurityUpdateChecker.h>
 #include <Core/TelemetryCollector.h>
-#include <Core/AdminPanelConnector.h>
 
 using namespace boost;
 using namespace oxt;
@@ -167,8 +163,6 @@ namespace Core {
 
 		SecurityUpdateChecker *securityUpdateChecker;
 		TelemetryCollector *telemetryCollector;
-		AdminPanelConnector *adminPanelConnector;
-		oxt::thread *adminPanelConnectorThread;
 
 		WorkingObjects()
 			: exitEvent(__FILE__, __LINE__, "WorkingObjects: exitEvent"),
@@ -177,9 +171,7 @@ namespace Core {
 			  shutdownCounter(0),
 			  prestarterThread(NULL),
 			  securityUpdateChecker(NULL),
-			  telemetryCollector(NULL),
-			  adminPanelConnector(NULL),
-			  adminPanelConnectorThread(NULL)
+			  telemetryCollector(NULL)
 			  /*******************/
 		{
 			for (unsigned int i = 0; i < SERVER_KIT_MAX_SERVER_ENDPOINTS; i++) {
@@ -190,8 +182,6 @@ namespace Core {
 
 		~WorkingObjects() {
 			delete prestarterThread;
-			delete adminPanelConnectorThread;
-			delete adminPanelConnector;
 			delete securityUpdateChecker;
 			delete telemetryCollector;
 
@@ -898,46 +888,6 @@ initializeTelemetryCollector() {
 	wo.shutdownCounter.fetch_add(1, boost::memory_order_relaxed);
 }
 
-static void
-runAdminPanelConnector(AdminPanelConnector *connector) {
-	connector->run();
-	P_DEBUG("Admin panel connector shutdown finished");
-	serverShutdownFinished();
-}
-
-static void
-initializeAdminPanelConnector() {
-	TRACE_POINT();
-	WorkingObjects &wo = *workingObjects;
-
-	if (coreConfig->get("admin_panel_url").empty()) {
-		return;
-	}
-
-	Json::Value config = coreConfig->inspectEffectiveValues();
-	config["log_prefix"] = "AdminPanelConnector: ";
-	config["ruby"] = config["default_ruby"];
-
-	P_NOTICE("Initialize connection with " << PROGRAM_NAME " admin panel at "
-		<< config["admin_panel_url"].asString());
-	AdminPanelConnector *connector = new Core::AdminPanelConnector(
-		coreSchema->adminPanelConnector.schema, config,
-		coreSchema->adminPanelConnector.translator);
-	connector->resourceLocator = Agent::Fundamentals::context->resourceLocator;
-	connector->appPool = wo.appPool;
-	connector->configGetter = inspectConfig;
-	for (unsigned int i = 0; i < wo.threadWorkingObjects.size(); i++) {
-		ThreadWorkingObjects *two = &wo.threadWorkingObjects[i];
-		connector->controllers.push_back(two->controller);
-	}
-	connector->initialize();
-	wo.shutdownCounter.fetch_add(1, boost::memory_order_relaxed);
-	wo.adminPanelConnector = connector;
-	wo.adminPanelConnectorThread = new oxt::thread(
-		boost::bind(runAdminPanelConnector, connector),
-		"Admin panel connector main loop", 128 * 1024);
-}
-
 static void
 prestartWebApps() {
 	TRACE_POINT();
@@ -1256,9 +1206,6 @@ waitForExitEvent() {
 		if (wo->telemetryCollector != NULL) {
 			asyncShutdownTelemetryCollector();
 		}
-		if (wo->adminPanelConnector != NULL) {
-			wo->adminPanelConnector->asyncShutdown();
-		}
 
 		UPDATE_TRACE_POINT();
 		FD_ZERO(&fds);
@@ -1348,7 +1295,6 @@ runCore() {
 		initializeNonPrivilegedWorkingObjects();
 		initializeSecurityUpdateChecker();
 		initializeTelemetryCollector();
-		initializeAdminPanelConnector();
 		prestartWebApps();
 
 		UPDATE_TRACE_POINT();

data/src/agent/Core/OptionParser.h

@@ -35,7 +35,7 @@
 #include <Utils.h>
 #include <Utils/OptionParsing.h>
 #include <StrIntTools/StrIntUtils.h>
-
+#include <IOTools/IOUtils.h>
 #include <jsoncpp/json.h>
 
 namespace Passenger {
@@ -214,9 +214,6 @@ coreUsage() {
 	printf("      --cpu-affine          Enable per-thread CPU affinity (Linux only)\n");
 	printf("      --core-file-descriptor-ulimit NUMBER\n");
 	printf("                            Set custom file descriptor ulimit for the core\n");
-	printf("      --admin-panel-url URL\n");
-	printf("                            Connect to an admin panel through this service\n");
-	printf("                            connector URL\n");
 	printf("      --ctl NAME=VALUE      Set low-level config option directly\n");
 	printf("  -h, --help                Show this help\n");
 	printf("\n");
@@ -425,9 +422,6 @@ parseCoreOption(int argc, const char *argv[], int &i, Json::Value &updates) {
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--core-file-descriptor-ulimit")) {
 		updates["file_descriptor_ulimit"] = atoi(argv[i + 1]);
 		i += 2;
-	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--admin-panel-url")) {
-		updates["admin_panel_url"] = argv[i + 1];
-		i += 2;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--ctl")) {
 		const char *sep = strchr(argv[i + 1], '=');
 		if (sep == NULL) {

data/src/agent/Core/SecurityUpdateChecker.h

@@ -27,13 +27,13 @@
 #define _PASSENGER_SECURITY_UPDATE_CHECKER_H_
 
 #include <string>
-#include <cassert>
 #include <boost/config.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <oxt/thread.hpp>
 #include <oxt/backtrace.hpp>
 
 #include <SecurityKit/Crypto.h>
+#include <ServerKit/llversion.h>
 #include <ResourceLocator.h>
 #include <Exceptions.h>
 #include <StaticString.h>
@@ -569,7 +569,15 @@ public:
 		bodyJson["passenger_version"] = PASSENGER_VERSION;
 
 		bodyJson["server_integration"] = sessionState.config["server_identifier"];
-		bodyJson["server_version"] = sessionState.config["web_server_version"];
+
+		if (bodyJson["server_integration"].asString() == "standalone" &&
+			sessionState.config["web_server_version"].isNull()) {
+			P_INFO("Config web server version was Null while using standalone integration, assuming builtin engine.");
+			bodyJson["server_version"] = llhttp_version();
+		}else {
+			bodyJson["server_version"] = sessionState.config["web_server_version"];
+		}
+
 		bodyJson["curl_static"] = isCurlStaticallyLinked();
 
 		string nonce;

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

@@ -28,7 +28,6 @@
 
 #include <oxt/tracable_exception.hpp>
 #include <string>
-#include <stdexcept>
 #include <limits>
 
 #include <Constants.h>

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

@@ -34,7 +34,7 @@
 #include <oxt/backtrace.hpp>
 #include <string>
 #include <vector>
-#include <stdexcept>
+#include <exception>
 #include <cstddef>
 #include <cstdlib>
 #include <cerrno>
@@ -50,6 +50,7 @@
 #include <FileDescriptor.h>
 #include <FileTools/FileManip.h>
 #include <FileTools/PathManip.h>
+#include <IOTools/IOUtils.h>
 #include <Utils.h>
 #include <Utils/ScopeGuard.h>
 #include <SystemTools/SystemTime.h>
@@ -196,8 +197,18 @@ private:
 
 		while (true) {
 			unsigned long long timeout = 100000;
+			bool pingable;
 
-			if (pingTcpServer("127.0.0.1", session.expectedStartPort, &timeout)) {
+			try {
+				pingable = pingTcpServer("127.0.0.1", session.expectedStartPort, &timeout);
+			} catch (const std::exception &e) {
+				P_WARN("Error checking whether 127.0.0.1:" << session.expectedStartPort
+					<< " is connectable: " << e.what());
+				syscalls::usleep(50000);
+				continue;
+			}
+
+			if (pingable) {
 				boost::lock_guard<boost::mutex> l(syncher);
 				socketIsNowPingable = true;
 				finishState = FINISH_SUCCESS;

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

@@ -550,10 +550,10 @@ dumpFileDescriptorInfo(AbortHandlerWorkingState &state) {
 }
 
 static void
-dumpWithCrashWatch(AbortHandlerWorkingState &state) {
+dumpWithCrashWatch(AbortHandlerWorkingState &state, bool toStderr) {
 	int fd = -1;
 
-	if (state.crashLogDirFd != -1) {
+	if (state.crashLogDirFd != -1 && !toStderr) {
 		fd = openat(state.crashLogDirFd, "backtrace.log", O_WRONLY | O_CREAT | O_TRUNC, 0600);
 		if (fd != -1) {
 			printCrashLogFileCreated(state, "backtrace.log");
@@ -594,7 +594,25 @@ dumpWithCrashWatch(AbortHandlerWorkingState &state) {
 		write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
 
 	} else {
-		waitpid(child, NULL, 0);
+		int status = -1;
+		int ret = waitpid(child, &status, 0);
+		int e = errno;
+		if (ret == -1 || status != 0) {
+			pos = state.messageBuf;
+			pos = ASSU::appendData(pos, end, "ERROR running 'crash-watch' (");
+			if (ret == -1) {
+				pos = ASSU::appendData(pos, end, "waitpid() failed, errno=");
+				pos = ASSU::appendInteger<int, 10>(pos, end, e);
+			} else if (WIFSIGNALED(status)) {
+				pos = ASSU::appendData(pos, end, "exited with signal ");
+				pos = ASSU::appendInteger<int, 10>(pos, end, WTERMSIG(status));
+			} else {
+				pos = ASSU::appendData(pos, end, "exit status ");
+				pos = ASSU::appendInteger<int, 10>(pos, end, WEXITSTATUS(status));
+			}
+			pos = ASSU::appendData(pos, end, ")\n");
+			write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
+		}
 	}
 
 	if (fd != -1) {
@@ -852,7 +870,7 @@ dumpDiagnostics(AbortHandlerWorkingState &state) {
 			pos = ASSU::appendData(pos, end, " ] Dumping a backtrace with crash-watch...\n");
 		#endif
 		write_nowarn(STDERR_FILENO, state.messageBuf, pos - state.messageBuf);
-		dumpWithCrashWatch(state);
+		dumpWithCrashWatch(state, ctx->config->dumpCrashWatchToStderr);
 	} else {
 		write_nowarn(STDERR_FILENO, "\n", 1);
 	}
@@ -969,7 +987,7 @@ forkAndRedirectToTeeAndMainLogFile(const char *crashLogDir) {
 		execlp("/usr/bin/cat", "cat", (char *) 0);
 		ASSU::printError("ERROR: cannot execute 'tee' or 'cat'; crash log will be lost!\n");
 		_exit(1);
-		return false;
+		return false; // Unreachable
 	} else if (pid == -1) {
 		ASSU::printError("ERROR: cannot fork a process for executing 'tee'\n");
 		return false;

data/src/agent/Shared/Fundamentals/AbortHandler.h

@@ -26,8 +26,6 @@
 #ifndef _PASSENGER_AGENT_FUNDAMENTALS_ABORT_HANDLER_H_
 #define _PASSENGER_AGENT_FUNDAMENTALS_ABORT_HANDLER_H_
 
-#include <cstddef>
-
 namespace Passenger {
 	class ResourceLocator;
 }
@@ -38,7 +36,7 @@ namespace Fundamentals {
 
 
 struct AbortHandlerConfig {
-	static const unsigned int MAX_DIAGNOSTICS_DUMPERS = 5;
+	static constexpr unsigned int MAX_DIAGNOSTICS_DUMPERS = 5;
 	typedef void (*DiagnosticsDumperFunc)(void *userData);
 
 	struct DiagnosticsDumper {
@@ -56,26 +54,16 @@ struct AbortHandlerConfig {
 	};
 
 
-	char *ruby;
-	char **origArgv;
-	unsigned int randomSeed;
-	bool dumpWithCrashWatch;
-	bool beep;
-	bool stopProcess;
-	bool forceTerminateProcess;
-	ResourceLocator *resourceLocator;
+	char *ruby = nullptr;
+	char **origArgv = nullptr;
+	unsigned int randomSeed = 0;
+	bool dumpWithCrashWatch = false;
+	bool dumpCrashWatchToStderr = false;
+	bool beep = false;
+	bool stopProcess = false;
+	bool forceTerminateProcess = false;
+	ResourceLocator *resourceLocator = nullptr;
 	DiagnosticsDumper diagnosticsDumpers[MAX_DIAGNOSTICS_DUMPERS];
-
-	AbortHandlerConfig()
-		: ruby(NULL),
-		  origArgv(NULL),
-		  randomSeed(0),
-		  dumpWithCrashWatch(false),
-		  beep(false),
-		  stopProcess(false),
-		  forceTerminateProcess(false),
-		  resourceLocator(NULL)
-		{ }
 };
 
 void installAbortHandler(const AbortHandlerConfig *config);

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

@@ -465,6 +465,7 @@ maybeInitializeAbortHandler() {
 	config->origArgv = context->origArgv;
 	config->randomSeed = context->randomSeed;
 	config->dumpWithCrashWatch = getEnvBool("PASSENGER_DUMP_WITH_CRASH_WATCH", true);
+	config->dumpCrashWatchToStderr = getEnvBool("PASSENGER_DUMP_CRASH_WATCH_TO_STDERR", false);
 	config->beep = getEnvBool("PASSENGER_BEEP_ON_ABORT");
 	config->stopProcess = getEnvBool("PASSENGER_STOP_ON_ABORT");
 	config->forceTerminateProcess = getEnvBool("PASSENGER_FORCE_TERMINATE_ON_ABORT");

data/src/agent/Watchdog/Config.h

@@ -46,23 +46,6 @@ using namespace std;
  * (do not edit: following text is automatically generated
  * by 'rake configkit_schemas_inline_comments')
  *
- *   admin_panel_auth_type                                                    string             -          default("basic")
- *   admin_panel_close_timeout                                                float              -          default(10.0)
- *   admin_panel_connect_timeout                                              float              -          default(30.0)
- *   admin_panel_data_debug                                                   boolean            -          default(false)
- *   admin_panel_password                                                     string             -          secret
- *   admin_panel_password_file                                                string             -          -
- *   admin_panel_ping_interval                                                float              -          default(30.0)
- *   admin_panel_ping_timeout                                                 float              -          default(30.0)
- *   admin_panel_proxy_password                                               string             -          secret
- *   admin_panel_proxy_timeout                                                float              -          default(30.0)
- *   admin_panel_proxy_url                                                    string             -          -
- *   admin_panel_proxy_username                                               string             -          -
- *   admin_panel_reconnect_timeout                                            float              -          default(5.0)
- *   admin_panel_url                                                          string             -          read_only
- *   admin_panel_username                                                     string             -          -
- *   admin_panel_websocketpp_debug_access                                     boolean            -          default(false)
- *   admin_panel_websocketpp_debug_error                                      boolean            -          default(false)
  *   app_output_log_level                                                     string             -          default("notice")
  *   benchmark_mode                                                           string             -          -
  *   config_manifest                                                          object             -          read_only
@@ -138,7 +121,7 @@ using namespace std;
  *   hook_queue_full_error                                                    string             -          read_only
  *   hook_spawn_failed                                                        string             -          read_only
  *   instance_registry_dir                                                    string             -          default,read_only
- *   integration_mode                                                         string             -          default("standalone")
+ *   integration_mode                                                         string             -          default("standalone"),read_only
  *   log_level                                                                string             -          default("notice")
  *   log_target                                                               any                -          default({"stderr": true})
  *   max_instances_per_app                                                    unsigned integer   -          read_only
@@ -156,7 +139,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.26")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.1.0")
  *   setsid                                                                   boolean            -          default(false)
  *   show_version_in_header                                                   boolean            -          default(true)
  *   single_app_mode_app_root                                                 string             -          default,read_only
@@ -164,7 +147,6 @@ using namespace std;
  *   single_app_mode_app_type                                                 string             -          read_only
  *   single_app_mode_startup_file                                             string             -          read_only
  *   spawn_dir                                                                string             -          default,read_only
- *   standalone_engine                                                        string             -          default
  *   startup_report_file                                                      string             -          -
  *   stat_throttle_rate                                                       unsigned integer   -          default(10)
  *   telemetry_collector_ca_certificate_path                                  string             -          -
@@ -198,7 +180,6 @@ using namespace std;
  *   watchdog_api_server_start_reading_after_accept                           boolean            -          default(true)
  *   watchdog_pid_file                                                        string             -          read_only
  *   watchdog_pid_file_autodelete                                             boolean            -          default(true)
- *   web_server_module_version                                                string             -          read_only
  *   web_server_version                                                       string             -          read_only
  *
  * END

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -34,7 +34,6 @@
 #include <boost/foreach.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <string>
-#include <utility>
 #include <vector>
 #include <algorithm>
 
@@ -89,7 +88,6 @@
 #include <Utils/ScopeGuard.h>
 #include <StrIntTools/StrIntUtils.h>
 #include <Utils/OptionParsing.h>
-#include <Utils/VariantMap.h>
 
 using namespace std;
 using namespace boost;

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp

@@ -47,26 +47,6 @@ namespace Passenger {
 namespace Apache2Module {
 
 extern "C" const command_rec passenger_commands[] = {
-	AP_INIT_TAKE1("PassengerAdminPanelAuthType",
-		(Take1Func) cmd_passenger_admin_panel_auth_type,
-		NULL,
-		RSRC_CONF,
-		"The authentication type to use when connecting to the admin panel"),
-	AP_INIT_TAKE1("PassengerAdminPanelPassword",
-		(Take1Func) cmd_passenger_admin_panel_password,
-		NULL,
-		RSRC_CONF,
-		"The password to use when connecting to the admin panel using basic authentication"),
-	AP_INIT_TAKE1("PassengerAdminPanelUrl",
-		(Take1Func) cmd_passenger_admin_panel_url,
-		NULL,
-		RSRC_CONF,
-		"Connect to an admin panel at the given connector URL"),
-	AP_INIT_TAKE1("PassengerAdminPanelUsername",
-		(Take1Func) cmd_passenger_admin_panel_username,
-		NULL,
-		RSRC_CONF,
-		"The username to use when connecting to the admin panel using basic authentication"),
 	AP_INIT_FLAG("PassengerAllowEncodedSlashes",
 		(FlagFunc) cmd_passenger_allow_encoded_slashes,
 		NULL,
@@ -87,6 +67,11 @@ extern "C" const command_rec passenger_commands[] = {
 		NULL,
 		RSRC_CONF,
 		"Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection."),
+	AP_INIT_TAKE1("PassengerAppConnectTimeout",
+		(Take1Func) cmd_passenger_app_connect_timeout,
+		NULL,
+		RSRC_CONF | ACCESS_CONF,
+		"A timeout for application to accept socket connections."),
 	AP_INIT_TAKE1("PassengerAppEnv",
 		(Take1Func) cmd_passenger_app_env,
 		NULL,

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -159,6 +159,11 @@ void
 ConfigManifestGenerator::autoGenerated_setAppConfigDefaults() {
 	Json::Value &defaultAppConfigContainer = manifest["default_application_configuration"];
 
+	addOptionsContainerStaticDefaultInt(
+		defaultAppConfigContainer,
+		"PassengerAppConnectTimeout",
+		DEFAULT_CONNECT_TIMEOUT);
+
 	addOptionsContainerStaticDefaultStr(
 		defaultAppConfigContainer,
 		"PassengerAppEnv",