passenger 5.0.28 → 5.0.29

data/src/apache2_module/ConfigurationSetters.cpp.cxxcodebuilder

@@ -0,0 +1,144 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2016 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.
+
+# This file uses the cxxcodebuilder API. Learn more at:
+# https://github.com/phusion/passenger/cxxcodebuilder
+
+require 'phusion_passenger/apache2/config_options'
+
+def main
+  comment copyright_header_for(__FILE__)
+
+  separator
+
+  comment %q{
+    ConfigurationSetters.cpp is automatically generated from ConfigurationSetters.cpp.cxxcodebuilder,
+    using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
+    Edits to ConfigurationSetters.cpp will be lost.
+
+    To update ConfigurationSetters.cpp:
+      rake apache2
+
+    To force regeneration of ConfigurationSetters.cpp:
+      rm -f src/apache2_module/ConfigurationSetters.cpp
+      rake src/apache2_module/ConfigurationSetters.cpp
+  }
+
+  separator
+
+  filter_eligible_options(APACHE2_DIRECTORY_CONFIGURATION_OPTIONS).each do |option|
+    func_name = function_name_for(option)
+
+    if option[:type] == :string
+      function("static const char *#{func_name}(cmd_parms *cmd, void *pcfg, const char *arg)", %Q{
+        DirConfig *config = (DirConfig *) pcfg;
+        config->#{struct_field_for(option)} = arg;
+        return NULL;
+      })
+    elsif option[:type] == :integer
+      function "static const char *#{func_name}(cmd_parms *cmd, void *pcfg, const char *arg)" do
+        add_code %q[
+          DirConfig *config = (DirConfig *) pcfg;
+          char *end;
+          long result;
+
+          result = strtol(arg, &end, 10);
+          if (*end != '\0') {
+            string message = "Invalid number specified for ";
+            message.append(cmd->directive->directive);
+            message.append(".");
+
+            char *messageStr = (char *) apr_palloc(cmd->temp_pool,
+              message.size() + 1);
+            memcpy(messageStr, message.c_str(), message.size() + 1);
+            return messageStr;
+        ]
+
+        if option[:min_value]
+          add_code %Q[
+            } else if (result < #{option[:min_value]}) {
+              string message = "Value for ";
+              message.append(cmd->directive->directive);
+              message.append(" must be greater than or equal to #{option[:min_value]}.");
+
+              char *messageStr = (char *) apr_palloc(cmd->temp_pool,
+                message.size() + 1);
+              memcpy(messageStr, message.c_str(), message.size() + 1);
+              return messageStr;
+          ]
+        end
+
+        add_code %Q[
+          } else {
+            config->#{struct_field_for(option)} = (int) result;
+            return NULL;
+          }
+        ]
+      end
+    elsif option[:type] == :flag
+      function("static const char *#{func_name}(cmd_parms *cmd, void *pcfg, const char *arg)", %Q{
+        DirConfig *config = (DirConfig *) pcfg;
+        config->#{struct_field_for(option)} =
+          arg ?
+          DirConfig::ENABLED :
+          DirConfig::DISABLED;
+        return NULL;
+      })
+    else
+      raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+    end
+  end
+end
+
+def filter_eligible_options(options)
+  options.reject do |option|
+    option[:alias_for] ||
+      option.fetch(:field, true).nil? ||
+      option[:field].to_s =~ /\./ ||
+      option[:function]
+  end
+end
+
+def struct_field_for(option)
+  if option.has_key?(:field)
+    option[:field]
+  else
+    result = option[:name].sub(/^Passenger/, '')
+    result[0] = result[0..0].downcase
+    result
+  end
+end
+
+def min_value_for(option)
+  option[:min_value] || 0
+end
+
+def function_name_for(option)
+  function_name = option[:name].gsub(/[A-Z]/) do |letter|
+    "_" + letter[0..0].downcase
+  end
+  "cmd#{function_name}"
+end
+
+main

data/src/apache2_module/CreateDirConfig.cpp

@@ -1,31 +1,31 @@
 /*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ * Phusion Passenger - https://www.phusionpassenger.com/
+ * Copyright (c) 2010-2016 Phusion Holding B.V.
  *
- *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of 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:
+ * 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 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.
+ * 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.
  */
 
 /*
- * CreateDirConfig.cpp is automatically generated from CreateDirConfig.cpp.erb,
+ * CreateDirConfig.cpp is automatically generated from CreateDirConfig.cpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
  * Edits to CreateDirConfig.cpp will be lost.
  *
@@ -37,35 +37,32 @@
  *   rake src/apache2_module/CreateDirConfig.cpp
  */
 
-
-
-			config->ruby = NULL;
-				config->python = NULL;
-				config->nodejs = NULL;
-				config->meteorAppSettings = NULL;
-				config->appEnv = NULL;
-				config->minInstances = UNSET_INT_VALUE;
-				config->maxInstancesPerApp = UNSET_INT_VALUE;
-				config->user = NULL;
-				config->group = NULL;
-				config->errorOverride = DirConfig::UNSET;
-				config->maxRequests = UNSET_INT_VALUE;
-				config->startTimeout = UNSET_INT_VALUE;
-				config->highPerformance = DirConfig::UNSET;
-				config->enabled = DirConfig::UNSET;
-				config->maxRequestQueueSize = UNSET_INT_VALUE;
-				config->maxPreloaderIdleTime = UNSET_INT_VALUE;
-				config->loadShellEnvvars = DirConfig::UNSET;
-				config->bufferUpload = DirConfig::UNSET;
-				config->appType = NULL;
-				config->startupFile = NULL;
-				config->stickySessions = DirConfig::UNSET;
-				config->stickySessionsCookieName = DirConfig::UNSET;
-				config->spawnMethod = NULL;
-				config->showVersionInHeader = DirConfig::UNSET;
-				config->friendlyErrorPages = DirConfig::UNSET;
-				config->restartDir = NULL;
-				config->appGroupName = NULL;
-				config->forceMaxConcurrentRequestsPerProcess = UNSET_INT_VALUE;
-				config->lveMinUid = UNSET_INT_VALUE;
-	
+config->ruby = NULL;
+config->python = NULL;
+config->nodejs = NULL;
+config->meteorAppSettings = NULL;
+config->appEnv = NULL;
+config->minInstances = UNSET_INT_VALUE;
+config->maxInstancesPerApp = UNSET_INT_VALUE;
+config->user = NULL;
+config->group = NULL;
+config->errorOverride = DirConfig::UNSET;
+config->maxRequests = UNSET_INT_VALUE;
+config->startTimeout = UNSET_INT_VALUE;
+config->highPerformance = DirConfig::UNSET;
+config->enabled = DirConfig::UNSET;
+config->maxRequestQueueSize = UNSET_INT_VALUE;
+config->maxPreloaderIdleTime = UNSET_INT_VALUE;
+config->loadShellEnvvars = DirConfig::UNSET;
+config->bufferUpload = DirConfig::UNSET;
+config->appType = NULL;
+config->startupFile = NULL;
+config->stickySessions = DirConfig::UNSET;
+config->stickySessionsCookieName = DirConfig::UNSET;
+config->spawnMethod = NULL;
+config->showVersionInHeader = DirConfig::UNSET;
+config->friendlyErrorPages = DirConfig::UNSET;
+config->restartDir = NULL;
+config->appGroupName = NULL;
+config->forceMaxConcurrentRequestsPerProcess = UNSET_INT_VALUE;
+config->lveMinUid = UNSET_INT_VALUE;

data/src/apache2_module/CreateDirConfig.cpp.cxxcodebuilder

@@ -0,0 +1,81 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2016 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.
+
+# This file uses the cxxcodebuilder API. Learn more at:
+# https://github.com/phusion/passenger/cxxcodebuilder
+
+require 'phusion_passenger/apache2/config_options'
+
+def main
+  comment copyright_header_for(__FILE__)
+
+  separator
+
+  comment %q{
+    CreateDirConfig.cpp is automatically generated from CreateDirConfig.cpp.cxxcodebuilder,
+    using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
+    Edits to CreateDirConfig.cpp will be lost.
+
+    To update CreateDirConfig.cpp:
+      rake apache2
+
+    To force regeneration of CreateDirConfig.cpp:
+      rm -f src/apache2_module/CreateDirConfig.cpp
+      rake src/apache2_module/CreateDirConfig.cpp
+  }
+
+  separator
+
+  filter_eligible_options(APACHE2_DIRECTORY_CONFIGURATION_OPTIONS).each do |option|
+    if option[:type] == :string
+      add_code("config->#{struct_field_for(option)} = NULL;")
+    elsif option[:type] == :integer
+      add_code("config->#{struct_field_for(option)} = UNSET_INT_VALUE;")
+    elsif option[:type] == :flag
+      add_code("config->#{struct_field_for(option)} = DirConfig::UNSET;")
+    else
+      raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+    end
+  end
+end
+
+def filter_eligible_options(options)
+  options.reject do |option|
+    option[:alias_for] ||
+      option.fetch(:field, true).nil? ||
+      option[:field].to_s =~ /\./
+  end
+end
+
+def struct_field_for(option)
+  if option.has_key?(:field)
+    option[:field]
+  else
+    result = option[:name].sub(/^Passenger/, '')
+    result[0] = result[0..0].downcase
+    result
+  end
+end
+
+main

data/src/apache2_module/Hooks.cpp

@@ -314,19 +314,6 @@ private:
 		return conn;
 	}
 
-	vector<string> getConfigFiles(server_rec *s) const {
-		server_rec *server;
-		vector<string> result;
-
-		for (server = s; server != NULL; server = server->next) {
-			if (server->defn_name != NULL) {
-				result.push_back(server->defn_name);
-			}
-		}
-
-		return result;
-	}
-
 	bool hasModRewrite() {
 		if (m_hasModRewrite == UNKNOWN) {
 			if (ap_find_linked_module("mod_rewrite.c")) {
@@ -1290,7 +1277,6 @@ public:
 		VariantMap params;
 		params
 			.setPid ("web_server_control_process_pid", getpid())
-			.setStrSet("web_server_config_files", getConfigFiles(s))
 			.set    ("server_software", webServerDesc)
 			.setBool("multi_app", true)
 			.setBool("load_shell_envvars", true)

data/src/apache2_module/MergeDirConfig.cpp

@@ -1,31 +1,31 @@
 /*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion Holding B.V.
+ * Phusion Passenger - https://www.phusionpassenger.com/
+ * Copyright (c) 2010-2016 Phusion Holding B.V.
  *
- *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of 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:
+ * 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 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.
+ * 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.
  */
 
 /*
- * MergeDirConfig.cpp is automatically generated from MergeDirConfig.cpp.erb,
+ * MergeDirConfig.cpp is automatically generated from MergeDirConfig.cpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
  * Edits to MergeDirConfig.cpp will be lost.
  *
@@ -37,209 +37,119 @@
  *   rake src/apache2_module/MergeDirConfig.cpp
  */
 
-
-
-
-	
-		config->ruby =
-			(add->ruby == NULL) ?
-			base->ruby :
-			add->ruby;
-	
-
-	
-		config->python =
-			(add->python == NULL) ?
-			base->python :
-			add->python;
-	
-
-	
-		config->nodejs =
-			(add->nodejs == NULL) ?
-			base->nodejs :
-			add->nodejs;
-	
-
-	
-		config->meteorAppSettings =
-			(add->meteorAppSettings == NULL) ?
-			base->meteorAppSettings :
-			add->meteorAppSettings;
-	
-
-	
-		config->appEnv =
-			(add->appEnv == NULL) ?
-			base->appEnv :
-			add->appEnv;
-	
-
-	
-		config->minInstances =
-			(add->minInstances == UNSET_INT_VALUE) ?
-			base->minInstances :
-			add->minInstances;
-	
-
-	
-		config->maxInstancesPerApp =
-			(add->maxInstancesPerApp == UNSET_INT_VALUE) ?
-			base->maxInstancesPerApp :
-			add->maxInstancesPerApp;
-	
-
-	
-		config->user =
-			(add->user == NULL) ?
-			base->user :
-			add->user;
-	
-
-	
-		config->group =
-			(add->group == NULL) ?
-			base->group :
-			add->group;
-	
-
-	
-		config->errorOverride =
-			(add->errorOverride == DirConfig::UNSET) ?
-			base->errorOverride :
-			add->errorOverride;
-	
-
-	
-		config->maxRequests =
-			(add->maxRequests == UNSET_INT_VALUE) ?
-			base->maxRequests :
-			add->maxRequests;
-	
-
-	
-		config->startTimeout =
-			(add->startTimeout == UNSET_INT_VALUE) ?
-			base->startTimeout :
-			add->startTimeout;
-	
-
-	
-		config->highPerformance =
-			(add->highPerformance == DirConfig::UNSET) ?
-			base->highPerformance :
-			add->highPerformance;
-	
-
-	
-		config->enabled =
-			(add->enabled == DirConfig::UNSET) ?
-			base->enabled :
-			add->enabled;
-	
-
-	
-		config->maxRequestQueueSize =
-			(add->maxRequestQueueSize == UNSET_INT_VALUE) ?
-			base->maxRequestQueueSize :
-			add->maxRequestQueueSize;
-	
-
-	
-		config->maxPreloaderIdleTime =
-			(add->maxPreloaderIdleTime == UNSET_INT_VALUE) ?
-			base->maxPreloaderIdleTime :
-			add->maxPreloaderIdleTime;
-	
-
-	
-		config->loadShellEnvvars =
-			(add->loadShellEnvvars == DirConfig::UNSET) ?
-			base->loadShellEnvvars :
-			add->loadShellEnvvars;
-	
-
-	
-		config->bufferUpload =
-			(add->bufferUpload == DirConfig::UNSET) ?
-			base->bufferUpload :
-			add->bufferUpload;
-	
-
-	
-		config->appType =
-			(add->appType == NULL) ?
-			base->appType :
-			add->appType;
-	
-
-	
-		config->startupFile =
-			(add->startupFile == NULL) ?
-			base->startupFile :
-			add->startupFile;
-	
-
-	
-		config->stickySessions =
-			(add->stickySessions == DirConfig::UNSET) ?
-			base->stickySessions :
-			add->stickySessions;
-	
-
-	
-		config->stickySessionsCookieName =
-			(add->stickySessionsCookieName == DirConfig::UNSET) ?
-			base->stickySessionsCookieName :
-			add->stickySessionsCookieName;
-	
-
-	
-		config->spawnMethod =
-			(add->spawnMethod == NULL) ?
-			base->spawnMethod :
-			add->spawnMethod;
-	
-
-	
-		config->showVersionInHeader =
-			(add->showVersionInHeader == DirConfig::UNSET) ?
-			base->showVersionInHeader :
-			add->showVersionInHeader;
-	
-
-	
-		config->friendlyErrorPages =
-			(add->friendlyErrorPages == DirConfig::UNSET) ?
-			base->friendlyErrorPages :
-			add->friendlyErrorPages;
-	
-
-	
-		config->restartDir =
-			(add->restartDir == NULL) ?
-			base->restartDir :
-			add->restartDir;
-	
-
-	
-		config->appGroupName =
-			(add->appGroupName == NULL) ?
-			base->appGroupName :
-			add->appGroupName;
-	
-
-	
-		config->forceMaxConcurrentRequestsPerProcess =
-			(add->forceMaxConcurrentRequestsPerProcess == UNSET_INT_VALUE) ?
-			base->forceMaxConcurrentRequestsPerProcess :
-			add->forceMaxConcurrentRequestsPerProcess;
-	
-
-	
-		config->lveMinUid =
-			(add->lveMinUid == UNSET_INT_VALUE) ?
-			base->lveMinUid :
-			add->lveMinUid;
-	
-
+config->ruby =
+	(add->ruby == NULL) ?
+	base->ruby :
+	add->ruby;
+config->python =
+	(add->python == NULL) ?
+	base->python :
+	add->python;
+config->nodejs =
+	(add->nodejs == NULL) ?
+	base->nodejs :
+	add->nodejs;
+config->meteorAppSettings =
+	(add->meteorAppSettings == NULL) ?
+	base->meteorAppSettings :
+	add->meteorAppSettings;
+config->appEnv =
+	(add->appEnv == NULL) ?
+	base->appEnv :
+	add->appEnv;
+config->minInstances =
+	(add->minInstances == UNSET_INT_VALUE) ?
+	base->minInstances :
+	add->minInstances;
+config->maxInstancesPerApp =
+	(add->maxInstancesPerApp == UNSET_INT_VALUE) ?
+	base->maxInstancesPerApp :
+	add->maxInstancesPerApp;
+config->user =
+	(add->user == NULL) ?
+	base->user :
+	add->user;
+config->group =
+	(add->group == NULL) ?
+	base->group :
+	add->group;
+config->errorOverride =
+	(add->errorOverride == DirConfig::UNSET) ?
+	base->errorOverride :
+	add->errorOverride;
+config->maxRequests =
+	(add->maxRequests == UNSET_INT_VALUE) ?
+	base->maxRequests :
+	add->maxRequests;
+config->startTimeout =
+	(add->startTimeout == UNSET_INT_VALUE) ?
+	base->startTimeout :
+	add->startTimeout;
+config->highPerformance =
+	(add->highPerformance == DirConfig::UNSET) ?
+	base->highPerformance :
+	add->highPerformance;
+config->enabled =
+	(add->enabled == DirConfig::UNSET) ?
+	base->enabled :
+	add->enabled;
+config->maxRequestQueueSize =
+	(add->maxRequestQueueSize == UNSET_INT_VALUE) ?
+	base->maxRequestQueueSize :
+	add->maxRequestQueueSize;
+config->maxPreloaderIdleTime =
+	(add->maxPreloaderIdleTime == UNSET_INT_VALUE) ?
+	base->maxPreloaderIdleTime :
+	add->maxPreloaderIdleTime;
+config->loadShellEnvvars =
+	(add->loadShellEnvvars == DirConfig::UNSET) ?
+	base->loadShellEnvvars :
+	add->loadShellEnvvars;
+config->bufferUpload =
+	(add->bufferUpload == DirConfig::UNSET) ?
+	base->bufferUpload :
+	add->bufferUpload;
+config->appType =
+	(add->appType == NULL) ?
+	base->appType :
+	add->appType;
+config->startupFile =
+	(add->startupFile == NULL) ?
+	base->startupFile :
+	add->startupFile;
+config->stickySessions =
+	(add->stickySessions == DirConfig::UNSET) ?
+	base->stickySessions :
+	add->stickySessions;
+config->stickySessionsCookieName =
+	(add->stickySessionsCookieName == DirConfig::UNSET) ?
+	base->stickySessionsCookieName :
+	add->stickySessionsCookieName;
+config->spawnMethod =
+	(add->spawnMethod == NULL) ?
+	base->spawnMethod :
+	add->spawnMethod;
+config->showVersionInHeader =
+	(add->showVersionInHeader == DirConfig::UNSET) ?
+	base->showVersionInHeader :
+	add->showVersionInHeader;
+config->friendlyErrorPages =
+	(add->friendlyErrorPages == DirConfig::UNSET) ?
+	base->friendlyErrorPages :
+	add->friendlyErrorPages;
+config->restartDir =
+	(add->restartDir == NULL) ?
+	base->restartDir :
+	add->restartDir;
+config->appGroupName =
+	(add->appGroupName == NULL) ?
+	base->appGroupName :
+	add->appGroupName;
+config->forceMaxConcurrentRequestsPerProcess =
+	(add->forceMaxConcurrentRequestsPerProcess == UNSET_INT_VALUE) ?
+	base->forceMaxConcurrentRequestsPerProcess :
+	add->forceMaxConcurrentRequestsPerProcess;
+config->lveMinUid =
+	(add->lveMinUid == UNSET_INT_VALUE) ?
+	base->lveMinUid :
+	add->lveMinUid;