passenger 5.3.4 → 6.0.1

data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp.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.
@@ -48,23 +48,45 @@ def main
 
   separator
 
-  APACHE2_CONFIGURATION_OPTIONS.each do |option|
-    option = resolve_possible_alias(option)
-    format =
-      "%s(%s,\n" \
-      "\t(%s) %s,\n" \
-      "\tNULL,\n" \
-      "\t%s,\n" \
-      "\t%s),\n"
-    code = sprintf(format,
-      macro_for(option),
-      name_for(option),
-      function_type_for(option),
-      function_for(option),
-      definition_context_for(option),
-      description_for(option))
-    add_code(code)
+  add_code %Q[
+    #ifdef INTELLISENSE
+      // This include does nothing, but keeps IntelliSense happy.
+      #include <http_config.h>
+    #endif
+
+    namespace Passenger {
+    namespace Apache2Module {
+
+    extern "C" const command_rec passenger_commands[] = {
+  ]
+
+  indent do
+    APACHE2_CONFIGURATION_OPTIONS.each do |option|
+      option = resolve_possible_alias(option)
+      format =
+        "%s(%s,\n" \
+        "\t(%s) %s,\n" \
+        "\tNULL,\n" \
+        "\t%s,\n" \
+        "\t%s),\n"
+      code = sprintf(format,
+        macro_for(option),
+        name_for(option),
+        function_type_for(option),
+        function_for(option),
+        definition_context_for(option),
+        description_for(option))
+      add_code(code)
+    end
   end
+
+  add_code %Q[
+      { NULL }
+    };
+
+    } // namespace Apache2Module
+    } // namespace Passenger
+  ]
 end
 
 def resolve_possible_alias(option)

data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp

@@ -68,6 +68,11 @@ ConfigManifestGenerator::autoGenerated_setGlobalConfigDefaults() {
 		"PassengerDefaultUser",
 		PASSENGER_DEFAULT_USER);
 
+	addOptionsContainerStaticDefaultBool(
+		globalConfigContainer,
+		"PassengerDisableAnonymousTelemetry",
+		false);
+
 	addOptionsContainerStaticDefaultBool(
 		globalConfigContainer,
 		"PassengerDisableSecurityUpdateCheck",

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.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.
@@ -23,6 +23,24 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_
+#define _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include <http_config.h>
+	#include <http_log.h>
+	#include "../Config.h"
+
+	#ifdef APLOG_USE_MODULE
+		extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
+		APLOG_USE_MODULE(passenger);
+	#endif
+#endif
+
+namespace Passenger {
+namespace Apache2Module {
 
 /*
  * ConfigGeneral/AutoGeneratedSetterFuncs.cpp is automatically generated from
@@ -125,6 +143,21 @@ cmd_passenger_analytics_log_user(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_anonymous_telemetry_proxy(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.anonymousTelemetryProxySourceFile = cmd->directive->filename;
+	serverConfig.anonymousTelemetryProxySourceLine = cmd->directive->line_num;
+	serverConfig.anonymousTelemetryProxyExplicitlySet = true;
+	serverConfig.anonymousTelemetryProxy = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_app_env(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
@@ -170,6 +203,21 @@ cmd_passenger_app_root(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_app_start_command(cmd_parms *cmd, void *pcfg, const char *arg) {
+	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
+	if (err != NULL) {
+		return err;
+	}
+
+	DirConfig *config = (DirConfig *) pcfg;
+	config->mAppStartCommandSourceFile = cmd->directive->filename;
+	config->mAppStartCommandSourceLine = cmd->directive->line_num;
+	config->mAppStartCommandExplicitlySet = true;
+	config->mAppStartCommand = arg;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_app_type(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, NOT_IN_FILES);
@@ -271,6 +319,21 @@ cmd_passenger_default_user(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+static const char *
+cmd_passenger_disable_anonymous_telemetry(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.disableAnonymousTelemetrySourceFile = cmd->directive->filename;
+	serverConfig.disableAnonymousTelemetrySourceLine = cmd->directive->line_num;
+	serverConfig.disableAnonymousTelemetryExplicitlySet = true;
+	serverConfig.disableAnonymousTelemetry = arg != NULL;
+	return NULL;
+}
+
 static const char *
 cmd_passenger_disable_security_update_check(cmd_parms *cmd, void *pcfg, const char *arg) {
 	const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -942,3 +1005,8 @@ cmd_union_station_support(cmd_parms *cmd, void *pcfg, const char *arg) {
 	return NULL;
 }
 
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_ */

data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp.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,27 @@ require 'phusion_passenger/apache2/config_options'
 def main
   comment copyright_header_for(__FILE__), 1
 
+  add_code %Q[
+    #ifndef _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_
+    #define _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include <http_config.h>
+      #include <http_log.h>
+      #include "../Config.h"
+
+      #ifdef APLOG_USE_MODULE
+        extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
+        APLOG_USE_MODULE(passenger);
+      #endif
+    #endif
+
+    namespace Passenger {
+    namespace Apache2Module {
+  ]
+
   separator
 
   comment %q{
@@ -53,6 +74,15 @@ def main
       setter_function_body_for(option)
     end
   end
+
+  separator
+
+  add_code %Q[
+    } // namespace Apache2Module
+    } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_SETTER_FUNCS_CPP_ */
+  ]
 end
 
 def filter_eligible_options(options)

data/src/apache2_module/ConfigGeneral/Common.h

@@ -0,0 +1,45 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2018 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_APACHE2_MODULE_CONFIG_COMMON_H_
+#define _PASSENGER_APACHE2_MODULE_CONFIG_COMMON_H_
+
+namespace Passenger {
+namespace Apache2Module {
+
+
+enum Threeway {
+	UNSET = -1,
+	DISABLED = 0,
+	ENABLED = 1
+};
+
+#define UNSET_INT_VALUE INT_MIN
+
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_CONFIG_COMMON_H_ */

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.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.
@@ -24,6 +24,15 @@
  *  THE SOFTWARE.
  */
 
+#ifndef _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_
+#define _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include "../Config.h"
+#endif
+
 /*
  * DirConfig/AutoGeneratedCreateFunction.cpp is automatically generated from DirConfig/AutoGeneratedCreateFunction.cpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
@@ -55,6 +64,9 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	/*
 	 * config->mAppRoot: default initialized
 	 */
+	/*
+	 * config->mAppStartCommand: default initialized
+	 */
 	/*
 	 * config->mAppType: default initialized
 	 */
@@ -115,6 +127,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mAppGroupNameSourceLine = 0;
 	config->mAppLogFileSourceLine = 0;
 	config->mAppRootSourceLine = 0;
+	config->mAppStartCommandSourceLine = 0;
 	config->mAppTypeSourceLine = 0;
 	config->mBaseURIsSourceLine = 0;
 	config->mBufferResponseSourceLine = 0;
@@ -149,6 +162,7 @@ createDirConfig_autoGenerated(DirConfig *config) {
 	config->mAppGroupNameExplicitlySet = false;
 	config->mAppLogFileExplicitlySet = false;
 	config->mAppRootExplicitlySet = false;
+	config->mAppStartCommandExplicitlySet = false;
 	config->mAppTypeExplicitlySet = false;
 	config->mBaseURIsExplicitlySet = false;
 	config->mBufferResponseExplicitlySet = false;
@@ -182,3 +196,5 @@ createDirConfig_autoGenerated(DirConfig *config) {
 
 } // namespace Apache2Module
 } // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_ */

data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp.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.
@@ -32,6 +32,19 @@ def main
 
   separator
 
+  add_code %Q{
+    #ifndef _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_
+    #define _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include "../Config.h"
+    #endif
+  }
+
+  separator
+
   comment %q{
     DirConfig/AutoGeneratedCreateFunction.cpp is automatically generated from DirConfig/AutoGeneratedCreateFunction.cpp.cxxcodebuilder,
     using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
@@ -95,6 +108,8 @@ def main
   add_code %Q[
     } // namespace Apache2Module
     } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_CONFIG_AUTOGENERATED_CREATE_FUNCTION_CPP_ */
   ]
 end
 

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.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.
@@ -23,6 +23,18 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_
+#define _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_
+
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include <string>
+	#include "../Config.h"
+#endif
+
+namespace Passenger {
+namespace Apache2Module {
 
 /*
  * DirConfig/AutoGeneratedHeaderSerialization.cpp is automatically generated from
@@ -39,10 +51,7 @@
  */
 
 static void
-constructRequestHeaders_autoGenerated(request_rec *r, Passenger::Apache2Module::DirConfig *config, std::string &result) {
-	using namespace Passenger;
-	using namespace Passenger::Apache2Module;
-
+constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::string &result) {
 	addHeader(result, StaticString("!~PASSENGER_APP_ENV",
 			sizeof("!~PASSENGER_APP_ENV") - 1),
 		config->mAppEnv);
@@ -114,3 +123,8 @@ constructRequestHeaders_autoGenerated(request_rec *r, Passenger::Apache2Module::
 		config->mUser);
 }
 
+
+} // namespace Apache2Module
+} // namespace Passenger
+
+#endif /* _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_ */

data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp.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,21 @@ require 'phusion_passenger/apache2/config_options'
 def main
   comment copyright_header_for(__FILE__), 1
 
+  add_code %Q[
+    #ifndef _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_
+    #define _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_
+
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include <string>
+      #include "../Config.h"
+    #endif
+
+    namespace Passenger {
+    namespace Apache2Module {
+  ]
+
   separator
 
   comment %q{
@@ -48,14 +63,7 @@ def main
 
   separator
 
-  function 'static void constructRequestHeaders_autoGenerated(request_rec *r, Passenger::Apache2Module::DirConfig *config, std::string &result)' do
-    add_code %Q{
-      using namespace Passenger;
-      using namespace Passenger::Apache2Module;
-    }
-
-    separator
-
+  function 'static void constructRequestHeaders_autoGenerated(request_rec *r, DirConfig *config, std::string &result)' do
     filter_eligible_options(APACHE2_CONFIGURATION_OPTIONS).each do |option|
       if option[:type] == :string || option[:type] == :flag
         add_code %Q{
@@ -74,6 +82,15 @@ def main
       end
     end
   end
+
+  separator
+
+  add_code %Q[
+    } // namespace Apache2Module
+    } // namespace Passenger
+
+    #endif /* _PASSENGER_APACHE2_MODULE_AUTOGENERATED_HEADER_SERIALIZATION_CPP_ */
+  ]
 end
 
 def filter_eligible_options(options)

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp

@@ -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.
@@ -24,6 +24,11 @@
  *  THE SOFTWARE.
  */
 
+#ifdef INTELLISENSE
+	// This include does nothing, but keeps IntelliSense happy.
+	#include <ap_config.h>
+#endif
+
 /*
  * DirConfig/AutoGeneratedManifestGeneration.cpp is automatically generated from DirConfig/AutoGeneratedManifestGeneration.cpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
@@ -111,6 +116,19 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForDirConfig(server
 			pdconf->mAppRoot.data(),
 			pdconf->mAppRoot.data() + pdconf->mAppRoot.size());
 	}
+	if (pdconf->mAppStartCommandExplicitlySet) {
+		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
+			pdconf, context, &appOptionsContainer, &locOptionsContainer);
+		Json::Value &optionContainer = findOrCreateOptionContainer(*appOptionsContainer,
+			"PassengerAppStartCommand",
+			sizeof("PassengerAppStartCommand") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			pdconf->mAppStartCommandSourceFile,
+			pdconf->mAppStartCommandSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			pdconf->mAppStartCommand.data(),
+			pdconf->mAppStartCommand.data() + pdconf->mAppStartCommand.size());
+	}
 	if (pdconf->mAppTypeExplicitlySet) {
 		findOrCreateAppAndLocOptionsContainers(serverRec, csconf, cdconf,
 			pdconf, context, &appOptionsContainer, &locOptionsContainer);

data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp.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.
@@ -32,6 +32,15 @@ def main
 
   separator
 
+  add_code %Q{
+    #ifdef INTELLISENSE
+      // This include does nothing, but keeps IntelliSense happy.
+      #include <ap_config.h>
+    #endif
+  }
+
+  separator
+
   comment %q{
     DirConfig/AutoGeneratedManifestGeneration.cpp is automatically generated from DirConfig/AutoGeneratedManifestGeneration.cpp.cxxcodebuilder,
     using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.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.
@@ -24,6 +24,12 @@
  *  THE SOFTWARE.
  */
 
+#ifdef INTELLISENSE
+	// These includes do nothing, but keep IntelliSense happy.
+	#include <ap_config.h>
+	#include "../Config.h"
+#endif
+
 /*
  * DirConfig/AutoGeneratedMergeFunction.cpp is automatically generated from DirConfig/AutoGeneratedMergeFunction.cpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
@@ -62,6 +68,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(!add->mAppRoot.empty())
 		? add->mAppRoot
 		: base->mAppRoot;
+	config->mAppStartCommand =
+		(!add->mAppStartCommand.empty())
+		? add->mAppStartCommand
+		: base->mAppStartCommand;
 	config->mAppType =
 		(!add->mAppType.empty())
 		? add->mAppType
@@ -180,6 +190,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mAppGroupNameSourceFile = add->mAppGroupNameSourceFile;
 	config->mAppLogFileSourceFile = add->mAppLogFileSourceFile;
 	config->mAppRootSourceFile = add->mAppRootSourceFile;
+	config->mAppStartCommandSourceFile = add->mAppStartCommandSourceFile;
 	config->mAppTypeSourceFile = add->mAppTypeSourceFile;
 	config->mBaseURIsSourceFile = add->mBaseURIsSourceFile;
 	config->mBufferResponseSourceFile = add->mBufferResponseSourceFile;
@@ -214,6 +225,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mAppGroupNameSourceLine = add->mAppGroupNameSourceLine;
 	config->mAppLogFileSourceLine = add->mAppLogFileSourceLine;
 	config->mAppRootSourceLine = add->mAppRootSourceLine;
+	config->mAppStartCommandSourceLine = add->mAppStartCommandSourceLine;
 	config->mAppTypeSourceLine = add->mAppTypeSourceLine;
 	config->mBaseURIsSourceLine = add->mBaseURIsSourceLine;
 	config->mBufferResponseSourceLine = add->mBufferResponseSourceLine;
@@ -248,6 +260,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mAppGroupNameExplicitlySet = add->mAppGroupNameExplicitlySet;
 	config->mAppLogFileExplicitlySet = add->mAppLogFileExplicitlySet;
 	config->mAppRootExplicitlySet = add->mAppRootExplicitlySet;
+	config->mAppStartCommandExplicitlySet = add->mAppStartCommandExplicitlySet;
 	config->mAppTypeExplicitlySet = add->mAppTypeExplicitlySet;
 	config->mBaseURIsExplicitlySet = add->mBaseURIsExplicitlySet;
 	config->mBufferResponseExplicitlySet = add->mBufferResponseExplicitlySet;

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp.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.
@@ -32,6 +32,16 @@ def main
 
   separator
 
+  add_code %Q{
+    #ifdef INTELLISENSE
+      // These includes do nothing, but keep IntelliSense happy.
+      #include <ap_config.h>
+      #include "../Config.h"
+    #endif
+  }
+
+  separator
+
   comment %q{
     DirConfig/AutoGeneratedMergeFunction.cpp is automatically generated from DirConfig/AutoGeneratedMergeFunction.cpp.cxxcodebuilder,
     using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.