passenger 5.3.4 → 6.0.1

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,6 +23,14 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_
+#define _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include "../ConfigGeneral/Common.h"
+#endif
 
 /*
  * DirConfig/AutoGeneratedStruct.h is automatically generated from DirConfig/AutoGeneratedStruct.h.cxxcodebuilder,
@@ -37,6 +45,15 @@
  *   rake src/apache2_module/DirConfig/AutoGeneratedStruct.h
  */
 
+namespace Passenger {
+namespace Apache2Module {
+
+/*
+ * Per-directory configuration information (autogenerated part).
+ *
+ * Use the getter methods to query information, because those will return
+ * the default value if the value is not specified.
+ */
 struct AutoGeneratedDirConfig {
 
 	/*
@@ -139,6 +156,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	StaticString mAppRoot;
 
+	/*
+	 * Command string for starting the application.
+	 */
+	StaticString mAppStartCommand;
+
 	/*
 	 * Force specific application type.
 	 */
@@ -225,6 +247,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mAppGroupNameSourceFile;
 	StaticString mAppLogFileSourceFile;
 	StaticString mAppRootSourceFile;
+	StaticString mAppStartCommandSourceFile;
 	StaticString mAppTypeSourceFile;
 	StaticString mGroupSourceFile;
 	StaticString mMeteorAppSettingsSourceFile;
@@ -259,6 +282,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mAppGroupNameSourceLine;
 	unsigned int mAppLogFileSourceLine;
 	unsigned int mAppRootSourceLine;
+	unsigned int mAppStartCommandSourceLine;
 	unsigned int mAppTypeSourceLine;
 	unsigned int mGroupSourceLine;
 	unsigned int mMeteorAppSettingsSourceLine;
@@ -293,6 +317,7 @@ struct AutoGeneratedDirConfig {
 	bool mAppGroupNameExplicitlySet: 1;
 	bool mAppLogFileExplicitlySet: 1;
 	bool mAppRootExplicitlySet: 1;
+	bool mAppStartCommandExplicitlySet: 1;
 	bool mAppTypeExplicitlySet: 1;
 	bool mGroupExplicitlySet: 1;
 	bool mMeteorAppSettingsExplicitlySet: 1;
@@ -472,6 +497,11 @@ struct AutoGeneratedDirConfig {
 		return mAppRoot;
 	}
 
+	StaticString
+	getAppStartCommand() const {
+		return mAppStartCommand;
+	}
+
 	StaticString
 	getAppType() const {
 		return mAppType;
@@ -558,3 +588,8 @@ struct AutoGeneratedDirConfig {
 	}
 
 };
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_ */

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h.cxxcodebuilder

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -30,6 +30,17 @@ require 'phusion_passenger/apache2/config_options'
 def main
   comment copyright_header_for(__FILE__), 1
 
+  add_code %Q{
+    #ifndef _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_
+    #define _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include "../ConfigGeneral/Common.h"
+    #endif
+  }
+
   separator
 
   comment %q{
@@ -47,6 +58,19 @@ def main
 
   separator
 
+  add_code %Q[
+    namespace Passenger {
+    namespace Apache2Module {
+  ]
+
+  separator
+
+  comment %Q{
+    Per-directory configuration information (autogenerated part).
+
+    Use the getter methods to query information, because those will return
+    the default value if the value is not specified.
+  }
   struct 'AutoGeneratedDirConfig' do
     definitions.each do |definition|
       separator
@@ -80,6 +104,15 @@ def main
       add_getter_function(definition)
     end
   end
+
+  separator
+
+  add_code %Q[
+    } // namespace Apache2Module
+    } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_DIR_CONFIG_AUTOGENERATED_STRUCT_H_ */
+  ]
 end
 
 def filter_eligible_options(options)

data/src/apache2_module/DirectoryMapper.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -33,7 +33,7 @@
 #include <oxt/backtrace.hpp>
 #include <boost/thread.hpp>
 
-#include <AppTypes.h>
+#include <AppTypeDetector/Detector.h>
 #include <Utils.h>
 #include <Utils/CachedFileStat.hpp>
 
@@ -72,16 +72,18 @@ public:
  */
 class DirectoryMapper {
 private:
+	const WrapperRegistry::Registry &registry;
 	DirConfig *config;
 	request_rec *r;
 	CachedFileStat *cstat;
 	boost::mutex *cstatMutex;
+	boost::mutex *configMutex;
 	const char *baseURI;
 	string publicDir;
 	string appRoot;
 	unsigned int throttleRate;
-	PassengerAppType appType: 7;
-	bool autoDetectionDone: 1;
+	AppTypeDetector::Detector::Result detectorResult;
+	bool autoDetectionDone;
 
 	const char *findBaseURI() const {
 		set<string>::const_iterator it, end = config->getBaseURIs().end();
@@ -146,30 +148,37 @@ private:
 		}
 
 		UPDATE_TRACE_POINT();
-		AppTypeDetector detector(cstat, cstatMutex, throttleRate);
-		PassengerAppType appType;
+		AppTypeDetector::Detector detector(registry, cstat,
+			cstatMutex, throttleRate, configMutex);
+		AppTypeDetector::Detector::Result detectorResult;
 		string appRoot;
-		if (config->getAppType().empty()) {
+		// If `AppStartCommand` is set, then it means the config specified that it is
+		// either a generic app or a Kuria app.
+		if (!config->getAppStartCommand().empty()) {
+			appRoot = config->getAppRoot();
+		} else if (config->getAppType().empty()) {
+			// If neither `AppStartCommand` nor `AppType` are set, then
+			// autodetect what kind of app this is.
 			if (config->getAppRoot().empty()) {
-				appType = detector.checkDocumentRoot(publicDir,
+				detectorResult = detector.checkDocumentRoot(publicDir,
 					baseURI != NULL,
 					&appRoot);
 			} else {
 				appRoot = config->getAppRoot();
-				appType = detector.checkAppRoot(appRoot);
-			}
-		} else {
-			if (config->getAppRoot().empty()) {
-				appType = PAT_NONE;
-			} else {
-				appRoot = config->getAppRoot().toString();
-				appType = getAppType(config->getAppType());
+				detectorResult = detector.checkAppRoot(appRoot);
 			}
+		} else if (!config->getAppRoot().empty()) {
+			// If `AppStartCommand` is not set but `AppType` is (as well as
+			// the required `AppRoot`), then verify whether the given
+			// `AppType` value is supported and resolve aliases.
+			appRoot = config->getAppRoot().toString();
+			detectorResult.wrapperRegistryEntry = &registry.lookup(
+				config->getAppType());
 		}
 
 		this->appRoot = appRoot;
 		this->baseURI = baseURI;
-		this->appType = appType;
+		this->detectorResult = detectorResult;
 		autoDetectionDone = true;
 	}
 
@@ -184,14 +193,18 @@ public:
 	 * @warning Do not use this object after the destruction of <tt>r</tt>,
 	 *          <tt>config</tt> or <tt>cstat</tt>.
 	 */
-	DirectoryMapper(request_rec *r, DirConfig *config, CachedFileStat *cstat,
-	                boost::mutex *cstatMutex, unsigned int throttleRate) {
+	DirectoryMapper(request_rec *r, DirConfig *config,
+		const WrapperRegistry::Registry &_registry,
+		CachedFileStat *cstat, boost::mutex *cstatMutex,
+		unsigned int throttleRate, boost::mutex *configMutex)
+		: registry(_registry)
+	{
 		this->r = r;
 		this->config = config;
 		this->cstat = cstat;
 		this->cstatMutex = cstatMutex;
+		this->configMutex = configMutex;
 		this->throttleRate = throttleRate;
-		appType = PAT_NONE;
 		baseURI = NULL;
 		autoDetectionDone = false;
 	}
@@ -243,30 +256,16 @@ public:
 	}
 
 	/**
-	 * Returns the application type that's associated with the HTTP request.
-	 *
-	 * @throws FileSystemException An error occured while examening the filesystem.
-	 * @throws DocumentRootDeterminationError Unable to query the location of the document root.
-	 * @throws TimeRetrievalException
-	 * @throws boost::thread_interrupted
-	 */
-	PassengerAppType getApplicationType() {
-		autoDetect();
-		return appType;
-	}
-
-	/**
-	 * Returns the application type (as a string) that's associated
-	 * with the HTTP request.
+	 * Returns the application detector result associated with the HTTP request.
 	 *
 	 * @throws FileSystemException An error occured while examening the filesystem.
 	 * @throws DocumentRootDeterminationError Unable to query the location of the document root.
 	 * @throws TimeRetrievalException
 	 * @throws boost::thread_interrupted
 	 */
-	const char *getApplicationTypeName() {
+	AppTypeDetector::Detector::Result getDetectorResult() {
 		autoDetect();
-		return getAppTypeName(appType);
+		return detectorResult;
 	}
 };
 

data/src/apache2_module/Hooks.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -60,12 +60,13 @@
 #include "DirectoryMapper.h"
 #include "Utils.h"
 #include <modp_b64.h>
+#include <WrapperRegistry/Registry.h>
 #include <FileTools/FileManip.h>
 #include <FileTools/FileManip.h>
 #include <Utils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemTime.h>
+#include <IOTools/IOUtils.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
 #include <Utils/HttpConstants.h>
 #include <Utils/ReleaseableScopedPointer.h>
 #include <LoggingKit/LoggingKit.h>
@@ -232,9 +233,11 @@ private:
 	enum Threeway { YES, NO, UNKNOWN };
 
 	Threeway m_hasModRewrite, m_hasModDir, m_hasModAutoIndex, m_hasModXsendfile;
+	WrapperRegistry::Registry wrapperRegistry;
 	CachedFileStat cstat;
 	WatchdogLauncher watchdogLauncher;
 	boost::mutex cstatMutex;
+	boost::mutex configMutex;
 
 	static Json::Value strsetToJson(const set<string> &input) {
 		Json::Value result(Json::arrayValue);
@@ -443,9 +446,12 @@ private:
 	bool prepareRequest(request_rec *r, DirConfig *config, const char *filename, bool coreModuleWillBeRun = false) {
 		TRACE_POINT();
 
-		DirectoryMapper mapper(r, config, &cstat, &cstatMutex, serverConfig.statThrottleRate);
+		DirectoryMapper mapper(r, config, wrapperRegistry, &cstat,
+		    &cstatMutex, serverConfig.statThrottleRate, &configMutex);
 		try {
-			if (mapper.getApplicationType() == PAT_NONE) {
+			if (config->getAppStartCommand().empty()
+			 && mapper.getDetectorResult().isNull())
+			{
 				// (B) is not true.
 				disableRequestNote(r);
 				return false;
@@ -983,8 +989,18 @@ private:
 		}
 
 		// Phusion Passenger options.
-		addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_ROOT"), mapper.getAppRoot());
-		addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_TYPE"), mapper.getApplicationTypeName());
+		addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_ROOT"),
+			mapper.getAppRoot());
+		if (!config->getAppStartCommand().empty()) {
+			addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_START_COMMAND"),
+				config->getAppStartCommand());
+		} else if (mapper.getDetectorResult().wrapperRegistryEntry != NULL) {
+			addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_TYPE"),
+				mapper.getDetectorResult().wrapperRegistryEntry->language);
+		} else {
+			addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_START_COMMAND"),
+				mapper.getDetectorResult().appStartCommand);
+		}
 		constructRequestHeaders_autoGenerated(r, config, result);
 
 		/*********************/
@@ -1247,6 +1263,7 @@ public:
 	    : cstat(1024),
 	      watchdogLauncher(IM_APACHE)
 	{
+		wrapperRegistry.finalize();
 		postprocessConfig(s, pconf, ptemp);
 
 		Json::Value loggingConfig;
@@ -1319,6 +1336,8 @@ public:
 		config["instance_registry_dir"] = nonEmptyString(serverConfig.instanceRegistryDir);
 		config["security_update_checker_disabled"] = serverConfig.disableSecurityUpdateCheck;
 		config["security_update_checker_proxy_url"] = nonEmptyString(serverConfig.securityUpdateCheckProxy);
+		config["telemetry_collector_disabled"] = serverConfig.disableAnonymousTelemetry;
+		config["telemetry_collector_proxy_url"] = nonEmptyString(serverConfig.anonymousTelemetryProxy);
 		config["user_switching"] = serverConfig.userSwitching;
 		config["default_user"] = serverConfig.defaultUser.toString();
 		config["default_group"] = serverConfig.defaultGroup.toString();

data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp

@@ -91,6 +91,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.adminPanelUsername.data(),
 			serverConfig.adminPanelUsername.data() + serverConfig.adminPanelUsername.size());
 	}
+	if (serverConfig.anonymousTelemetryProxyExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerAnonymousTelemetryProxy",
+			sizeof("PassengerAnonymousTelemetryProxy") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.anonymousTelemetryProxySourceFile,
+			serverConfig.anonymousTelemetryProxySourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.anonymousTelemetryProxy.data(),
+			serverConfig.anonymousTelemetryProxy.data() + serverConfig.anonymousTelemetryProxy.size());
+	}
 	if (serverConfig.dataBufferDirExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerDataBufferDir",
@@ -135,6 +146,15 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.defaultUser.data(),
 			serverConfig.defaultUser.data() + serverConfig.defaultUser.size());
 	}
+	if (serverConfig.disableAnonymousTelemetryExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerDisableAnonymousTelemetry",
+			sizeof("PassengerDisableAnonymousTelemetry") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.disableAnonymousTelemetrySourceFile,
+			serverConfig.disableAnonymousTelemetrySourceLine);
+		hierarchyMember["value"] = serverConfig.disableAnonymousTelemetry == Apache2Module::ENABLED;
+	}
 	if (serverConfig.disableSecurityUpdateCheckExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerDisableSecurityUpdateCheck",

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017 Phusion Holding B.V.
+ *  Copyright (c) 2017-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,6 +23,15 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_
+#define _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <StaticString.h>
+	#include <ap_config.h>
+	#include "../ConfigGeneral/Common.h"
+#endif
 
 /*
  * ServerConfig/AutoGeneratedStruct.h is automatically generated from ServerConfig/AutoGeneratedStruct.h.cxxcodebuilder,
@@ -37,8 +46,22 @@
  *   rake src/apache2_module/ServerConfig/AutoGeneratedStruct.h
  */
 
+namespace Passenger {
+namespace Apache2Module {
+
+/*
+ * Server-wide (global, not per-virtual host) configuration information (autogenerated part).
+ *
+ * Use the getter methods to query information, because those will return
+ * the default value if the value is not specified.
+ */
 struct AutoGeneratedServerConfig {
 
+	/*
+	 * Whether to disable Phusion Passenger anonymous telemetry.
+	 */
+	bool disableAnonymousTelemetry;
+
 	/*
 	 * Whether to disable the Phusion Passenger security update check & notification.
 	 */
@@ -114,6 +137,11 @@ struct AutoGeneratedServerConfig {
 	 */
 	StaticString adminPanelUsername;
 
+	/*
+	 * Use specified HTTP/SOCKS proxy for Phusion Passenger anonymous telemetry collection.
+	 */
+	StaticString anonymousTelemetryProxy;
+
 	/*
 	 * The directory that Phusion Passenger data buffers should be stored into.
 	 */
@@ -170,6 +198,7 @@ struct AutoGeneratedServerConfig {
 	std::set<std::string> prestartURLs;
 
 
+	StaticString disableAnonymousTelemetrySourceFile;
 	StaticString disableSecurityUpdateCheckSourceFile;
 	StaticString showVersionInHeaderSourceFile;
 	StaticString turbocachingSourceFile;
@@ -185,6 +214,7 @@ struct AutoGeneratedServerConfig {
 	StaticString adminPanelPasswordSourceFile;
 	StaticString adminPanelUrlSourceFile;
 	StaticString adminPanelUsernameSourceFile;
+	StaticString anonymousTelemetryProxySourceFile;
 	StaticString dataBufferDirSourceFile;
 	StaticString defaultGroupSourceFile;
 	StaticString defaultRubySourceFile;
@@ -197,6 +227,7 @@ struct AutoGeneratedServerConfig {
 	StaticString securityUpdateCheckProxySourceFile;
 	StaticString prestartURLsSourceFile;
 
+	unsigned int disableAnonymousTelemetrySourceLine;
 	unsigned int disableSecurityUpdateCheckSourceLine;
 	unsigned int showVersionInHeaderSourceLine;
 	unsigned int turbocachingSourceLine;
@@ -212,6 +243,7 @@ struct AutoGeneratedServerConfig {
 	unsigned int adminPanelPasswordSourceLine;
 	unsigned int adminPanelUrlSourceLine;
 	unsigned int adminPanelUsernameSourceLine;
+	unsigned int anonymousTelemetryProxySourceLine;
 	unsigned int dataBufferDirSourceLine;
 	unsigned int defaultGroupSourceLine;
 	unsigned int defaultRubySourceLine;
@@ -224,6 +256,7 @@ struct AutoGeneratedServerConfig {
 	unsigned int securityUpdateCheckProxySourceLine;
 	unsigned int prestartURLsSourceLine;
 
+	bool disableAnonymousTelemetryExplicitlySet: 1;
 	bool disableSecurityUpdateCheckExplicitlySet: 1;
 	bool showVersionInHeaderExplicitlySet: 1;
 	bool turbocachingExplicitlySet: 1;
@@ -239,6 +272,7 @@ struct AutoGeneratedServerConfig {
 	bool adminPanelPasswordExplicitlySet: 1;
 	bool adminPanelUrlExplicitlySet: 1;
 	bool adminPanelUsernameExplicitlySet: 1;
+	bool anonymousTelemetryProxyExplicitlySet: 1;
 	bool dataBufferDirExplicitlySet: 1;
 	bool defaultGroupExplicitlySet: 1;
 	bool defaultRubyExplicitlySet: 1;
@@ -253,6 +287,7 @@ struct AutoGeneratedServerConfig {
 
 
 	AutoGeneratedServerConfig() {
+		disableAnonymousTelemetry = false;
 		disableSecurityUpdateCheck = false;
 		showVersionInHeader = true;
 		turbocaching = true;
@@ -276,6 +311,9 @@ struct AutoGeneratedServerConfig {
 		/*
 		 * adminPanelUsername: default initialized
 		 */
+		/*
+		 * anonymousTelemetryProxy: default initialized
+		 */
 		/*
 		 * dataBufferDir: default initialized
 		 */
@@ -306,6 +344,7 @@ struct AutoGeneratedServerConfig {
 		 * prestartURLs: default initialized
 		 */
 
+		disableAnonymousTelemetrySourceLine = 0;
 		disableSecurityUpdateCheckSourceLine = 0;
 		showVersionInHeaderSourceLine = 0;
 		turbocachingSourceLine = 0;
@@ -321,6 +360,7 @@ struct AutoGeneratedServerConfig {
 		adminPanelPasswordSourceLine = 0;
 		adminPanelUrlSourceLine = 0;
 		adminPanelUsernameSourceLine = 0;
+		anonymousTelemetryProxySourceLine = 0;
 		dataBufferDirSourceLine = 0;
 		defaultGroupSourceLine = 0;
 		defaultRubySourceLine = 0;
@@ -333,6 +373,7 @@ struct AutoGeneratedServerConfig {
 		securityUpdateCheckProxySourceLine = 0;
 		prestartURLsSourceLine = 0;
 
+		disableAnonymousTelemetryExplicitlySet = false;
 		disableSecurityUpdateCheckExplicitlySet = false;
 		showVersionInHeaderExplicitlySet = false;
 		turbocachingExplicitlySet = false;
@@ -348,6 +389,7 @@ struct AutoGeneratedServerConfig {
 		adminPanelPasswordExplicitlySet = false;
 		adminPanelUrlExplicitlySet = false;
 		adminPanelUsernameExplicitlySet = false;
+		anonymousTelemetryProxyExplicitlySet = false;
 		dataBufferDirExplicitlySet = false;
 		defaultGroupExplicitlySet = false;
 		defaultRubyExplicitlySet = false;
@@ -362,3 +404,8 @@ struct AutoGeneratedServerConfig {
 	}
 
 };
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_ */

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h.cxxcodebuilder

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2017 Phusion Holding B.V.
+#  Copyright (c) 2017-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -30,6 +30,18 @@ require 'phusion_passenger/apache2/config_options'
 def main
   comment copyright_header_for(__FILE__), 1
 
+  add_code %Q{
+    #ifndef _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_
+    #define _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <StaticString.h>
+      #include <ap_config.h>
+      #include "../ConfigGeneral/Common.h"
+    #endif
+  }
+
   separator
 
   comment %q{
@@ -47,6 +59,20 @@ def main
 
   separator
 
+  add_code %Q[
+    namespace Passenger {
+    namespace Apache2Module {
+  ]
+
+  separator
+
+  comment %Q{
+    Server-wide (global, not per-virtual host) configuration information (autogenerated part).
+
+    Use the getter methods to query information, because those will return
+    the default value if the value is not specified.
+  }
+
   struct 'AutoGeneratedServerConfig' do
     definitions.each do |definition|
       separator
@@ -93,6 +119,15 @@ def main
       end
     end
   end
+
+  separator
+
+  add_code %Q[
+    } // namespace Apache2Module
+    } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_SERVER_CONFIG_AUTOGENERATED_STRUCT_H_ */
+  ]
 end
 
 def filter_eligible_options(options)

data/src/cxx_supportlib/{Utils → Algorithms}/Hasher.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -26,7 +26,7 @@
 
 // Implementation is in its own file so that we can enable compiler optimizations for these functions only.
 
-#include <Utils/Hasher.h>
+#include <Algorithms/Hasher.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/{Utils → Algorithms}/Hasher.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,8 +23,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_HASHER_H_
-#define _PASSENGER_HASHER_H_
+#ifndef _PASSENGER_ALGORITHMS_HASHER_H_
+#define _PASSENGER_ALGORITHMS_HASHER_H_
 
 #include <boost/cstdint.hpp>
 
@@ -56,4 +56,4 @@ typedef JenkinsHash Hasher;
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_HASHER_H_ */
+#endif /* _PASSENGER_ALGORITHMS_HASHER_H_ */