passenger 5.1.12 → 5.2.0

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h.cxxcodebuilder

@@ -0,0 +1,230 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2017 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/cxxcodebuilder
+
+require 'phusion_passenger/apache2/config_options'
+
+def main
+  comment copyright_header_for(__FILE__), 1
+
+  separator
+
+  comment %q{
+    DirConfig/AutoGeneratedStruct.h is automatically generated from DirConfig/AutoGeneratedStruct.h.cxxcodebuilder,
+    using definitions from src/ruby_supportlib/phusion_passenger/apache2/config_options.rb.
+    Edits to DirConfig/AutoGeneratedStruct.h will be lost.
+
+    To update DirConfig/AutoGeneratedStruct.h:
+      rake apache2
+
+    To force regeneration of DirConfig/AutoGeneratedStruct.h:
+      rm -f src/apache2_module/DirConfig/AutoGeneratedStruct.h
+      rake src/apache2_module/DirConfig/AutoGeneratedStruct.h
+  }
+
+  separator
+
+  struct 'AutoGeneratedDirConfig' do
+    definitions.each do |definition|
+      separator
+      comment(definition[3][:desc])
+      field(definition[0])
+    end
+
+    separator
+    separator
+
+    definitions.each do |definition|
+      field("StaticString #{definition[2]}SourceFile")
+    end
+
+    separator
+
+    definitions.each do |definition|
+      field("unsigned int #{definition[2]}SourceLine")
+    end
+
+    separator
+
+    definitions.each do |definition|
+      field("bool #{definition[2]}ExplicitlySet: 1")
+    end
+
+    separator
+    separator
+
+    definitions.each do |definition|
+      add_getter_function(definition)
+    end
+  end
+end
+
+def filter_eligible_options(options)
+  options.reject do |option|
+    option[:alias_for] ||
+      option[:obsolete] ||
+      option[:context] == :global ||
+      option.fetch(:field, true).nil? ||
+      option[:field].to_s =~ /\./
+  end
+end
+
+def struct_field_for(option)
+  if option.key?(:field)
+    option[:field]
+  else
+    result = option[:name].sub(/^Passenger/, '')
+    "m#{result}"
+  end
+end
+
+# Returns [definition_source, estimated_size_on_x86_64, name, description]
+def definition_for(option)
+  field = struct_field_for(option)
+  case option[:type]
+  when :string
+    result = ["StaticString #{field}", 8 + 4]
+  when :integer
+    result = ["int #{field}", 4]
+  when :flag
+    result = ["Threeway #{field}", 1]
+  when :string_set
+    result = ["std::set<std::string> #{field}", 24]
+  else
+    raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+  end
+  result + [field, option]
+end
+
+def definitions
+  @definitions ||= begin
+    eligible_options = filter_eligible_options(APACHE2_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
+
+def add_getter_function(definition)
+  field_name = definition[2]
+  option = definition[3]
+
+  func_name = definition[2][1..-1]
+  func_name = "get#{func_name}"
+
+  if option.key?(:default_expr)
+    default_expr = option[:default_expr]
+  elsif option.key?(:default)
+    default_expr = option[:default].inspect
+  end
+
+  case option[:type]
+  when :string
+    if option.key?(:default_expr)
+      default_expr = option[:default_expr]
+    elsif option.key?(:default)
+      default_expr = "P_STATIC_STRING(#{option[:default].inspect})"
+    end
+    if default_expr
+      function("StaticString #{func_name}() const") do
+        add_code %Q{
+          if (#{field_name}.empty()) {
+            return #{default_expr};
+          } else {
+            return #{field_name};
+          }
+        }
+      end
+    else
+      function("StaticString #{func_name}() const") do
+        add_code %Q{return #{field_name};}
+      end
+    end
+  when :integer
+    if option.key?(:default_expr)
+      default_expr = option[:default_expr]
+    elsif option.key?(:default)
+      default_expr = option[:default].inspect
+    end
+    if default_expr
+      function("int #{func_name}() const") do
+        add_code %Q{
+          if (#{field_name} == UNSET_INT_VALUE) {
+            return #{default_expr};
+          } else {
+            return #{field_name};
+          }
+        }
+      end
+    else
+      function("int #{func_name}() const") do
+        add_code %Q{return #{field_name};}
+      end
+    end
+  when :flag
+    if option.key?(:default_expr)
+      default_expr = option[:default_expr]
+    elsif option.key?(:default)
+      default_expr = option[:default].inspect
+    end
+    if default_expr
+      function("bool #{func_name}() const") do
+        add_code %Q{
+          if (#{field_name} == Apache2Module::UNSET) {
+            return #{default_expr};
+          } else {
+            return #{field_name} == Apache2Module::ENABLED;
+          }
+        }
+      end
+    else
+      function("Threeway #{func_name}() const") do
+        add_code %Q{return #{field_name};}
+      end
+    end
+  when :string_set
+    if option.key?(:default_expr) || option.key?(:default)
+      raise "Default values for option type #{option[:type].inspect} (option #{option[:name]}) not yet supported"
+    else
+      function("const std::set<std::string> &#{func_name}() const") do
+        add_code %Q{return #{field_name};}
+      end
+    end
+  else
+    raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+  end
+end
+
+main

data/src/apache2_module/DirectoryMapper.h

@@ -23,8 +23,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_DIRECTORY_MAPPER_H_
-#define _PASSENGER_DIRECTORY_MAPPER_H_
+#ifndef _PASSENGER_APACHE2_DIRECTORY_MAPPER_H_
+#define _PASSENGER_APACHE2_DIRECTORY_MAPPER_H_
 
 #include <string>
 #include <set>
@@ -33,17 +33,19 @@
 #include <oxt/backtrace.hpp>
 #include <boost/thread.hpp>
 
-#include "Configuration.hpp"
 #include <AppTypes.h>
 #include <Utils.h>
 #include <Utils/CachedFileStat.hpp>
 
-// The Apache/APR headers *must* come after the Boost headers, otherwise
-// compilation will fail on OpenBSD.
+// The APR headers must come after the Passenger headers.
+// See Hooks.cpp to learn why.
 #include <httpd.h>
 #include <http_core.h>
+#include "Config.h"
+
 
 namespace Passenger {
+namespace Apache2Module {
 
 using namespace std;
 using namespace oxt;
@@ -82,11 +84,11 @@ private:
 	bool autoDetectionDone: 1;
 
 	const char *findBaseURI() const {
-		set<string>::const_iterator it, end = config->baseURIs.end();
+		set<string>::const_iterator it, end = config->getBaseURIs().end();
 		const char *uri = r->uri;
 		size_t uri_len = strlen(uri);
 
-		for (it = config->baseURIs.begin(); it != end; it++) {
+		for (it = config->getBaseURIs().begin(); it != end; it++) {
 			const string &base = *it;
 
 			if (base == "/") {
@@ -147,21 +149,21 @@ private:
 		AppTypeDetector detector(cstat, cstatMutex, throttleRate);
 		PassengerAppType appType;
 		string appRoot;
-		if (config->appType == NULL) {
-			if (config->appRoot == NULL) {
+		if (config->getAppType().empty()) {
+			if (config->getAppRoot().empty()) {
 				appType = detector.checkDocumentRoot(publicDir,
-					baseURI != NULL || config->resolveSymlinksInDocRoot == DirConfig::ENABLED,
+					baseURI != NULL,
 					&appRoot);
 			} else {
-				appRoot = config->appRoot;
+				appRoot = config->getAppRoot();
 				appType = detector.checkAppRoot(appRoot);
 			}
 		} else {
-			if (config->appRoot == NULL) {
+			if (config->getAppRoot().empty()) {
 				appType = PAT_NONE;
 			} else {
-				appRoot = config->appRoot;
-				appType = getAppType(config->appType);
+				appRoot = config->getAppRoot().toString();
+				appType = getAppType(config->getAppType());
 			}
 		}
 
@@ -268,7 +270,8 @@ public:
 	}
 };
 
-} // namespace Passenger
 
-#endif /* _PASSENGER_DIRECTORY_MAPPER_H_ */
+} // namespace Apache2Module
+} // namespace Passenger
 
+#endif /* _PASSENGER_APACHE2_DIRECTORY_MAPPER_H_ */

data/src/apache2_module/Hooks.cpp

@@ -38,6 +38,9 @@
  * prepareRequest() and handleRequest() can be comfortably run.
  */
 
+// In Apache < 2.4, this macro was necessary for core_dir_config and other structs
+#define CORE_PRIVATE
+
 #include <boost/thread.hpp>
 
 #include <sys/time.h>
@@ -52,11 +55,13 @@
 #include <oxt/macros.hpp>
 #include <oxt/backtrace.hpp>
 #include <oxt/detail/context.hpp>
-#include "Hooks.h"
 #include "Bucket.h"
-#include "Configuration.hpp"
+#include "Config.h"
 #include "DirectoryMapper.h"
+#include "Utils.h"
 #include <modp_b64.h>
+#include <FileTools/FileManip.h>
+#include <FileTools/FileManip.h>
 #include <Utils.h>
 #include <Utils/IOUtils.h>
 #include <Utils/StrIntUtils.h>
@@ -64,6 +69,7 @@
 #include <Utils/HttpConstants.h>
 #include <Utils/ReleaseableScopedPointer.h>
 #include <LoggingKit/LoggingKit.h>
+#include <LoggingKit/Context.h>
 #include <WatchdogLauncher.h>
 #include <Constants.h>
 
@@ -84,8 +90,8 @@
 #include <apr_lib.h>
 #include <unixd.h>
 
-using namespace std;
-using namespace Passenger;
+#include "DirConfig/AutoGeneratedHeaderSerialization.cpp"
+
 
 extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
 
@@ -104,11 +110,12 @@ extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
 #endif
 
 
-/**
- * Apache hook functions, wrapped in a class.
- *
- * @ingroup Core
- */
+namespace Passenger {
+namespace Apache2Module {
+
+using namespace std;
+
+
 class Hooks {
 private:
 	class ErrorReport {
@@ -229,6 +236,31 @@ private:
 	WatchdogLauncher watchdogLauncher;
 	boost::mutex cstatMutex;
 
+	static Json::Value strsetToJson(const set<string> &input) {
+		Json::Value result(Json::arrayValue);
+		set<string>::const_iterator it, end = input.end();
+		for (it = input.begin(); it != end; it++) {
+			result.append(*it);
+		}
+		return result;
+	}
+
+	static Json::Value nonEmptyString(const char *str) {
+		if (str != NULL && *str != '\0') {
+			return str;
+		} else {
+			return Json::Value();
+		}
+	}
+
+	static Json::Value nonEmptyString(const string &str) {
+		if (str.empty()) {
+			return Json::Value();
+		} else {
+			return str;
+		}
+	}
+
 	inline DirConfig *getDirConfig(request_rec *r) {
 		return (DirConfig *) ap_get_module_config(r->per_dir_config, &passenger_module);
 	}
@@ -402,7 +434,7 @@ private:
 	 *   handler shouldn't be run.
 	 * - If D is not true, then the handler should be run.
 	 *
-	 * @pre config->isEnabled()
+	 * @pre config->getEnabled()
 	 * @param coreModuleWillBeRun Whether the core.c map_to_storage hook might be called after this.
 	 * @return Whether the Phusion Passenger handler hook method should be run.
 	 *         When true, this method will save a request note object so that future hooks
@@ -680,7 +712,7 @@ private:
 				apr_table_setn(r->headers_out, "Status", r->status_line);
 
 				UPDATE_TRACE_POINT();
-				if (config->errorOverride == DirConfig::ENABLED
+				if (config->getErrorOverride()
 				 && ap_is_HTTP_ERROR(r->status))
 				{
 					/* Send ErrorDocument.
@@ -824,44 +856,6 @@ private:
 		return strstr(buffer, "upgrade");
 	}
 
-	void addHeader(string &headers, const StaticString &name, const char *value) {
-		if (value != NULL) {
-			headers.append(name.data(), name.size());
-			headers.append(": ", 2);
-			headers.append(value);
-			headers.append("\r\n", 2);
-		}
-	}
-
-	void addHeader(string &headers, const StaticString &name, const StaticString &value) {
-		headers.append(name.data(), name.size());
-		headers.append(": ", 2);
-		headers.append(value.data(), value.size());
-		headers.append("\r\n", 2);
-	}
-
-	void addHeader(request_rec *r, string &headers, const StaticString &name, int value) {
-		if (value != UNSET_INT_VALUE) {
-			headers.append(name.data(), name.size());
-			headers.append(": ", 2);
-			headers.append(apr_psprintf(r->pool, "%d", value));
-			headers.append("\r\n", 2);
-		}
-	}
-
-	void addHeader(string &headers, const StaticString &name, DirConfig::Threeway value) {
-		if (value != DirConfig::UNSET) {
-			headers.append(name.data(), name.size());
-			headers.append(": ", 2);
-			if (value == DirConfig::ENABLED) {
-				headers.append("t", 1);
-			} else {
-				headers.append("f", 1);
-			}
-			headers.append("\r\n", 2);
-		}
-	}
-
 	string constructRequestHeaders(request_rec *r, DirectoryMapper &mapper,
 		bool &bodyIsChunked)
 	{
@@ -875,7 +869,7 @@ private:
 		result.append(r->method);
 		result.append(" ", 1);
 
-		if (config->allowsEncodedSlashes()) {
+		if (config->getAllowEncodedSlashes()) {
 			/*
 			 * Apache decodes encoded slashes in r->uri, so we must use r->unparsed_uri
 			 * if we are to support encoded slashes. However mod_rewrite doesn't change
@@ -975,13 +969,14 @@ private:
 		addHeader(result, P_STATIC_STRING("!~REMOTE_USER"), r->user);
 
 		// App group name.
-		if (config->appGroupName == NULL) {
+		if (config->getAppGroupName().empty()) {
 			result.append("!~PASSENGER_APP_GROUP_NAME: ",
 				sizeof("!~PASSENGER_APP_GROUP_NAME: ") - 1);
 			result.append(mapper.getAppRoot());
-			if (config->appEnv != NULL) {
+			if (!config->getAppEnv().empty()) {
 				result.append(" (", 2);
-				result.append(config->appEnv);
+				result.append(config->getAppEnv().data(),
+					config->getAppEnv().size());
 				result.append(")", 1);
 			}
 			result.append("\r\n", 2);
@@ -990,15 +985,7 @@ private:
 		// Phusion Passenger options.
 		addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_ROOT"), mapper.getAppRoot());
 		addHeader(result, P_STATIC_STRING("!~PASSENGER_APP_TYPE"), mapper.getApplicationTypeName());
-		if (config->useUnionStation() && !config->unionStationKey.empty()) {
-			addHeader(result, P_STATIC_STRING("!~UNION_STATION_SUPPORT"), P_STATIC_STRING("t"));
-			addHeader(result, P_STATIC_STRING("!~UNION_STATION_KEY"), config->unionStationKey);
-			if (!config->unionStationFilters.empty()) {
-				addHeader(result, P_STATIC_STRING("!~UNION_STATION_FILTERS"),
-					config->getUnionStationFilterString());
-			}
-		}
-		#include "SetHeaders.cpp"
+		constructRequestHeaders_autoGenerated(r, config, result);
 
 		/*********************/
 		/*********************/
@@ -1051,7 +1038,7 @@ private:
 		// S = SSL
 
 		result.append("!~FLAGS: CD", sizeof("!~FLAGS: CD") - 1);
-		if (config->bufferUpload != DirConfig::DISABLED) {
+		if (config->getBufferUpload()) {
 			result.append("B", 1);
 		}
 		if (lookupEnv(r, "HTTPS") != NULL) {
@@ -1260,17 +1247,17 @@ public:
 	    : cstat(1024),
 	      watchdogLauncher(IM_APACHE)
 	{
-		passenger_postprocess_config(s);
+		postprocessConfig(s, pconf, ptemp);
 
 		Json::Value loggingConfig;
 		loggingConfig["level"] = LoggingKit::Level(serverConfig.logLevel);
 		loggingConfig["redirect_stderr"] = false;
-		if (serverConfig.logFile != NULL) {
-			loggingConfig["target"] = serverConfig.logFile;
+		if (!serverConfig.logFile.empty()) {
+			loggingConfig["target"] = serverConfig.logFile.toString();
 		}
-		if (serverConfig.fileDescriptorLogFile != NULL) {
+		if (!serverConfig.fileDescriptorLogFile.empty()) {
 			loggingConfig["file_descriptor_log_target"] =
-				serverConfig.fileDescriptorLogFile;
+				serverConfig.fileDescriptorLogFile.toString();
 		}
 
 		vector<ConfigKit::Error> errors;
@@ -1298,7 +1285,7 @@ public:
 		P_DEBUG("Initializing Phusion Passenger...");
 		ap_add_version_component(pconf, SERVER_TOKEN_NAME "/" PASSENGER_VERSION);
 
-		if (serverConfig.root == NULL) {
+		if (serverConfig.root.empty()) {
 			throw ConfigurationException("The 'PassengerRoot' configuration option "
 				"is not specified. This option is required, so please specify it. "
 				"TIP: The correct value for this option was given to you by "
@@ -1318,40 +1305,34 @@ public:
 			webServerVersion.append(version.add_string);
 		}
 
-		VariantMap params;
-		params
-			.setPid ("web_server_control_process_pid", getpid())
-			.set    ("server_software", webServerDesc)
-			.set    ("server_version", webServerVersion)
-			.setBool("multi_app", true)
-			.setBool("load_shell_envvars", true)
-			.set    ("file_descriptor_log_file", (serverConfig.fileDescriptorLogFile == NULL)
-				? "" : serverConfig.fileDescriptorLogFile)
-			.setInt	("socket_backlog", serverConfig.socketBacklog)
-			.set    ("data_buffer_dir", serverConfig.dataBufferDir)
-			.set    ("instance_registry_dir", serverConfig.instanceRegistryDir)
-			.setBool("disable_security_update_check", serverConfig.disableSecurityUpdateCheck)
-			.set    ("security_update_check_proxy", serverConfig.securityUpdateCheckProxy)
-			.setBool("user_switching", serverConfig.userSwitching)
-			.set    ("default_user", serverConfig.defaultUser)
-			.set    ("default_group", serverConfig.defaultGroup)
-			.set    ("default_ruby", serverConfig.defaultRuby)
-			.setInt ("max_pool_size", serverConfig.maxPoolSize)
-			.setInt ("pool_idle_time", serverConfig.poolIdleTime)
-			.setInt ("response_buffer_high_watermark", serverConfig.responseBufferHighWatermark)
-			.setInt ("stat_throttle_rate", serverConfig.statThrottleRate)
-			.set    ("analytics_log_user", serverConfig.analyticsLogUser)
-			.set    ("analytics_log_group", serverConfig.analyticsLogGroup)
-			.setBool("union_station_support", serverConfig.unionStationSupport)
-			.set    ("union_station_gateway_address", serverConfig.unionStationGatewayAddress)
-			.setInt ("union_station_gateway_port", serverConfig.unionStationGatewayPort)
-			.set    ("union_station_gateway_cert", serverConfig.unionStationGatewayCert)
-			.set    ("union_station_proxy_address", serverConfig.unionStationProxyAddress)
-			.setBool("turbocaching", serverConfig.turbocaching)
-			.setStrSet("prestart_urls", serverConfig.prestartURLs);
-
-		if (serverConfig.logFile != NULL) {
-			params.set("log_file", serverConfig.logFile);
+		// Note: WatchdogLauncher::start() sets a number of default values.
+		Json::Value config;
+		config["web_server_module_version"] = PASSENGER_VERSION;
+		config["web_server_version"] = webServerVersion;
+		config["server_software"] = webServerDesc;
+		config["multi_app"] = true;
+		config["default_load_shell_envvars"] = true;
+		config["config_manifest"] = serverConfig.manifest;
+		config["file_descriptor_log_target"] = nonEmptyString(serverConfig.fileDescriptorLogFile);
+		config["controller_socket_backlog"] = serverConfig.socketBacklog;
+		config["controller_file_buffered_channel_buffer_dir"] = nonEmptyString(serverConfig.dataBufferDir);
+		config["instance_registry_dir"] = nonEmptyString(serverConfig.instanceRegistryDir);
+		config["security_update_checker_disabled"] = serverConfig.disableSecurityUpdateCheck;
+		config["security_update_checker_proxy_url"] = nonEmptyString(serverConfig.securityUpdateCheckProxy);
+		config["user_switching"] = serverConfig.userSwitching;
+		config["default_user"] = serverConfig.defaultUser.toString();
+		config["default_group"] = serverConfig.defaultGroup.toString();
+		config["default_ruby"] = serverConfig.defaultRuby.toString();
+		config["show_version_in_header"] = serverConfig.showVersionInHeader;
+		config["max_pool_size"] = serverConfig.maxPoolSize;
+		config["pool_idle_time"] = serverConfig.poolIdleTime;
+		config["response_buffer_high_watermark"] = serverConfig.responseBufferHighWatermark;
+		config["stat_throttle_rate"] = serverConfig.statThrottleRate;
+		config["turbocaching"] = serverConfig.turbocaching;
+		config["prestart_urls"] = strsetToJson(serverConfig.prestartURLs);
+
+		if (!serverConfig.logFile.empty()) {
+			config["log_target"] = serverConfig.logFile.toString();
 		} else if (s->error_fname == NULL) {
 			throw ConfigurationException("Cannot initialize " PROGRAM_NAME
 				" because Apache is not configured with an error log file."
@@ -1369,14 +1350,18 @@ public:
 				" support logging to syslog. Please configure " SHORT_PROGRAM_NAME
 				" with an explicit log file using the `PassengerLogFile` directive.");
 		} else {
-			params.set("log_file", ap_server_root_relative(pconf, s->error_fname));
-			params.setBool("log_file_is_stderr", stderrEqualsFile(
-				ap_server_root_relative(pconf, s->error_fname)));
+			config["log_target"]["path"] = ap_server_root_relative(pconf, s->error_fname);
+			if (stderrEqualsFile(ap_server_root_relative(pconf, s->error_fname))) {
+				config["log_target"]["stderr"] = true;
+			}
 		}
 
-		serverConfig.ctl.addTo(params);
+		Json::Value::iterator it, end = serverConfig.ctl.end();
+		for (it = serverConfig.ctl.begin(); it != end; it++) {
+			config[it.name()] = *it;
+		}
 
-		watchdogLauncher.start(serverConfig.root, params);
+		watchdogLauncher.start(serverConfig.root, config);
 	}
 
 	void childInit(apr_pool_t *pchild, server_rec *s) {
@@ -1385,7 +1370,9 @@ public:
 
 	int prepareRequestWhenInHighPerformanceMode(request_rec *r) {
 		DirConfig *config = getDirConfig(r);
-		if (config->isEnabled() && config->highPerformanceMode()) {
+		if (config->getEnabled()
+			&& config->getHighPerformance())
+		{
 			if (prepareRequest(r, config, r->filename, true)) {
 				return OK;
 			} else {
@@ -1426,8 +1413,8 @@ public:
 
 	int prepareRequestWhenNotInHighPerformanceMode(request_rec *r) {
 		DirConfig *config = getDirConfig(r);
-		if (config->isEnabled()) {
-			if (config->highPerformanceMode()) {
+		if (config->getEnabled()) {
+			if (config->getHighPerformance()) {
 				/* Preparations have already been done in the map_to_storage hook.
 				 * Prevent other modules' fixups hooks from being run.
 				 */
@@ -1566,7 +1553,7 @@ public:
 
 	int handleRequestWhenInHighPerformanceMode(request_rec *r) {
 		DirConfig *config = getDirConfig(r);
-		if (config->highPerformanceMode()) {
+		if (config->getHighPerformance()) {
 			return handleRequest(r);
 		} else {
 			return DECLINED;
@@ -1575,7 +1562,7 @@ public:
 
 	int handleRequestWhenNotInHighPerformanceMode(request_rec *r) {
 		DirConfig *config = getDirConfig(r);
-		if (config->highPerformanceMode()) {
+		if (config->getHighPerformance()) {
 			return DECLINED;
 		} else {
 			return handleRequest(r);
@@ -1589,11 +1576,6 @@ public:
  * Below follows lightweight C wrappers around the C++ Hook class.
  ******************************************************************/
 
-/**
- * @ingroup Hooks
- * @{
- */
-
 static Hooks *hooks = NULL;
 
 static apr_status_t
@@ -1616,6 +1598,15 @@ destroy_hooks(void *arg) {
 	return APR_SUCCESS;
 }
 
+static int
+preinit_module(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp) {
+	// When reloading Apache, global variables may be left at stale values,
+	// so here we reinitialize them.
+	hooks = NULL;
+	serverConfig = ServerConfig();
+	return OK;
+}
+
 static int
 init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) {
 	/*
@@ -1635,15 +1626,9 @@ init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *
 	 * universal, i.e. it works for some people but not for others. So we got rid of the
 	 * hacks, and now we always initialize in the post_config hook.
 	 */
-	if (hooks == NULL) {
-		oxt::initialize();
-		SystemTime::initialize();
-		LoggingKit::initialize();
-	} else {
-		P_DEBUG("Restarting Phusion Passenger....");
-		delete hooks;
-		hooks = NULL;
-	}
+	oxt::initialize();
+	SystemTime::initialize();
+	LoggingKit::initialize();
 	try {
 		hooks = new Hooks(pconf, plog, ptemp, s);
 		apr_pool_cleanup_register(pconf, NULL,
@@ -1720,13 +1705,13 @@ child_init(apr_pool_t *pchild, server_rec *s) {
 	}
 }
 
-#define DEFINE_REQUEST_HOOK(c_name, cpp_name)        \
-	static int c_name(request_rec *r) {          \
-		if (OXT_LIKELY(hooks != NULL)) {     \
-			return hooks->cpp_name(r);   \
-		} else {                             \
-			return DECLINED;             \
-		}                                    \
+#define DEFINE_REQUEST_HOOK(c_name, cpp_name) \
+	static int c_name(request_rec *r) { \
+		if (OXT_LIKELY(hooks != NULL)) { \
+			return hooks->cpp_name(r); \
+		} else { \
+			return DECLINED; \
+		} \
 	}
 
 DEFINE_REQUEST_HOOK(prepare_request_when_in_high_performance_mode, prepareRequestWhenInHighPerformanceMode)
@@ -1746,11 +1731,12 @@ DEFINE_REQUEST_HOOK(handle_request_when_not_in_high_performance_mode, handleRequ
  * Apache hook registration function.
  */
 void
-passenger_register_hooks(apr_pool_t *p) {
+registerHooks(apr_pool_t *p) {
 	static const char * const rewrite_module[] = { "mod_rewrite.c", NULL };
 	static const char * const dir_module[] = { "mod_dir.c", NULL };
 	static const char * const autoindex_module[] = { "mod_autoindex.c", NULL };
 
+	ap_hook_pre_config(preinit_module, NULL, NULL, APR_HOOK_MIDDLE);
 	ap_hook_post_config(init_module, NULL, NULL, APR_HOOK_MIDDLE);
 	ap_hook_child_init(child_init, NULL, NULL, APR_HOOK_MIDDLE);
 
@@ -1771,6 +1757,6 @@ passenger_register_hooks(apr_pool_t *p) {
 	ap_hook_handler(handle_request_when_not_in_high_performance_mode, NULL, NULL, APR_HOOK_LAST);
 }
 
-/**
- * @}
- */
+
+} // namespace Apache2Module
+} // namespace Passenger