passenger 6.0.25 → 6.0.27

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>
@@ -100,7 +96,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 +162,6 @@ namespace Core {
 
 		SecurityUpdateChecker *securityUpdateChecker;
 		TelemetryCollector *telemetryCollector;
-		AdminPanelConnector *adminPanelConnector;
-		oxt::thread *adminPanelConnectorThread;
 
 		WorkingObjects()
 			: exitEvent(__FILE__, __LINE__, "WorkingObjects: exitEvent"),
@@ -177,9 +170,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 +181,6 @@ namespace Core {
 
 		~WorkingObjects() {
 			delete prestarterThread;
-			delete adminPanelConnectorThread;
-			delete adminPanelConnector;
 			delete securityUpdateChecker;
 			delete telemetryCollector;
 
@@ -898,46 +887,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 +1205,6 @@ waitForExitEvent() {
 		if (wo->telemetryCollector != NULL) {
 			asyncShutdownTelemetryCollector();
 		}
-		if (wo->adminPanelConnector != NULL) {
-			wo->adminPanelConnector->asyncShutdown();
-		}
 
 		UPDATE_TRACE_POINT();
 		FD_ZERO(&fds);
@@ -1348,7 +1294,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,7 +27,6 @@
 #define _PASSENGER_SECURITY_UPDATE_CHECKER_H_
 
 #include <string>
-#include <cassert>
 #include <boost/config.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <oxt/thread.hpp>

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.25")
+ *   server_software                                                          string             -          default("Phusion_Passenger/6.0.27")
  *   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,

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp

@@ -56,66 +56,6 @@ namespace Apache2Module {
  *   rake src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp
  */
 
-static const char *
-cmd_passenger_admin_panel_auth_type(cmd_parms *cmd, void *pcfg, const char *arg) {
-	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-	if (err != NULL) {
-		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
-			"WARNING: %s", err);
-	}
-
-	serverConfig.adminPanelAuthTypeSourceFile = cmd->directive->filename;
-	serverConfig.adminPanelAuthTypeSourceLine = cmd->directive->line_num;
-	serverConfig.adminPanelAuthTypeExplicitlySet = true;
-	serverConfig.adminPanelAuthType = arg;
-	return NULL;
-}
-
-static const char *
-cmd_passenger_admin_panel_password(cmd_parms *cmd, void *pcfg, const char *arg) {
-	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-	if (err != NULL) {
-		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
-			"WARNING: %s", err);
-	}
-
-	serverConfig.adminPanelPasswordSourceFile = cmd->directive->filename;
-	serverConfig.adminPanelPasswordSourceLine = cmd->directive->line_num;
-	serverConfig.adminPanelPasswordExplicitlySet = true;
-	serverConfig.adminPanelPassword = arg;
-	return NULL;
-}
-
-static const char *
-cmd_passenger_admin_panel_url(cmd_parms *cmd, void *pcfg, const char *arg) {
-	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-	if (err != NULL) {
-		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
-			"WARNING: %s", err);
-	}
-
-	serverConfig.adminPanelUrlSourceFile = cmd->directive->filename;
-	serverConfig.adminPanelUrlSourceLine = cmd->directive->line_num;
-	serverConfig.adminPanelUrlExplicitlySet = true;
-	serverConfig.adminPanelUrl = arg;
-	return NULL;
-}
-
-static const char *
-cmd_passenger_admin_panel_username(cmd_parms *cmd, void *pcfg, const char *arg) {
-	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-	if (err != NULL) {
-		ap_log_perror(APLOG_MARK, APLOG_STARTUP, 0, cmd->temp_pool,
-			"WARNING: %s", err);
-	}
-
-	serverConfig.adminPanelUsernameSourceFile = cmd->directive->filename;
-	serverConfig.adminPanelUsernameSourceLine = cmd->directive->line_num;
-	serverConfig.adminPanelUsernameExplicitlySet = true;
-	serverConfig.adminPanelUsername = arg;
-	return NULL;
-}
-
 static const char *
 cmd_passenger_allow_encoded_slashes(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;

data/src/apache2_module/Hooks.cpp

@@ -1382,10 +1382,6 @@ public:
 		config["turbocaching"] = serverConfig.turbocaching;
 		config["old_routing"] = serverConfig.oldRouting;
 		config["prestart_urls"] = strsetToJson(serverConfig.prestartURLs);
-		config["admin_panel_url"] = nonEmptyString(serverConfig.adminPanelUrl);
-		config["admin_panel_auth_type"] = nonEmptyString(serverConfig.adminPanelAuthType);
-		config["admin_panel_username"] = nonEmptyString(serverConfig.adminPanelUsername);
-		config["admin_panel_password"] = nonEmptyString(serverConfig.adminPanelPassword);
 		config["disable_log_prefix"] = serverConfig.disableLogPrefix;
 
 		if (!serverConfig.logFile.empty()) {

data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp

@@ -47,50 +47,6 @@ void
 ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 	Json::Value &globalOptionsContainer = manifest["global_configuration"];
 
-	if (serverConfig.adminPanelAuthTypeExplicitlySet) {
-		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
-			"PassengerAdminPanelAuthType",
-			sizeof("PassengerAdminPanelAuthType") - 1);
-		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
-			serverConfig.adminPanelAuthTypeSourceFile,
-			serverConfig.adminPanelAuthTypeSourceLine);
-		hierarchyMember["value"] = Json::Value(
-			serverConfig.adminPanelAuthType.data(),
-			serverConfig.adminPanelAuthType.data() + serverConfig.adminPanelAuthType.size());
-	}
-	if (serverConfig.adminPanelPasswordExplicitlySet) {
-		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
-			"PassengerAdminPanelPassword",
-			sizeof("PassengerAdminPanelPassword") - 1);
-		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
-			serverConfig.adminPanelPasswordSourceFile,
-			serverConfig.adminPanelPasswordSourceLine);
-		hierarchyMember["value"] = Json::Value(
-			serverConfig.adminPanelPassword.data(),
-			serverConfig.adminPanelPassword.data() + serverConfig.adminPanelPassword.size());
-	}
-	if (serverConfig.adminPanelUrlExplicitlySet) {
-		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
-			"PassengerAdminPanelUrl",
-			sizeof("PassengerAdminPanelUrl") - 1);
-		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
-			serverConfig.adminPanelUrlSourceFile,
-			serverConfig.adminPanelUrlSourceLine);
-		hierarchyMember["value"] = Json::Value(
-			serverConfig.adminPanelUrl.data(),
-			serverConfig.adminPanelUrl.data() + serverConfig.adminPanelUrl.size());
-	}
-	if (serverConfig.adminPanelUsernameExplicitlySet) {
-		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
-			"PassengerAdminPanelUsername",
-			sizeof("PassengerAdminPanelUsername") - 1);
-		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
-			serverConfig.adminPanelUsernameSourceFile,
-			serverConfig.adminPanelUsernameSourceLine);
-		hierarchyMember["value"] = Json::Value(
-			serverConfig.adminPanelUsername.data(),
-			serverConfig.adminPanelUsername.data() + serverConfig.adminPanelUsername.size());
-	}
 	if (serverConfig.anonymousTelemetryProxyExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerAnonymousTelemetryProxy",

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -128,26 +128,6 @@ struct AutoGeneratedServerConfig {
 	 */
 	int statThrottleRate;
 
-	/*
-	 * The authentication type to use when connecting to the admin panel
-	 */
-	StaticString adminPanelAuthType;
-
-	/*
-	 * The password to use when connecting to the admin panel using basic authentication
-	 */
-	StaticString adminPanelPassword;
-
-	/*
-	 * Connect to an admin panel at the given connector URL
-	 */
-	StaticString adminPanelUrl;
-
-	/*
-	 * The username to use when connecting to the admin panel using basic authentication
-	 */
-	StaticString adminPanelUsername;
-
 	/*
 	 * Use specified HTTP/SOCKS proxy for Phusion Passenger(R) anonymous telemetry collection.
 	 */
@@ -228,10 +208,6 @@ struct AutoGeneratedServerConfig {
 	StaticString responseBufferHighWatermarkSourceFile;
 	StaticString socketBacklogSourceFile;
 	StaticString statThrottleRateSourceFile;
-	StaticString adminPanelAuthTypeSourceFile;
-	StaticString adminPanelPasswordSourceFile;
-	StaticString adminPanelUrlSourceFile;
-	StaticString adminPanelUsernameSourceFile;
 	StaticString anonymousTelemetryProxySourceFile;
 	StaticString dataBufferDirSourceFile;
 	StaticString defaultGroupSourceFile;
@@ -260,10 +236,6 @@ struct AutoGeneratedServerConfig {
 	unsigned int responseBufferHighWatermarkSourceLine;
 	unsigned int socketBacklogSourceLine;
 	unsigned int statThrottleRateSourceLine;
-	unsigned int adminPanelAuthTypeSourceLine;
-	unsigned int adminPanelPasswordSourceLine;
-	unsigned int adminPanelUrlSourceLine;
-	unsigned int adminPanelUsernameSourceLine;
 	unsigned int anonymousTelemetryProxySourceLine;
 	unsigned int dataBufferDirSourceLine;
 	unsigned int defaultGroupSourceLine;
@@ -292,10 +264,6 @@ struct AutoGeneratedServerConfig {
 	bool responseBufferHighWatermarkExplicitlySet: 1;
 	bool socketBacklogExplicitlySet: 1;
 	bool statThrottleRateExplicitlySet: 1;
-	bool adminPanelAuthTypeExplicitlySet: 1;
-	bool adminPanelPasswordExplicitlySet: 1;
-	bool adminPanelUrlExplicitlySet: 1;
-	bool adminPanelUsernameExplicitlySet: 1;
 	bool anonymousTelemetryProxyExplicitlySet: 1;
 	bool dataBufferDirExplicitlySet: 1;
 	bool defaultGroupExplicitlySet: 1;
@@ -326,18 +294,6 @@ struct AutoGeneratedServerConfig {
 		responseBufferHighWatermark = DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK;
 		socketBacklog = DEFAULT_SOCKET_BACKLOG;
 		statThrottleRate = DEFAULT_STAT_THROTTLE_RATE;
-		/*
-		 * adminPanelAuthType: default initialized
-		 */
-		/*
-		 * adminPanelPassword: default initialized
-		 */
-		/*
-		 * adminPanelUrl: default initialized
-		 */
-		/*
-		 * adminPanelUsername: default initialized
-		 */
 		/*
 		 * anonymousTelemetryProxy: default initialized
 		 */
@@ -388,10 +344,6 @@ struct AutoGeneratedServerConfig {
 		responseBufferHighWatermarkSourceLine = 0;
 		socketBacklogSourceLine = 0;
 		statThrottleRateSourceLine = 0;
-		adminPanelAuthTypeSourceLine = 0;
-		adminPanelPasswordSourceLine = 0;
-		adminPanelUrlSourceLine = 0;
-		adminPanelUsernameSourceLine = 0;
 		anonymousTelemetryProxySourceLine = 0;
 		dataBufferDirSourceLine = 0;
 		defaultGroupSourceLine = 0;
@@ -420,10 +372,6 @@ struct AutoGeneratedServerConfig {
 		responseBufferHighWatermarkExplicitlySet = false;
 		socketBacklogExplicitlySet = false;
 		statThrottleRateExplicitlySet = false;
-		adminPanelAuthTypeExplicitlySet = false;
-		adminPanelPasswordExplicitlySet = false;
-		adminPanelUrlExplicitlySet = false;
-		adminPanelUsernameExplicitlySet = false;
 		anonymousTelemetryProxyExplicitlySet = false;
 		dataBufferDirExplicitlySet = false;
 		defaultGroupExplicitlySet = false;

data/src/cxx_supportlib/Algorithms/Hasher.cpp

@@ -42,7 +42,7 @@ JenkinsHash::update(const char *data, unsigned int size) {
 	}
 }
 
-boost::uint32_t
+std::uint32_t
 JenkinsHash::finalize() {
 	hash += (hash << 3);
 	hash ^= (hash >> 11);