passenger 4.0.14 → 4.0.16

data/ext/apache2/ConfigurationSetters.cpp.erb

@@ -0,0 +1,126 @@
+/*
+ *  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
+ */
+
+<%
+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
+
+def min_value_for(option)
+	return option[:min_value] || 0
+end
+
+def function_for(option)
+	function_name = option[:name].gsub(/[A-Z]/) do |letter|
+		"_" + letter[0..0].downcase
+	end
+	return "cmd#{function_name}"
+end
+%>
+
+<% for option in filter_eligible_options(APACHE2_DIRECTORY_CONFIGURATION_OPTIONS) -%>
+	<% if option[:type] == :string %>
+		static const char *
+		<%= function_for(option) %>(cmd_parms *cmd, void *pcfg, const char *arg) {
+			DirConfig *config = (DirConfig *) pcfg;
+			config-><%= struct_field_for(option) %> = arg;
+			return NULL;
+		}
+	<% elsif option[:type] == :integer %>
+		static const char *
+		<%= function_for(option) %>(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;
+			<% if option[:min_value] %>
+				} 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 %>
+			} else {
+				config-><%= struct_field_for(option) %> = (int) result;
+				return NULL;
+			}
+		}
+	<% elsif option[:type] == :flag %>
+		static const char *
+		<%= function_for(option) %>(cmd_parms *cmd, void *pcfg, const char *arg) {
+			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 %>

data/ext/apache2/CreateDirConfig.cpp

@@ -0,0 +1,50 @@
+/*
+ *  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.
+ */
+
+/*
+ * CreateDirConfig.cpp is automatically generated from CreateDirConfig.cpp.erb,
+ * using definitions from lib/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 ext/apache2/CreateDirConfig.cpp
+ *   rake ext/apache2/CreateDirConfig.cpp
+ */
+
+
+
+			config->ruby = NULL;
+				config->minInstances = UNSET_INT_VALUE;
+				config->user = NULL;
+				config->group = NULL;
+				config->maxRequests = UNSET_INT_VALUE;
+				config->startTimeout = UNSET_INT_VALUE;
+				config->highPerformance = DirConfig::UNSET;
+				config->enabled = DirConfig::UNSET;
+				config->maxRequestQueueSize = UNSET_INT_VALUE;
+	

data/ext/apache2/CreateDirConfig.cpp.erb

@@ -0,0 +1,71 @@
+/*
+ *  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.
+ */
+
+/*
+ * CreateDirConfig.cpp is automatically generated from CreateDirConfig.cpp.erb,
+ * using definitions from lib/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 ext/apache2/CreateDirConfig.cpp
+ *   rake ext/apache2/CreateDirConfig.cpp
+ */
+
+<%
+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
+%>
+
+<% for option in filter_eligible_options(APACHE2_DIRECTORY_CONFIGURATION_OPTIONS) -%>
+	<% if option[:type] == :string -%>
+		config-><%= struct_field_for(option) %> = NULL;
+	<% elsif option[:type] == :integer -%>
+		config-><%= struct_field_for(option) %> = UNSET_INT_VALUE;
+	<% elsif option[:type] == :flag -%>
+		config-><%= struct_field_for(option) %> = DirConfig::UNSET;
+	<% else
+		raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+	end -%>
+<% end %>

data/ext/apache2/Hooks.cpp

@@ -976,6 +976,10 @@ private:
 		addHeader(output, "PASSENGER_SPAWN_METHOD", config->getSpawnMethodString());
 		addHeader(output, "PASSENGER_USER", config->getUser());
 		addHeader(output, "PASSENGER_GROUP", config->getGroup());
+		if (config->maxRequestQueueSize != UNSET_INT_VALUE) {
+			addHeader(output, "PASSENGER_MAX_REQUEST_QUEUE_SIZE",
+				apr_psprintf(r->pool, "%d", config->maxRequestQueueSize));
+		}
 		addHeader(output, "PASSENGER_APP_TYPE", mapper.getApplicationTypeName());
 		addHeader(output, "PASSENGER_MIN_INSTANCES",
 			apr_psprintf(r->pool, "%ld", config->getMinInstances()));
@@ -985,6 +989,8 @@ private:
 		addHeader(output, "PASSENGER_SHOW_VERSION_IN_HEADER", "true");
 		addHeader(output, "PASSENGER_MAX_REQUESTS",
 			apr_psprintf(r->pool, "%ld", config->getMaxRequests()));
+		addHeader(output, "PASSENGER_START_TIMEOUT",
+			apr_psprintf(r->pool, "%ld", config->getStartTimeout()));
 		addHeader(output, "PASSENGER_STAT_THROTTLE_RATE",
 			apr_psprintf(r->pool, "%ld", config->getStatThrottleRate()));
 		addHeader(output, "PASSENGER_RESTART_DIR", config->getRestartDir());

data/ext/apache2/MergeDirConfig.cpp

@@ -0,0 +1,103 @@
+/*
+ *  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.
+ */
+
+/*
+ * MergeDirConfig.cpp is automatically generated from MergeDirConfig.cpp.erb,
+ * using definitions from lib/phusion_passenger/apache2/config_options.rb.
+ * Edits to MergeDirConfig.cpp will be lost.
+ *
+ * To update MergeDirConfig.cpp:
+ *   rake apache2
+ *
+ * To force regeneration of MergeDirConfig.cpp:
+ *   rm -f ext/apache2/MergeDirConfig.cpp
+ *   rake ext/apache2/MergeDirConfig.cpp
+ */
+
+
+
+
+	
+		config->ruby =
+			(add->ruby == NULL) ?
+			base->ruby :
+			add->ruby;
+	
+
+	
+		config->minInstances =
+			(add->minInstances == UNSET_INT_VALUE) ?
+			base->minInstances :
+			add->minInstances;
+	
+
+	
+		config->user =
+			(add->user == NULL) ?
+			base->user :
+			add->user;
+	
+
+	
+		config->group =
+			(add->group == NULL) ?
+			base->group :
+			add->group;
+	
+
+	
+		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;
+	

data/ext/apache2/MergeDirConfig.cpp.erb

@@ -0,0 +1,81 @@
+/*
+ *  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.
+ */
+
+/*
+ * MergeDirConfig.cpp is automatically generated from MergeDirConfig.cpp.erb,
+ * using definitions from lib/phusion_passenger/apache2/config_options.rb.
+ * Edits to MergeDirConfig.cpp will be lost.
+ *
+ * To update MergeDirConfig.cpp:
+ *   rake apache2
+ *
+ * To force regeneration of MergeDirConfig.cpp:
+ *   rm -f ext/apache2/MergeDirConfig.cpp
+ *   rake ext/apache2/MergeDirConfig.cpp
+ */
+
+<%
+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 =~ /\./ ||
+			!option.fetch(:auto_generate_nginx_merge_code, true)
+	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
+%>
+
+<% for option in filter_eligible_options(APACHE2_DIRECTORY_CONFIGURATION_OPTIONS) %>
+	<% if option[:type] == :string %>
+		config-><%= struct_field_for(option) %> =
+			(add-><%= struct_field_for(option) %> == NULL) ?
+			base-><%= struct_field_for(option) %> :
+			add-><%= struct_field_for(option) %>;
+	<% elsif option[:type] == :integer %>
+		config-><%= struct_field_for(option) %> =
+			(add-><%= struct_field_for(option) %> == UNSET_INT_VALUE) ?
+			base-><%= struct_field_for(option) %> :
+			add-><%= struct_field_for(option) %>;
+	<% elsif option[:type] == :flag %>
+		config-><%= struct_field_for(option) %> =
+			(add-><%= struct_field_for(option) %> == DirConfig::UNSET) ?
+			base-><%= struct_field_for(option) %> :
+			add-><%= struct_field_for(option) %>;
+	<% else
+		raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+	end %>
+<% end %>