passenger 5.0.28 → 5.0.29

data/src/apache2_module/ConfigurationCommands.cpp.cxxcodebuilder

@@ -0,0 +1,127 @@
+#  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{
+    ConfigurationCommands.cpp is automatically generated from ConfigurationCommands.cpp.cxxcodebuilder,
+    using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
+    Edits to ConfigurationCommands.cpp will be lost.
+
+    To update ConfigurationCommands.cpp:
+      rake apache2
+
+    To force regeneration of ConfigurationCommands.cpp:
+      rm -f src/apache2_module/ConfigurationCommands.cpp
+      rake src/apache2_module/ConfigurationCommands.cpp
+  }
+
+  separator
+
+  APACHE2_DIRECTORY_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),
+      context_for(option),
+      description_for(option))
+    add_code(code)
+  end
+end
+
+def resolve_possible_alias(option)
+  if option[:alias_for]
+    the_alias = APACHE2_DIRECTORY_CONFIGURATION_OPTIONS.find do |o|
+      o[:name] == option[:alias_for]
+    end.dup
+    the_alias[:aliased_for] = option[:name]
+    the_alias
+  else
+    option
+  end
+end
+
+def macro_for(option)
+  case option[:type]
+  when :string, :integer
+    "AP_INIT_TAKE1"
+  when :flag
+    "AP_INIT_FLAG"
+  else
+    raise "Unknown type #{option[:type].inspect} for option #{option[:name].inspect}"
+  end
+end
+
+def name_for(option)
+  str_val(option[:aliased_for] || option[:name])
+end
+
+def function_type_for(option)
+  case option[:type]
+  when :string, :integer
+    "Take1Func"
+  when :flag
+    "FlagFunc"
+  else
+    raise "Unknown type #{option[:type].inspect}"
+  end
+end
+
+def function_for(option)
+  if option[:function]
+    option[:function]
+  else
+    function_name = option[:name].gsub(/[A-Z]/) do |letter|
+      "_" + letter[0..0].downcase
+    end
+    "cmd#{function_name}"
+  end
+end
+
+def context_for(option)
+  context = option[:context] || ["OR_OPTIONS", "ACCESS_CONF", "RSRC_CONF"]
+  context.join(" | ")
+end
+
+def description_for(option)
+  option[:desc].inspect
+end
+
+main

data/src/apache2_module/ConfigurationFields.hpp

@@ -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.
  */
 
 /*
- * ConfigurationFields.hpp is automatically generated from ConfigurationFields.hpp.erb,
+ * ConfigurationFields.hpp is automatically generated from ConfigurationFields.hpp.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
  * Edits to ConfigurationFields.hpp will be lost.
  *
@@ -40,64 +40,148 @@
 struct GeneratedDirConfigPart {
 	enum Threeway { ENABLED, DISABLED, UNSET };
 
-
-	/** Whether to buffer file uploads. */
+	/*
+	 * Whether to buffer file uploads.
+	 */
 	Threeway bufferUpload;
-	/** Enable or disable Phusion Passenger. */
+
+	/*
+	 * Enable or disable Phusion Passenger.
+	 */
 	Threeway enabled;
-	/** Allow Apache to handle error response. */
+
+	/*
+	 * Allow Apache to handle error response.
+	 */
 	Threeway errorOverride;
-	/** Whether to display friendly error pages when something goes wrong. */
+
+	/*
+	 * Whether to display friendly error pages when something goes wrong.
+	 */
 	Threeway friendlyErrorPages;
-	/** Enable or disable Passenger's high performance mode. */
+
+	/*
+	 * Enable or disable Passenger's high performance mode.
+	 */
 	Threeway highPerformance;
-	/** Whether to load environment variables from the shell before running the application. */
+
+	/*
+	 * Whether to load environment variables from the shell before running the application.
+	 */
 	Threeway loadShellEnvvars;
-	/** Whether to show the Phusion Passenger version number in the X-Powered-By header. */
+
+	/*
+	 * Whether to show the Phusion Passenger version number in the X-Powered-By header.
+	 */
 	Threeway showVersionInHeader;
-	/** Whether to enable sticky sessions. */
+
+	/*
+	 * Whether to enable sticky sessions.
+	 */
 	Threeway stickySessions;
-	/** The cookie name to use for sticky sessions. */
+
+	/*
+	 * The cookie name to use for sticky sessions.
+	 */
 	Threeway stickySessionsCookieName;
-	/** Force Passenger to believe that an application process can handle the given number of concurrent requests per process */
+
+	/*
+	 * Force Passenger to believe that an application process can handle the given number of concurrent requests per process
+	 */
 	int forceMaxConcurrentRequestsPerProcess;
-	/** Minimum user id starting from which entering LVE and CageFS is allowed. */
+
+	/*
+	 * Minimum user id starting from which entering LVE and CageFS is allowed.
+	 */
 	int lveMinUid;
-	/** The maximum number of simultaneously alive application instances a single application may occupy. */
+
+	/*
+	 * The maximum number of simultaneously alive application instances a single application may occupy.
+	 */
 	int maxInstancesPerApp;
-	/** The maximum number of seconds that a preloader process may be idle before it is shutdown. */
+
+	/*
+	 * The maximum number of seconds that a preloader process may be idle before it is shutdown.
+	 */
 	int maxPreloaderIdleTime;
-	/** The maximum number of queued requests. */
+
+	/*
+	 * The maximum number of queued requests.
+	 */
 	int maxRequestQueueSize;
-	/** The maximum number of requests that an application instance may process. */
+
+	/*
+	 * The maximum number of requests that an application instance may process.
+	 */
 	int maxRequests;
-	/** The minimum number of application instances to keep when cleaning idle instances. */
+
+	/*
+	 * The minimum number of application instances to keep when cleaning idle instances.
+	 */
 	int minInstances;
-	/** A timeout for application startup. */
+
+	/*
+	 * A timeout for application startup.
+	 */
 	int startTimeout;
-	/** The environment under which applications are run. */
+
+	/*
+	 * The environment under which applications are run.
+	 */
 	const char *appEnv;
-	/** Application process group name. */
+
+	/*
+	 * Application process group name.
+	 */
 	const char *appGroupName;
-	/** Force specific application type. */
+
+	/*
+	 * Force specific application type.
+	 */
 	const char *appType;
-	/** The group that Ruby applications must run as. */
+
+	/*
+	 * The group that Ruby applications must run as.
+	 */
 	const char *group;
-	/** Settings file for (non-bundled) Meteor apps. */
+
+	/*
+	 * Settings file for (non-bundled) Meteor apps.
+	 */
 	const char *meteorAppSettings;
-	/** The Node.js command to use. */
+
+	/*
+	 * The Node.js command to use.
+	 */
 	const char *nodejs;
-	/** The Python interpreter to use. */
+
+	/*
+	 * The Python interpreter to use.
+	 */
 	const char *python;
-	/** The directory in which Passenger should look for restart.txt. */
+
+	/*
+	 * The directory in which Passenger should look for restart.txt.
+	 */
 	const char *restartDir;
-	/** The Ruby interpreter to use. */
+
+	/*
+	 * The Ruby interpreter to use.
+	 */
 	const char *ruby;
-	/** The spawn method to use. */
+
+	/*
+	 * The spawn method to use.
+	 */
 	const char *spawnMethod;
-	/** Force specific startup file. */
+
+	/*
+	 * Force specific startup file.
+	 */
 	const char *startupFile;
-	/** The user that Ruby applications must run as. */
-	const char *user;
 
+	/*
+	 * The user that Ruby applications must run as.
+	 */
+	const char *user;
 };

data/src/apache2_module/ConfigurationFields.hpp.cxxcodebuilder

@@ -0,0 +1,113 @@
+#  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{
+    ConfigurationFields.hpp is automatically generated from ConfigurationFields.hpp.cxxcodebuilder,
+    using definitions from src/ruby_supportlib/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 src/apache2_module/ConfigurationFields.hpp
+      rake src/apache2_module/ConfigurationFields.hpp
+  }
+
+  separator
+
+  struct 'GeneratedDirConfigPart' do
+    add_code 'enum Threeway { ENABLED, DISABLED, UNSET };'
+
+    definitions.each do |definition|
+      separator
+      comment(definition[3])
+      field(definition[0])
+    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
+
+# 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, field, option[:desc]]
+  when :integer
+    result = ["int #{field}", 4, field, option[:desc]]
+  when :flag
+    result = ["Threeway #{field}", 1, field, option[:desc]]
+  else
+    raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+  end
+  result + [option[:desc]]
+end
+
+def definitions
+  @definitions ||= begin
+    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|
+      if d1[1] == d2[1]
+        # After sorting on size, sort alphabetically.
+        d1[2] <=> d2[2]
+      else
+        d1[1] <=> d2[1]
+      end
+    end
+  end
+end
+
+main