passenger 5.0.21 → 5.0.22

data/package.json

@@ -1,6 +1,6 @@
 {
   "__comment__": [
-    "This file is only meant for shrinkwrapping the development dependencies."
+    "Indicate Passenger dependencies on Node modules here, and use it to regenerate npm-shrinkwrap.json via 'npm shrinkwrap'."
   ],
   "name": "passenger",
   "version": "0.0.0",

data/resources/templates/standalone/config.erb

@@ -1,103 +1,41 @@
-##############################################################
-#  Phusion Passenger Standalone uses a template file to
-#  generate an Nginx configuration file. The original template
-#  file can be found by running the following command:
+##########################################################################
+#  Passenger Standalone is built on the same technology that powers
+#  Passenger for Nginx, so any configuration option supported by Passenger
+#  for Nginx can be applied to Passenger Standalone as well. You can do
+#  this by direct editing the Nginx configuration template that is used by
+#  Passenger Standalone.
 #
-#    ls $(passenger-config about resourcesdir)/templates/standalone/config.erb
+#  This file is the original template. DO NOT EDIT THIS FILE DIRECTLY.
+#  Instead, make a copy of this file and pass the `--nginx-config-template`
+#  parameter to Passenger Standalone.
 #
-#  You can create a copy of this template file and customize it
-#  to your liking. Just make sure you tell Phusion Passenger Standalone
-#  to use your template file by passing the --nginx-config-template
-#  parameter.
+#  Learn more about using the Nginx configuration template at:
+#  https://www.phusionpassenger.com/library/config/standalone/intro.html#nginx-configuration-template
 #
 #  *** NOTE ***
-#  If you customize the template file, make sure you keep an eye
-#  on the original template file and merge any changes.
-#  New Phusion Passenger features may require changes to the template
-#  file.
+#  If you customize the template file, make sure you keep an eye on the
+#  original template file and merge any changes. New Phusion Passenger
+#  features may require changes to the template file.
 ##############################################################
 
+<%= include_passenger_internal_template('global.erb') %>
 
-master_process on;
 worker_processes 1;
-daemon on;
-error_log '<%= @options[:log_file] %>' <% if @options[:log_level] >= LVL_DEBUG %>info<% end %>;
-pid '<%= @options[:pid_file] %>';
-
-<% if Process.euid == 0 %>
-    <% if @options[:user] %>
-        <%# Run workers as the given user. The master process will always run as root and will be able to bind to any port. %>
-        user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;
-    <% else %>
-        <%# Prevent running Nginx workers as nobody. %>
-        user <%= current_user %> <%= default_group_for(current_user) %>;
-    <% end %>
-<% end %>
-
 events {
     worker_connections 1024;
 }
 
 http {
-    log_format debug '[$time_local] $msec  "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent';
-    include '<%= PhusionPassenger.resources_dir %>/mime.types';
-
-    <% if @options[:ruby] %>
-        passenger_ruby <%= @options[:ruby] %>;
-    <% else %>
-        passenger_ruby <%= PlatformInfo.ruby_command %>;
-    <% end %>
-    <% if @options[:nodejs] %>
-        passenger_nodejs <%= @options[:nodejs] %>;
-    <% end %>
-    <% if @options[:python] %>
-        passenger_python <%= @options[:python] %>;
-    <% end %>
-
-    passenger_root '<%= PhusionPassenger.install_spec %>';
-    passenger_abort_on_startup_error on;
-    passenger_ctl cleanup_pidfiles <%= serialize_strset("#{@working_dir}/temp_dir_toucher.pid") %>;
-    passenger_ctl integration_mode standalone;
-    passenger_ctl standalone_engine nginx;
-    passenger_user_switching off;
-    <%= nginx_option :passenger_log_level, :log_level %>
-    <%= nginx_option :passenger_max_pool_size, :max_pool_size %>
-    <%= nginx_option :passenger_min_instances, :min_instances %>
-    <%= nginx_option :passenger_pool_idle_time, :pool_idle_time %>
-    <%= nginx_option :passenger_max_preloader_idle_time, :max_preloader_idle_time %>
-    <%= nginx_option :passenger_turbocaching, :turbocaching %>
-    <% if @options[:user] %>
-        passenger_user <%= @options[:user] %>;
-        passenger_default_user <%= @options[:user] %>;
-        passenger_analytics_log_user <%= @options[:user] %>;
-    <% else %>
-        passenger_user <%= current_user %>;
-        passenger_default_user <%= current_user %>;
-        passenger_analytics_log_user <%= current_user %>;
-    <% end %>
-    <% if @options[:instance_registry_dir] %>passenger_instance_registry_dir '<%= @options[:instance_registry_dir] %>';<% end %>
-    <% if @options[:data_buffer_dir] %>passenger_data_buffer_dir '<%= @options[:data_buffer_dir] %>';<% end %>
-    <% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
-    <% if @options[:resist_deployment_errors] %>passenger_resist_deployment_errors on;<% end %>
-    <% if !@options[:load_shell_envvars] %>passenger_load_shell_envvars off;<% end %>
+    <%= include_passenger_internal_template('http.erb', 4) %>
 
-    <% if !@options[:friendly_error_pages].nil? -%>
-        passenger_friendly_error_pages <%= boolean_config_value(@options[:friendly_error_pages]) %>;
-    <% end %>
-
-    <% if @options[:union_station_gateway_address] %>
-        union_station_gateway_address <%= @options[:union_station_gateway_address] %>;
-    <% end %>
-    <% if @options[:union_station_gateway_port] %>
-        union_station_gateway_port <%= @options[:union_station_gateway_port] %>;
-    <% end %>
-    <% if @options[:union_station_gateway_cert] %>
-        union_station_gateway_cert -;
-    <% end %>
+    ### BEGIN your own configuration options ###
+    # This is a good place to put your own config
+    # options. Note that your options must not
+    # conflict with the ones Passenger already sets.
+    # Learn more at:
+    # https://www.phusionpassenger.com/library/config/standalone/intro.html#nginx-configuration-template
 
-    <% @options[:ctls].each do |ctl| %>
-        passenger_ctl '<%= ctl.split("=", 2)[0] %>' '<%= ctl.split("=", 2)[1] %>';
-    <% end %>
+    ### END your own configuration options ###
 
     default_type application/octet-stream;
     types_hash_max_size 2048;
@@ -118,89 +56,23 @@ http {
     <% if @app_finder.multi_mode? %>
         # Default server entry for mass deployment mode.
         server {
-            <% if @options[:ssl] %>
-                <% if @options[:ssl_port] %>
-                    listen <%= nginx_listen_address %>;
-                    listen <%= nginx_listen_address_with_ssl_port %> ssl;
-                <% else %>
-                    listen <%= nginx_listen_address %> ssl;
-                <% end %>
-            <% else %>
-                listen <%= nginx_listen_address %>;
-            <% end %>
-            root '<%= PhusionPassenger.resources_dir %>/standalone_default_root';
+            <%= include_passenger_internal_template('mass_deployment_default_server.erb', 12) %>;
         }
     <% end %>
 
     <% for app in @apps %>
     server {
-        <% if app[:ssl] %>
-            <% if app[:ssl_port] %>
-                listen <%= nginx_listen_address(app) %>;
-                listen <%= nginx_listen_address_with_ssl_port(app) %> ssl;
-            <% else %>
-                listen <%= nginx_listen_address(app) %> ssl;
-            <% end %>
-        <% else %>
-            listen <%= nginx_listen_address(app) %>;
-        <% end %>
-        server_name <%= app[:server_names].join(' ') %>;
-        <% if app[:static_files_dir] %>
-            root '<%= app[:static_files_dir] %>';
-        <% else %>
-            root '<%= app[:root] %>/public';
-        <% end %>
-        passenger_app_root '<%= app[:root] %>';
-        passenger_enabled on;
-        passenger_app_env <%= app[:environment] %>;
-        passenger_spawn_method <%= app[:spawn_method] %>;
-        <% if app[:app_type] %>passenger_app_type <%= app[:app_type] %>;<% end %>
-        <% if app[:startup_file] %>passenger_startup_file <%= app[:startup_file] %>;<% end %>
-        <% if app[:concurrency_model] && app[:concurrency_model] != DEFAULT_CONCURRENCY_MODEL %>passenger_concurrency_model <%= app[:concurrency_model] %>;<% end %>
-        <% if app[:thread_count] && app[:thread_count] != DEFAULT_APP_THREAD_COUNT %>passenger_thread_count <%= app[:thread_count] %>;<% end %>
-        <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %>
-        <% if app[:restart_dir] %>passenger_restart_dir '<%= app[:restart_dir] %>';<% end %>
-        <% if app[:sticky_sessions] %>passenger_sticky_sessions on;<% end %>
-        <% if app[:sticky_sessions_cookie_name] %>passenger_sticky_sessions_cookie_name '<%= app[:sticky_sessions_cookie_name] %>';<% end %>
-        <% if app[:vary_turbocache_by_cookie] %>passenger_vary_turbocache_by_cookie '<%= app[:vary_turbocache_by_cookie] %>';<% end %>
-        <% if app[:union_station_key] %>
-            union_station_support on;
-            union_station_key <%= app[:union_station_key] %>;
-        <% end %>
-        <% if app[:ssl] %>
-            ssl_certificate <%= app[:ssl_certificate] %>;
-            ssl_certificate_key <%= app[:ssl_certificate_key] %>;
-        <% end %>
-        <% if @options[:meteor_app_settings] %>
-          passenger_meteor_app_settings <%= @options[:meteor_app_settings] %>;
-        <% end %>
-
-        <% app[:envvars].each_pair do |name, value| %>
-            passenger_env_var '<%= name %>' '<%= value %>';
-        <% end %>
+        <%= include_passenger_internal_template('server.erb', 8, true, binding) %>
+        <%= include_passenger_internal_template('rails_asset_pipeline.erb', 8, false) %>
 
-        # Rails asset pipeline support.
-        location ~ "^/assets/.+-([0-9a-f]{32}|[0-9a-f]{64})\..+" {
-            error_page 490 = @static_asset;
-            error_page 491 = @dynamic_request;
-            recursive_error_pages on;
+        ### BEGIN your own configuration options ###
+        # This is a good place to put your own config
+        # options. Note that your options must not
+        # conflict with the ones Passenger already sets.
+        # Learn more at:
+        # https://www.phusionpassenger.com/library/config/standalone/intro.html#nginx-configuration-template
 
-            if (-f $request_filename) {
-                return 490;
-            }
-            if (!-f $request_filename) {
-                return 491;
-            }
-        }
-        location @static_asset {
-            gzip_static on;
-            expires max;
-            add_header Cache-Control public;
-            add_header ETag "";
-        }
-        location @dynamic_request {
-            passenger_enabled on;
-        }
+        ### END your own configuration options ###
     }
     passenger_pre_start <%= listen_url(app) %>;
     <% end %>

data/resources/templates/standalone/global.erb

@@ -0,0 +1,15 @@
+master_process on;
+daemon on;
+
+error_log '<%= @options[:log_file] %>' <% if @options[:log_level] >= LVL_DEBUG %>info<% end %>;
+pid '<%= @options[:pid_file] %>';
+
+<% if Process.euid == 0 %>
+    <% if @options[:user] %>
+        <%# Run workers as the given user. The master process will always run as root and will be able to bind to any port. %>
+        user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;
+    <% else %>
+        <%# Prevent running Nginx workers as nobody. %>
+        user <%= current_user %> <%= default_group_for(current_user) %>;
+    <% end %>
+<% end %>

data/resources/templates/standalone/http.erb

@@ -0,0 +1,40 @@
+log_format debug '[$time_local] $msec  "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent';
+include '<%= PhusionPassenger.resources_dir %>/mime.types';
+
+passenger_root '<%= PhusionPassenger.install_spec %>';
+passenger_abort_on_startup_error on;
+passenger_ctl cleanup_pidfiles <%= serialize_strset("#{@working_dir}/temp_dir_toucher.pid") %>;
+passenger_ctl integration_mode standalone;
+passenger_ctl standalone_engine nginx;
+passenger_user_switching off;
+
+<% if @options[:ruby] %>
+    passenger_ruby <%= @options[:ruby] %>;
+<% else %>
+    passenger_ruby <%= PlatformInfo.ruby_command %>;
+<% end %>
+<% if @options[:user] %>
+    passenger_user <%= @options[:user] %>;
+    passenger_default_user <%= @options[:user] %>;
+    passenger_analytics_log_user <%= @options[:user] %>;
+<% else %>
+    passenger_user <%= current_user %>;
+    passenger_default_user <%= current_user %>;
+    passenger_analytics_log_user <%= current_user %>;
+<% end %>
+
+<%= nginx_http_option(:python) %>
+<%= nginx_http_option(:nodejs) %>
+<%= nginx_http_option(:log_level) %>
+<%= nginx_http_option(:max_pool_size) %>
+<%= nginx_http_option(:pool_idle_time) %>
+<%= nginx_http_option(:max_preloader_idle_time) %>
+<%= nginx_http_option(:turbocaching) %>
+<%= nginx_http_option(:instance_registry_dir) %>
+<%= nginx_http_option(:data_buffer_dir) %>
+<%= nginx_http_option(:union_station_gateway_address) %>
+<%= nginx_http_option(:union_station_gateway_port) %>
+<%= nginx_http_option(:union_station_gateway_cert) %>
+<% @options[:ctls].each do |ctl| %>
+    passenger_ctl '<%= ctl.split("=", 2)[0] %>' '<%= ctl.split("=", 2)[1] %>';
+<% end %>

data/resources/templates/standalone/mass_deployment_default_server.erb

@@ -0,0 +1,11 @@
+<% if @options[:ssl] %>
+    <% if @options[:ssl_port] %>
+        listen <%= nginx_listen_address %>;
+        listen <%= nginx_listen_address_with_ssl_port %> ssl;
+    <% else %>
+        listen <%= nginx_listen_address %> ssl;
+    <% end %>
+<% else %>
+    listen <%= nginx_listen_address %>;
+<% end %>
+root '<%= PhusionPassenger.resources_dir %>/standalone_default_root';

data/resources/templates/standalone/rails_asset_pipeline.erb

@@ -0,0 +1,22 @@
+# Rails asset pipeline support.
+location ~ "^/assets/.+-([0-9a-f]{32}|[0-9a-f]{64})\..+" {
+    error_page 490 = @static_asset;
+    error_page 491 = @dynamic_request;
+    recursive_error_pages on;
+
+    if (-f $request_filename) {
+        return 490;
+    }
+    if (!-f $request_filename) {
+        return 491;
+    }
+}
+location @static_asset {
+    gzip_static on;
+    expires max;
+    add_header Cache-Control public;
+    add_header ETag "";
+}
+location @dynamic_request {
+    passenger_enabled on;
+}

data/resources/templates/standalone/server.erb

@@ -0,0 +1,58 @@
+server_name <%= app[:server_names].join(' ') %>;
+<% if app[:ssl] %>
+    <% if app[:ssl_port] %>
+        listen <%= nginx_listen_address(app) %>;
+        listen <%= nginx_listen_address_with_ssl_port(app) %> ssl;
+    <% else %>
+        listen <%= nginx_listen_address(app) %> ssl;
+    <% end %>
+<% else %>
+    listen <%= nginx_listen_address(app) %>;
+<% end %>
+<% if app[:static_files_dir] %>
+    root '<%= app[:static_files_dir] %>';
+<% else %>
+    root '<%= app[:root] %>/public';
+<% end %>
+
+passenger_app_root '<%= app[:root] %>';
+passenger_enabled on;
+<% if app[:ssl] %>
+    ssl_certificate <%= app[:ssl_certificate] %>;
+    ssl_certificate_key <%= app[:ssl_certificate_key] %>;
+<% end %>
+<% if app[:union_station_key] %>
+    union_station_support on;
+    union_station_key <%= app[:union_station_key] %>;
+<% end %>
+<% app[:envvars].each_pair do |name, value| %>
+    passenger_env_var '<%= name %>' '<%= value %>';
+<% end %>
+<% if app[:concurrency_model] && app[:concurrency_model] != DEFAULT_CONCURRENCY_MODEL %>
+    passenger_concurrency_model <%= app[:concurrency_model] %>;
+<% end %>
+<% if app[:thread_count] && app[:thread_count] != DEFAULT_APP_THREAD_COUNT %>
+    passenger_thread_count <%= app[:thread_count] %>;
+<% end %>
+
+<%= nginx_option(app, :environment, :passenger_app_env) %>
+<%= nginx_option(app, :spawn_method) %>
+<%= nginx_option(app, :app_type) %>
+<%= nginx_option(app, :startup_file) %>
+<%= nginx_option(app, :min_instances) %>
+<%= nginx_option(app, :max_request_queue_size) %>
+<%= nginx_option(app, :restart_dir) %>
+<%= nginx_option(app, :sticky_sessions) %>
+<%= nginx_option(app, :sticky_sessions_cookie_name) %>
+<%= nginx_option(app, :vary_turbocache_by_cookie) %>
+<%= nginx_option(app, :meteor_app_settings) %>
+<%= nginx_option(app, :load_shell_envvars) %>
+<%= nginx_option(app, :friendly_error_pages) %>
+<%= nginx_option(app, :abort_websockets_on_process_shutdown) %>
+<%= nginx_option(app, :force_max_concurrent_requests_per_process) %>
+
+<%= nginx_option(app, :rolling_restarts) %>
+<%= nginx_option(app, :resist_deployment_errors) %>
+<%= nginx_option(app, :memory_limit) %>
+<%= nginx_option(app, :max_request_time) %>
+<%= nginx_option(app, :debugger) %>

data/src/agent/Core/ApiServer.h

@@ -36,7 +36,7 @@
 #include <jsoncpp/json.h>
 #include <modp_b64.h>
 
-#include <Core/RequestHandler.h>
+#include <Core/Controller.h>
 #include <Core/ApplicationPool/Pool.h>
 #include <Shared/ApiServerUtils.h>
 #include <ServerKit/HttpServer.h>
@@ -51,6 +51,7 @@
 
 namespace Passenger {
 namespace Core {
+namespace ApiServer {
 
 using namespace std;
 
@@ -61,7 +62,7 @@ public:
 	Json::Value jsonBody;
 	Authorization authorization;
 
-	DEFINE_SERVER_KIT_BASE_HTTP_REQUEST_FOOTER(Request);
+	DEFINE_SERVER_KIT_BASE_HTTP_REQUEST_FOOTER(Passenger::Core::ApiServer::Request);
 };
 
 class ApiServer: public ServerKit::HttpServer<ApiServer, ServerKit::HttpClient<Request> > {
@@ -89,8 +90,8 @@ private:
 		return stringToUint(results.str(1));
 	}
 
-	static void disconnectClient(RequestHandler *rh, string clientName) {
-		rh->disconnect(clientName);
+	static void disconnectClient(Controller *controller, string clientName) {
+		controller->disconnect(clientName);
 	}
 
 	void route(Client *client, Request *req, const StaticString &path) {
@@ -110,8 +111,11 @@ private:
 			apiServerProcessBacktraces(this, client, req);
 		} else if (path == P_STATIC_STRING("/ping.json")) {
 			apiServerProcessPing(this, client, req);
-		} else if (path == P_STATIC_STRING("/version.json")) {
-			apiServerProcessVersion(this, client, req);
+		} else if (path == P_STATIC_STRING("/info.json")
+			// The "/version.json" path is deprecated
+			|| path == P_STATIC_STRING("/version.json"))
+		{
+			apiServerProcessInfo(this, client, req);
 		} else if (path == P_STATIC_STRING("/shutdown.json")) {
 			apiServerProcessShutdown(this, client, req);
 		} else if (path == P_STATIC_STRING("/gc.json")) {
@@ -142,7 +146,7 @@ private:
 			}
 
 			int threadNumber = extractThreadNumberFromClientName(results.str(1));
-			if (threadNumber < 1 || (unsigned int) threadNumber > requestHandlers.size()) {
+			if (threadNumber < 1 || (unsigned int) threadNumber > controllers.size()) {
 				HeaderTable headers;
 				headers.insert(req->pool, "Content-Type", "application/json");
 				writeSimpleResponse(client, 400, &headers,
@@ -153,8 +157,8 @@ private:
 				return;
 			}
 
-			requestHandlers[threadNumber - 1]->getContext()->libev->runLater(boost::bind(
-				disconnectClient, requestHandlers[threadNumber - 1], results.str(1)));
+			controllers[threadNumber - 1]->getContext()->libev->runLater(boost::bind(
+				disconnectClient, controllers[threadNumber - 1], results.str(1)));
 
 			HeaderTable headers;
 			headers.insert(req->pool, "Content-Type", "application/json");
@@ -168,8 +172,8 @@ private:
 		}
 	}
 
-	static void inspectRequestHandlerState(RequestHandler *rh, Json::Value *json) {
-		*json = rh->inspectStateAsJson();
+	static void inspectControllerState(Controller *controller, Json::Value *json) {
+		*json = controller->inspectStateAsJson();
 	}
 
 	void processServerStatus(Client *client, Request *req) {
@@ -178,13 +182,13 @@ private:
 			headers.insert(req->pool, "Content-Type", "application/json");
 
 			Json::Value doc;
-			doc["threads"] = (Json::UInt) requestHandlers.size();
-			for (unsigned int i = 0; i < requestHandlers.size(); i++) {
+			doc["threads"] = (Json::UInt) controllers.size();
+			for (unsigned int i = 0; i < controllers.size(); i++) {
 				Json::Value json;
 				string key = "thread" + toString(i + 1);
 
-				requestHandlers[i]->getContext()->libev->runSync(boost::bind(
-					inspectRequestHandlerState, requestHandlers[i], &json));
+				controllers[i]->getContext()->libev->runSync(boost::bind(
+					inspectControllerState, controllers[i], &json));
 				doc[key] = json;
 			}
 
@@ -374,14 +378,14 @@ private:
 		}
 	}
 
-	static void garbageCollect(RequestHandler *rh) {
-		ServerKit::Context *ctx = rh->getContext();
+	static void garbageCollect(Controller *controller) {
+		ServerKit::Context *ctx = controller->getContext();
 		unsigned int count;
 
 		count = mbuf_pool_compact(&ctx->mbuf_pool);
-		SKS_NOTICE_FROM_STATIC(rh, "Freed " << count << " mbufs");
+		SKS_NOTICE_FROM_STATIC(controller, "Freed " << count << " mbufs");
 
-		rh->compact(LVL_NOTICE);
+		controller->compact(LVL_NOTICE);
 	}
 
 	void processGc(Client *client, Request *req) {
@@ -390,9 +394,9 @@ private:
 		} else if (authorizeAdminOperation(this, client, req)) {
 			HeaderTable headers;
 			headers.insert(req->pool, "Content-Type", "application/json");
-			for (unsigned int i = 0; i < requestHandlers.size(); i++) {
-				requestHandlers[i]->getContext()->libev->runLater(boost::bind(
-					garbageCollect, requestHandlers[i]));
+			for (unsigned int i = 0; i < controllers.size(); i++) {
+				controllers[i]->getContext()->libev->runLater(boost::bind(
+					garbageCollect, controllers[i]));
 			}
 			writeSimpleResponse(client, 200, &headers, "{ \"status\": \"ok\" }");
 			if (!req->ended()) {
@@ -403,8 +407,8 @@ private:
 		}
 	}
 
-	static void getRequestHandlerConfig(RequestHandler *rh, Json::Value *json) {
-		*json = rh->getConfigAsJson();
+	static void getControllerConfig(Controller *controller, Json::Value *json) {
+		*json = controller->getConfigAsJson();
 	}
 
 	void processConfig(Client *client, Request *req) {
@@ -419,8 +423,8 @@ private:
 
 			headers.insert(req->pool, "Content-Type", "application/json");
 			Json::Value doc;
-			requestHandlers[0]->getContext()->libev->runSync(boost::bind(
-				getRequestHandlerConfig, requestHandlers[0], &doc));
+			controllers[0]->getContext()->libev->runSync(boost::bind(
+				getControllerConfig, controllers[0], &doc));
 			doc["log_level"] = getLogLevel();
 			if (!logFile.empty()) {
 				doc["log_file"] = logFile;
@@ -446,8 +450,8 @@ private:
 		}
 	}
 
-	static void configureRequestHandler(RequestHandler *rh, Json::Value json) {
-		rh->configure(json);
+	static void configureController(Controller *controller, Json::Value json) {
+		controller->configure(json);
 	}
 
 	void processConfigBody(Client *client, Request *req) {
@@ -492,9 +496,9 @@ private:
 			}
 			P_NOTICE("Log file opened.");
 		}
-		for (unsigned int i = 0; i < requestHandlers.size(); i++) {
-			requestHandlers[i]->getContext()->libev->runLater(boost::bind(
-				configureRequestHandler, requestHandlers[i], json));
+		for (unsigned int i = 0; i < controllers.size(); i++) {
+			controllers[i]->getContext()->libev->runLater(boost::bind(
+				configureController, controllers[i], json));
 		}
 
 		writeSimpleResponse(client, 200, &headers, "{ \"status\": \"ok\" }");
@@ -581,7 +585,7 @@ protected:
 	}
 
 public:
-	vector<RequestHandler *> requestHandlers;
+	vector<Controller *> controllers;
 	ApiAccountDatabase *apiAccountDatabase;
 	ApplicationPool2::PoolPtr appPool;
 	string instanceDir;
@@ -619,6 +623,7 @@ public:
 };
 
 
+} // namespace ApiServer
 } // namespace Core
 } // namespace Passenger