passenger 4.0.14 → 4.0.16

data/ext/apache2/Configuration.hpp

@@ -53,6 +53,8 @@ namespace Passenger {
 
 using namespace std;
 
+#define UNSET_INT_VALUE INT_MIN
+
 	
 /**
  * Per-directory configuration information.
@@ -64,13 +66,10 @@ struct DirConfig {
 	enum Threeway { ENABLED, DISABLED, UNSET };
 	enum SpawnMethod { SM_UNSET, SM_SMART, SM_DIRECT };
 	
-	Threeway enabled;
-	
+	#include "ConfigurationFields.hpp"
+
 	std::set<std::string> baseURIs;
 	
-	/** The Ruby interpreter to use. */
-	const char *ruby;
-
 	/** The Python interpreter to use. */
 	const char *python;
 	
@@ -90,11 +89,6 @@ struct DirConfig {
 	/** The spawn method to use. */
 	SpawnMethod spawnMethod;
 	
-	/** See PoolOptions for more info. */
-	const char *user;
-	/** See PoolOptions for more info. */
-	const char *group;
-	
 	/**
 	 * The idle timeout, in seconds, of preloader processes.
 	 * May also be 0 (which indicates that the application spawner should
@@ -102,37 +96,13 @@ struct DirConfig {
 	 * and the default value should be used).
 	 */
 	long maxPreloaderIdleTime;
-	
-	/**
-	 * The maximum number of requests that the spawned application may process
-	 * before exiting. A value of 0 means unlimited.
-	 */
-	unsigned long maxRequests;
-	
-	/** Indicates whether the maxRequests option was explicitly specified
-	 * in the directory configuration. */
-	bool maxRequestsSpecified;
-	
-	/**
-	 * The minimum number of processes for a group that should be kept in
-	 * the pool when cleaning idle processes. Defaults to 0.
-	 */
-	unsigned long minInstances;
-	
-	/**
-	 * Indicates whether the minInstances option was explicitly specified
-	 * in the directory configuration. */
-	bool minInstancesSpecified;
-	
+
 	/** Whether symlinks in the document root path should be resolved.
 	 * The implication of this is documented in the users guide, section
 	 * "How Phusion Passenger detects whether a virtual host is a web application".
 	 */
 	Threeway resolveSymlinksInDocRoot;
 	
-	/** Whether high performance mode should be turned on. */
-	Threeway highPerformance;
-	
 	/**
 	 * Whether encoded slashes in URLs should be supported. This however conflicts
 	 * with mod_rewrite support because of a bug/limitation in Apache, so it's one
@@ -231,19 +201,27 @@ struct DirConfig {
 		}
 	}
 	
+	unsigned long getMinInstances() const {
+		if (minInstances != UNSET_INT_VALUE) {
+			return minInstances;
+		} else {
+			return 1;
+		}
+	}
+
 	unsigned long getMaxRequests() const {
-		if (maxRequestsSpecified) {
+		if (maxRequests != UNSET_INT_VALUE) {
 			return maxRequests;
 		} else {
 			return 0;
 		}
 	}
-	
-	unsigned long getMinInstances() const {
-		if (minInstancesSpecified) {
-			return minInstances;
+
+	unsigned long getStartTimeout() const {
+		if (startTimeout != UNSET_INT_VALUE) {
+			return startTimeout;
 		} else {
-			return 1;
+			return DEFAULT_START_TIMEOUT / 1000;
 		}
 	}
 	

data/ext/apache2/ConfigurationCommands.cpp

@@ -0,0 +1,95 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  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.
+ */
+
+/*
+ * ConfigurationCommands.cpp is automatically generated from ConfigurationCommands.cpp.erb,
+ * using definitions from lib/phusion_passenger/apache2/config_options.rb.
+ * Edits to ConfigurationCommands.cpp will be lost.
+ *
+ * To update ConfigurationCommands.cpp:
+ *   rake apache2
+ *
+ * To force regeneration of ConfigurationCommands.c:
+ *   rm -f ext/apache2/ConfigurationCommands.cpp
+ *   rake ext/apache2/ConfigurationCommands.cpp
+ */
+
+
+
+
+	AP_INIT_TAKE1("PassengerRuby",
+		(Take1Func) cmd_passenger_ruby,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"The Ruby interpreter to use."),
+
+	AP_INIT_TAKE1("PassengerMinInstances",
+		(Take1Func) cmd_passenger_min_instances,
+		NULL,
+		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
+		"The minimum number of application instances to keep when cleaning idle instances."),
+
+	AP_INIT_TAKE1("PassengerUser",
+		(Take1Func) cmd_passenger_user,
+		NULL,
+		ACCESS_CONF | RSRC_CONF,
+		"The user that Ruby applications must run as."),
+
+	AP_INIT_TAKE1("PassengerGroup",
+		(Take1Func) cmd_passenger_group,
+		NULL,
+		ACCESS_CONF | RSRC_CONF,
+		"The group that Ruby applications must run as."),
+
+	AP_INIT_TAKE1("PassengerMaxRequests",
+		(Take1Func) cmd_passenger_max_requests,
+		NULL,
+		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
+		"The maximum number of requests that an application instance may process."),
+
+	AP_INIT_TAKE1("PassengerStartTimeout",
+		(Take1Func) cmd_passenger_start_timeout,
+		NULL,
+		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
+		"A timeout for application startup."),
+
+	AP_INIT_FLAG("PassengerHighPerformance",
+		(FlagFunc) cmd_passenger_high_performance,
+		NULL,
+		OR_ALL,
+		"Enable or disable Passenger's high performance mode."),
+
+	AP_INIT_FLAG("PassengerEnabled",
+		(FlagFunc) cmd_passenger_enabled,
+		NULL,
+		OR_ALL,
+		"Enable or disable Phusion Passenger."),
+
+	AP_INIT_TAKE1("PassengerMaxRequestQueueSize",
+		(Take1Func) cmd_passenger_max_request_queue_size,
+		NULL,
+		OR_ALL,
+		"The maximum number of queued requests."),
+

data/ext/apache2/ConfigurationCommands.cpp.erb

@@ -0,0 +1,91 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  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.
+ */
+
+/*
+ * ConfigurationCommands.cpp is automatically generated from ConfigurationCommands.cpp.erb,
+ * using definitions from lib/phusion_passenger/apache2/config_options.rb.
+ * Edits to ConfigurationCommands.cpp will be lost.
+ *
+ * To update ConfigurationCommands.cpp:
+ *   rake apache2
+ *
+ * To force regeneration of ConfigurationCommands.c:
+ *   rm -f ext/apache2/ConfigurationCommands.cpp
+ *   rake ext/apache2/ConfigurationCommands.cpp
+ */
+
+<%
+require 'phusion_passenger/apache2/config_options'
+
+def macro_for(option)
+	case option[:type]
+	when :string, :integer
+		return "AP_INIT_TAKE1"
+	when :flag
+		return "AP_INIT_FLAG"
+	else
+		raise "Unknown type #{option[:type].inspect} for option #{option[:name].inspect}"
+	end
+end
+
+def name_for(option)
+	return (option[:aliased_for] || option[:name]).inspect
+end
+
+def function_type_for(option)
+	case option[:type]
+	when :string, :integer
+		return "Take1Func"
+	when :flag
+		return "FlagFunc"
+	else
+		raise "Unknown type #{option[:type].inspect}"
+	end
+end
+
+def function_for(option)
+	function_name = option[:name].gsub(/[A-Z]/) do |letter|
+		"_" + letter[0..0].downcase
+	end
+	return "cmd#{function_name}"
+end
+
+def context_for(option)
+	context = option[:context] || ["OR_OPTIONS", "ACCESS_CONF", "RSRC_CONF"]
+	return context.join(" | ")
+end
+
+def description_for(option)
+	return option[:desc].inspect
+end
+%>
+
+<% for option in APACHE2_DIRECTORY_CONFIGURATION_OPTIONS %>
+	<%= macro_for(option) %>(<%= name_for(option) %>,
+		(<%= function_type_for(option) %>) <%= function_for(option) %>,
+		NULL,
+		<%= context_for(option) %>,
+		<%= description_for(option) %>),
+<% end %>

data/ext/apache2/ConfigurationFields.hpp

@@ -0,0 +1,59 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  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.
+ */
+
+/*
+ * ConfigurationFields.hpp is automatically generated from ConfigurationFields.hpp.erb,
+ * using definitions from lib/phusion_passenger/apache2/config_options.rb.
+ * Edits to ConfigurationFields.hpp will be lost.
+ *
+ * To update ConfigurationFields.hpp:
+ *   rake apache2
+ *
+ * To force regeneration of ConfigurationFields.hpp:
+ *   rm -f ext/apache2/ConfigurationFields.hpp
+ *   rake ext/apache2/ConfigurationFields.hpp
+ */
+
+
+
+	/** Enable or disable Phusion Passenger. */
+	Threeway enabled;
+	/** Enable or disable Passenger's high performance mode. */
+	Threeway highPerformance;
+	/** The maximum number of queued requests. */
+	int maxRequestQueueSize;
+	/** The minimum number of application instances to keep when cleaning idle instances. */
+	int minInstances;
+	/** A timeout for application startup. */
+	int startTimeout;
+	/** The maximum number of requests that an application instance may process. */
+	int maxRequests;
+	/** The group that Ruby applications must run as. */
+	const char *group;
+	/** The user that Ruby applications must run as. */
+	const char *user;
+	/** The Ruby interpreter to use. */
+	const char *ruby;
+

data/ext/apache2/ConfigurationFields.hpp.erb

@@ -0,0 +1,89 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  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.
+ */
+
+/*
+ * ConfigurationFields.hpp is automatically generated from ConfigurationFields.hpp.erb,
+ * using definitions from lib/phusion_passenger/apache2/config_options.rb.
+ * Edits to ConfigurationFields.hpp will be lost.
+ *
+ * To update ConfigurationFields.hpp:
+ *   rake apache2
+ *
+ * To force regeneration of ConfigurationFields.hpp:
+ *   rm -f ext/apache2/ConfigurationFields.hpp
+ *   rake ext/apache2/ConfigurationFields.hpp
+ */
+
+<%
+require 'phusion_passenger/apache2/config_options'
+
+def filter_eligible_options(options)
+	return 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)
+		return option[:field]
+	else
+		result = option[:name].sub(/^Passenger/, '')
+		result[0] = result[0..0].downcase
+		return result
+	end
+end
+
+# Returns [definition_source, estimated_size_on_x86_64, description]
+def definition_for(option)
+	field = struct_field_for(option)
+	case option[:type]
+	when :string
+		result = ["const char *#{field}", 8 + 4]
+	when :integer
+		result = ["int #{field}", 4]
+	when :flag
+		result = ["Threeway #{field}", 1]
+	else
+		raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+	end
+	return result + [option[:desc]]
+end
+
+eligible_options = filter_eligible_options(APACHE2_DIRECTORY_CONFIGURATION_OPTIONS)
+definitions = eligible_options.map { |o| definition_for(o) }
+# Sort the definitions by size in order to make the struct smaller.
+# It's possible to make it even smaller with a smarter algorithm but for now
+# I don't bother.
+definitions.sort! do |d1, d2|
+	d1[1] <=> d2[1]
+end
+%>
+
+<% for definition in definitions -%>
+	/** <%= definition[2] %> */
+	<%= definition[0] %>;
+<% end %>

data/ext/apache2/ConfigurationSetters.cpp

@@ -0,0 +1,223 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  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.
+ */
+
+/*
+ * ConfigurationSetters.cpp is automatically generated from ConfigurationSetters.cpp.erb,
+ * using definitions from lib/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 ext/apache2/ConfigurationSetters.cpp
+ *   rake ext/apache2/ConfigurationSetters.cpp
+ */
+
+
+
+	
+		static const char *
+		cmd_passenger_ruby(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config->ruby = arg;
+			return NULL;
+		}
+	
+	
+		static const char *
+		cmd_passenger_min_instances(cmd_parms *cmd, void *pcfg, const char *arg) {
+			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;
+			
+				} else if (result < 0) {
+					string message = "Value for ";
+					message.append(cmd->directive->directive);
+					message.append(" must be greater than or equal to 0.");
+
+					char *messageStr = (char *) apr_palloc(cmd->temp_pool,
+						message.size() + 1);
+					memcpy(messageStr, message.c_str(), message.size() + 1);
+					return messageStr;
+			
+			} else {
+				config->minInstances = (int) result;
+				return NULL;
+			}
+		}
+	
+	
+		static const char *
+		cmd_passenger_user(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config->user = arg;
+			return NULL;
+		}
+	
+	
+		static const char *
+		cmd_passenger_group(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config->group = arg;
+			return NULL;
+		}
+	
+	
+		static const char *
+		cmd_passenger_max_requests(cmd_parms *cmd, void *pcfg, const char *arg) {
+			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;
+			
+				} else if (result < 0) {
+					string message = "Value for ";
+					message.append(cmd->directive->directive);
+					message.append(" must be greater than or equal to 0.");
+
+					char *messageStr = (char *) apr_palloc(cmd->temp_pool,
+						message.size() + 1);
+					memcpy(messageStr, message.c_str(), message.size() + 1);
+					return messageStr;
+			
+			} else {
+				config->maxRequests = (int) result;
+				return NULL;
+			}
+		}
+	
+	
+		static const char *
+		cmd_passenger_start_timeout(cmd_parms *cmd, void *pcfg, const char *arg) {
+			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;
+			
+				} else if (result < 1) {
+					string message = "Value for ";
+					message.append(cmd->directive->directive);
+					message.append(" must be greater than or equal to 1.");
+
+					char *messageStr = (char *) apr_palloc(cmd->temp_pool,
+						message.size() + 1);
+					memcpy(messageStr, message.c_str(), message.size() + 1);
+					return messageStr;
+			
+			} else {
+				config->startTimeout = (int) result;
+				return NULL;
+			}
+		}
+	
+	
+		static const char *
+		cmd_passenger_high_performance(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config->highPerformance =
+				arg ?
+				DirConfig::ENABLED :
+				DirConfig::DISABLED;
+			return NULL;
+		}
+	
+	
+		static const char *
+		cmd_passenger_enabled(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config->enabled =
+				arg ?
+				DirConfig::ENABLED :
+				DirConfig::DISABLED;
+			return NULL;
+		}
+	
+	
+		static const char *
+		cmd_passenger_max_request_queue_size(cmd_parms *cmd, void *pcfg, const char *arg) {
+			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;
+			
+				} else if (result < 0) {
+					string message = "Value for ";
+					message.append(cmd->directive->directive);
+					message.append(" must be greater than or equal to 0.");
+
+					char *messageStr = (char *) apr_palloc(cmd->temp_pool,
+						message.size() + 1);
+					memcpy(messageStr, message.c_str(), message.size() + 1);
+					return messageStr;
+			
+			} else {
+				config->maxRequestQueueSize = (int) result;
+				return NULL;
+			}
+		}
+	
+