passenger 4.0.3 → 4.0.4

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -567,13 +567,25 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 	{
 		// Standard resource management boilerplate stuff...
 		unique_lock<boost::mutex> lock(pool->syncher);
-		if (OXT_UNLIKELY(!process->isAlive() || !isAlive())) {
+		if (OXT_UNLIKELY(!process->isAlive()
+			|| process->enabled == Process::DETACHED
+			|| !isAlive()))
+		{
+			return;
+		}
+
+		if (process->enabled != Process::DISABLED) {
+			UPDATE_TRACE_POINT();
+			P_INFO("Out-of-Band Work canceled: process " << process->inspect() <<
+				" was concurrently re-enabled.");
+			if (debug != NULL && debug->oobw) {
+				debug->debugger->send("OOBW request canceled");
+			}
 			return;
 		}
 		
 		assert(process->oobwStatus = Process::OOBW_IN_PROGRESS);
 		assert(process->sessions == 0);
-		assert(process->enabled == Process::DISABLED);
 		socket = process->sessionSockets.top();
 		assert(socket != NULL);
 	}

data/ext/common/Constants.h

@@ -25,31 +25,62 @@
 #ifndef _PASSENGER_CONSTANTS_H_
 #define _PASSENGER_CONSTANTS_H_
 
-/* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "4.0.3"
-
-#define FEEDBACK_FD 3
-
-#define DEFAULT_LOG_LEVEL 0
-#define DEFAULT_RUBY "ruby"
-#define DEFAULT_PYTHON "python"
-#define DEFAULT_MAX_POOL_SIZE 6
-#define DEFAULT_POOL_IDLE_TIME 300
-#define DEFAULT_MAX_INSTANCES_PER_APP 0
-#define DEFAULT_WEB_APP_USER "nobody"
-#define DEFAULT_ANALYTICS_LOG_USER DEFAULT_WEB_APP_USER
-#define DEFAULT_ANALYTICS_LOG_GROUP ""
-#define DEFAULT_ANALYTICS_LOG_PERMISSIONS "u=rwx,g=rx,o=rx"
-#define DEFAULT_UNION_STATION_GATEWAY_ADDRESS "gateway.unionstationapp.com"
-#define DEFAULT_UNION_STATION_GATEWAY_PORT 443
-
-#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
-#define MESSAGE_SERVER_MAX_PASSWORD_SIZE 100
+/* Constants.h is automatically generated from Constants.h.erb by the build system.
+ * Most constants are derived from lib/phusion_passenger/constants.rb.
+ *
+ * To force regenerating this file:
+ *   rm -f ext/common/Constants.h
+ *   rake ext/common/Constants.h
+ */
+
 #define DEFAULT_BACKEND_ACCOUNT_RIGHTS Account::DETACH
 
-#define POOL_HELPER_THREAD_STACK_SIZE (1024 * 256)
 
-#define PROCESS_SHUTDOWN_TIMEOUT 60 /* seconds */
-#define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
+	#define DEFAULT_LOG_LEVEL 0
+
+	#define DEFAULT_RUBY "ruby"
+
+	#define DEFAULT_PYTHON "python"
+
+	#define DEFAULT_MAX_POOL_SIZE 6
+
+	#define DEFAULT_POOL_IDLE_TIME 300
+
+	#define DEFAULT_MAX_INSTANCES_PER_APP 0
+
+	#define DEFAULT_WEB_APP_USER "nobody"
+
+	#define DEFAULT_ANALYTICS_LOG_USER "nobody"
+
+	#define DEFAULT_ANALYTICS_LOG_GROUP ""
+
+	#define DEFAULT_ANALYTICS_LOG_PERMISSIONS "u=rwx,g=rx,o=rx"
+
+	#define DEFAULT_UNION_STATION_GATEWAY_ADDRESS "gateway.unionstationapp.com"
+
+	#define DEFAULT_UNION_STATION_GATEWAY_PORT 443
+
+	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
+
+	#define MESSAGE_SERVER_MAX_PASSWORD_SIZE 100
+
+	#define POOL_HELPER_THREAD_STACK_SIZE 262144
+
+	#define PROCESS_SHUTDOWN_TIMEOUT 60
+
+	#define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"
+
+	#define PASSENGER_VERSION "4.0.3"
+
+	#define SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION 1
+
+	#define SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION 0
+
+	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION 2
+
+	#define SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION 0
+
+	#define FEEDBACK_FD 3
+
 
 #endif /* _PASSENGER_CONSTANTS_H */

data/ext/common/Constants.h.erb

@@ -0,0 +1,42 @@
+/*
+ *  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.
+ */
+#ifndef _PASSENGER_CONSTANTS_H_
+#define _PASSENGER_CONSTANTS_H_
+
+/* Constants.h is automatically generated from Constants.h.erb by the build system.
+ * Most constants are derived from lib/phusion_passenger/constants.rb.
+ *
+ * To force regenerating this file:
+ *   rm -f ext/common/Constants.h
+ *   rake ext/common/Constants.h
+ */
+
+#define DEFAULT_BACKEND_ACCOUNT_RIGHTS Account::DETACH
+
+<% for constant_name in PhusionPassenger::SharedConstants.constants %>
+	#define <%= constant_name %> <%=PhusionPassenger::SharedConstants.const_get(constant_name).inspect %>
+<% end %>
+
+#endif /* _PASSENGER_CONSTANTS_H */

data/ext/common/ServerInstanceDir.h

@@ -38,9 +38,10 @@
 #include <cstring>
 #include <string>
 
-#include "Exceptions.h"
-#include "Utils.h"
-#include "Utils/StrIntUtils.h"
+#include <Constants.h>
+#include <Exceptions.h>
+#include <Utils.h>
+#include <Utils/StrIntUtils.h>
 
 namespace Passenger {
 
@@ -49,12 +50,6 @@ using namespace boost;
 
 class ServerInstanceDir: public noncopyable {
 public:
-	// Don't forget to update lib/phusion_passenger/admin_tools/server_instance.rb too.
-	static const int DIR_STRUCTURE_MAJOR_VERSION = 1;
-	static const int DIR_STRUCTURE_MINOR_VERSION = 0;
-	static const int GENERATION_STRUCTURE_MAJOR_VERSION = 2;
-	static const int GENERATION_STRUCTURE_MINOR_VERSION = 0;
-	
 	class Generation: public noncopyable {
 	private:
 		friend class ServerInstanceDir;
@@ -102,8 +97,8 @@ public:
 			/* Write structure version file. */
 			string structureVersionFile = path + "/structure_version.txt";
 			createFile(structureVersionFile,
-				toString(GENERATION_STRUCTURE_MAJOR_VERSION) + "." +
-				toString(GENERATION_STRUCTURE_MINOR_VERSION),
+				toString(SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION) + "." +
+				toString(SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION),
 				S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 			
 			

data/ext/common/Utils/CachedFileStat.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -27,21 +27,22 @@
 
 extern "C" {
 
-PassengerCachedFileStat *
-cached_file_stat_new(unsigned int max_size) {
-	return (PassengerCachedFileStat *) new Passenger::CachedFileStat(max_size);
+PP_CachedFileStat *
+pp_cached_file_stat_new(unsigned int max_size) {
+	return (PP_CachedFileStat *) new Passenger::CachedFileStat(max_size);
 }
 
 void
-cached_file_stat_free(PassengerCachedFileStat *cstat) {
+pp_cached_file_stat_free(PP_CachedFileStat *cstat) {
 	delete (Passenger::CachedFileStat *) cstat;
 }
 
 int
-cached_file_stat_perform(PassengerCachedFileStat *cstat,
-                         const char *filename,
-                         struct stat *buf,
-                         unsigned int throttle_rate) {
+pp_cached_file_stat_perform(PP_CachedFileStat *cstat,
+                            const char *filename,
+                            struct stat *buf,
+                            unsigned int throttle_rate)
+{
 	try {
 		return ((Passenger::CachedFileStat *) cstat)->stat(filename, buf, throttle_rate);
 	} catch (const Passenger::TimeRetrievalException &e) {

data/ext/common/Utils/CachedFileStat.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -34,14 +34,14 @@ extern "C" {
 
 /** C bindings for Passenger::CachedFileStat. */
 
-typedef void PassengerCachedFileStat;
+typedef void PP_CachedFileStat;
 
-PassengerCachedFileStat *cached_file_stat_new(unsigned int max_size);
-void cached_file_stat_free(PassengerCachedFileStat *cstat);
-int  cached_file_stat_perform(PassengerCachedFileStat *cstat,
-                              const char *filename,
-                              struct stat *buf,
-                              unsigned int throttle_rate);
+PP_CachedFileStat *pp_cached_file_stat_new(unsigned int max_size);
+void pp_cached_file_stat_free(PP_CachedFileStat *cstat);
+int  pp_cached_file_stat_perform(PP_CachedFileStat *cstat,
+                                 const char *filename,
+                                 struct stat *buf,
+                                 unsigned int throttle_rate);
 
 
 #ifdef __cplusplus

data/ext/common/Utils/LargeFiles.cpp

@@ -1,7 +1,15 @@
-#define _FILE_OFFSET_BITS 64
-#define _LARGE_FILES 1
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
+#ifndef _FILE_OFFSET_BITS
+	#define _FILE_OFFSET_BITS 64
+#endif
+#ifndef _LARGE_FILES
+	#define _LARGE_FILES 1
+#endif
+#ifndef _LARGEFILE_SOURCE
+	#define _LARGEFILE_SOURCE
+#endif
+#ifndef _LARGEFILE64_SOURCE
+	#define _LARGEFILE64_SOURCE
+#endif
 
 #include <Utils/LargeFiles.h>
 #include <stdlib.h>

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -1642,6 +1642,7 @@ private:
 			options.baseURI = scriptName;
 		}
 		
+		options.ruby = this->options.defaultRubyCommand;
 		options.logLevel = getLogLevel();
 		options.loggingAgentAddress = this->options.loggingAgentAddress;
 		options.loggingAgentUsername = "logging";

data/ext/common/agents/Watchdog/Main.cpp

@@ -458,8 +458,8 @@ initializeWorkingObjects() {
 		 */
 		string path = tempDir +
 			"/passenger." +
-			toString(ServerInstanceDir::DIR_STRUCTURE_MAJOR_VERSION) + "." +
-			toString(ServerInstanceDir::DIR_STRUCTURE_MINOR_VERSION) + "." +
+			toString(SERVER_INSTANCE_DIR_STRUCTURE_MAJOR_VERSION) + "." +
+			toString(SERVER_INSTANCE_DIR_STRUCTURE_MINOR_VERSION) + "." +
 			toString<unsigned long long>(agentsOptions.getPid("web_server_pid"));
 		serverInstanceDir.reset(new ServerInstanceDir(path));
 	} else {

data/ext/nginx/Configuration.c

@@ -911,7 +911,7 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
          * loading is done.
          */
         ngx_memzero(&upstream_url, sizeof(ngx_url_t));
-        upstream_url.url = passenger_placeholder_upstream_address;
+        upstream_url.url = pp_placeholder_upstream_address;
         upstream_url.no_resolve = 1;
         passenger_conf->upstream_config.upstream = ngx_http_upstream_add(cf, &upstream_url, 0);
         if (passenger_conf->upstream_config.upstream == NULL) {

data/ext/nginx/Configuration.h

@@ -33,7 +33,6 @@
 
 typedef struct {
     ngx_http_upstream_conf_t upstream_config;
-    ngx_str_t    index;
     ngx_array_t *flushes;
     ngx_array_t *vars_len;
     ngx_array_t *vars;

data/ext/nginx/ContentHandler.c

@@ -65,10 +65,10 @@ get_file_type(const u_char *filename, unsigned int throttle_rate) {
     struct stat buf;
     int ret;
     
-    ret = cached_file_stat_perform(passenger_stat_cache,
-                                   (const char *) filename,
-                                   &buf,
-                                   throttle_rate);
+    ret = pp_cached_file_stat_perform(pp_stat_cache,
+                                      (const char *) filename,
+                                      &buf,
+                                      throttle_rate);
     if (ret == 0) {
         if (S_ISREG(buf.st_mode)) {
             return FT_FILE;
@@ -210,10 +210,10 @@ set_upstream_server_address(ngx_http_upstream_t *upstream, ngx_http_upstream_con
      * we substitute the placeholder filename with the real helper agent request
      * socket filename.
      */
-    if (address->name.data == passenger_placeholder_upstream_address.data) {
+    if (address->name.data == pp_placeholder_upstream_address.data) {
         sockaddr = (struct sockaddr_un *) address->sockaddr;
         request_socket_filename =
-            psg_agents_starter_get_request_socket_filename(passenger_agents_starter,
+            pp_agents_starter_get_request_socket_filename(pp_agents_starter,
                                                            &request_socket_filename_len);
         
         address->name.data = (u_char *) request_socket_filename;
@@ -247,7 +247,7 @@ fix_peer_address(ngx_http_request_t *r) {
     rrp        = r->upstream->peer.data;
     peers      = rrp->peers;
     request_socket_filename =
-        psg_agents_starter_get_request_socket_filename(passenger_agents_starter,
+        pp_agents_starter_get_request_socket_filename(pp_agents_starter,
                                                        &request_socket_filename_len);
 
     while (peers != NULL) {
@@ -397,7 +397,7 @@ create_request(ngx_http_request_t *r)
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
     
-    app_type_string = (const u_char *) passenger_get_app_type_name(context->app_type);
+    app_type_string = (const u_char *) pp_get_app_type_name(context->app_type);
     app_type_string_len = strlen((const char *) app_type_string) + 1; /* include null terminator */
     
     
@@ -590,7 +590,7 @@ create_request(ngx_http_request_t *r)
      **************************************************/
     
     helper_agent_request_socket_password_data =
-        psg_agents_starter_get_request_socket_password(passenger_agents_starter,
+        pp_agents_starter_get_request_socket_password(pp_agents_starter,
             &helper_agent_request_socket_password_len);
     size = helper_agent_request_socket_password_len +
         /* netstring length + ":" + trailing "," */
@@ -1433,7 +1433,7 @@ passenger_content_handler(ngx_http_request_t *r)
     
     /* Find the base URI for this web application, if any. */
     if (find_base_uri(r, slcf, &base_uri)) {
-        /* Store the found base URI in context->public_dir. We infer that the 'public'
+        /* Store the found base URI into context->public_dir. We infer that the 'public'
          * directory of the web application is document root + base URI.
          */
         len = root_path.len + base_uri.len + 1;
@@ -1467,13 +1467,13 @@ passenger_content_handler(ngx_http_request_t *r)
     }
     
     if (slcf->app_root.data == NULL) {
-        context->app_type = passenger_app_type_detector_check_document_root(
-            passenger_app_type_detector,
+        context->app_type = pp_app_type_detector_check_document_root(
+            pp_app_type_detector,
             (const char *) context->public_dir.data, context->public_dir.len,
             context->base_uri.len != 0);
     } else {
-        context->app_type = passenger_app_type_detector_check_app_root(
-            passenger_app_type_detector,
+        context->app_type = pp_app_type_detector_check_app_root(
+            pp_app_type_detector,
             (const char *) slcf->app_root.data, slcf->app_root.len);
     }
     if (context->app_type == PAT_NONE) {
@@ -1488,7 +1488,7 @@ passenger_content_handler(ngx_http_request_t *r)
     }
     u = r->upstream;
     
-    u->schema = passenger_schema_string;
+    u->schema = pp_schema_string;
     u->output.tag = (ngx_buf_tag_t) &ngx_http_passenger_module;
     set_upstream_server_address(u, &slcf->upstream_config);
     u->conf = &slcf->upstream_config;

data/ext/nginx/ngx_http_passenger_module.c

@@ -50,12 +50,12 @@
 
 
 static int                first_start = 1;
-ngx_str_t                 passenger_schema_string;
-ngx_str_t                 passenger_placeholder_upstream_address;
-PassengerCachedFileStat  *passenger_stat_cache;
-PassengerAppTypeDetector *passenger_app_type_detector;
-PSG_AgentsStarter        *passenger_agents_starter = NULL;
-ngx_cycle_t              *passenger_current_cycle;
+ngx_str_t                 pp_schema_string;
+ngx_str_t                 pp_placeholder_upstream_address;
+PP_CachedFileStat        *pp_stat_cache;
+PP_AppTypeDetector       *pp_app_type_detector;
+PP_AgentsStarter         *pp_agents_starter = NULL;
+ngx_cycle_t              *pp_current_cycle;
 
 
 /*
@@ -105,11 +105,11 @@ ngx_str_null_terminate(ngx_str_t *str) {
 }
 
 static void
-psg_variant_map_set_ngx_str(PSG_VariantMap *m,
+pp_variant_map_set_ngx_str(PP_VariantMap *m,
     const char *name,
     ngx_str_t *value)
 {
-    psg_variant_map_set(m, name, (const char *) value->data, value->len);
+    pp_variant_map_set(m, name, (const char *) value->data, value->len);
 }
 
 /**
@@ -129,7 +129,7 @@ save_master_process_pid(ngx_cycle_t *cycle) {
     FILE *f;
     
     last = ngx_snprintf(filename, sizeof(filename) - 1, "%s/control_process.pid",
-        psg_agents_starter_get_server_instance_dir(passenger_agents_starter));
+                        pp_agents_starter_get_server_instance_dir(pp_agents_starter));
     *last = (u_char) '\0';
     
     f = fopen((const char *) filename, "w");
@@ -250,14 +250,14 @@ start_helper_server(ngx_cycle_t *cycle) {
     ngx_str_t       *prestart_uris;
     char           **prestart_uris_ary = NULL;
     ngx_keyval_t    *ctl = NULL;
-    PSG_VariantMap  *params = NULL;
+    PP_VariantMap  *params = NULL;
     u_char  filename[NGX_MAX_PATH], *last;
     char   *passenger_root = NULL;
     char   *error_message = NULL;
     
     core_conf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
     result    = NGX_OK;
-    params    = psg_variant_map_new();
+    params    = pp_variant_map_new();
     passenger_root = ngx_str_null_terminate(&passenger_main_conf.root_dir);
     
     prestart_uris = (ngx_str_t *) passenger_main_conf.prestart_uris->elts;
@@ -273,33 +273,33 @@ start_helper_server(ngx_cycle_t *cycle) {
         prestart_uris_ary[i][prestart_uris[i].len] = '\0';
     }
 
-    psg_variant_map_set_int    (params, "web_server_pid", getpid());
-    psg_variant_map_set_int    (params, "web_server_worker_uid", core_conf->user);
-    psg_variant_map_set_int    (params, "web_server_worker_gid", core_conf->group);
-    psg_variant_map_set_int    (params, "log_level", passenger_main_conf.log_level);
-    psg_variant_map_set_ngx_str(params, "debug_log_file", &passenger_main_conf.debug_log_file);
-    psg_variant_map_set_ngx_str(params, "temp_dir", &passenger_main_conf.temp_dir);
-    psg_variant_map_set_bool   (params, "user_switching", passenger_main_conf.user_switching);
-    psg_variant_map_set_ngx_str(params, "default_user", &passenger_main_conf.default_user);
-    psg_variant_map_set_ngx_str(params, "default_group", &passenger_main_conf.default_group);
-    psg_variant_map_set_ngx_str(params, "default_ruby", &passenger_main_conf.default_ruby);
-    psg_variant_map_set_int    (params, "max_pool_size", passenger_main_conf.max_pool_size);
-    psg_variant_map_set_int    (params, "pool_idle_time", passenger_main_conf.pool_idle_time);
-    psg_variant_map_set_ngx_str(params, "analytics_log_user", &passenger_main_conf.analytics_log_user);
-    psg_variant_map_set_ngx_str(params, "analytics_log_group", &passenger_main_conf.analytics_log_group);
-    psg_variant_map_set_ngx_str(params, "union_station_gateway_address", &passenger_main_conf.union_station_gateway_address);
-    psg_variant_map_set_ngx_str(params, "union_station_gateway_cert", &passenger_main_conf.union_station_gateway_cert);
-    psg_variant_map_set_ngx_str(params, "union_station_proxy_address", &passenger_main_conf.union_station_proxy_address);
-    psg_variant_map_set_strset (params, "prestart_urls", (const char **) prestart_uris_ary, passenger_main_conf.prestart_uris->nelts);
+    pp_variant_map_set_int    (params, "web_server_pid", getpid());
+    pp_variant_map_set_int    (params, "web_server_worker_uid", core_conf->user);
+    pp_variant_map_set_int    (params, "web_server_worker_gid", core_conf->group);
+    pp_variant_map_set_int    (params, "log_level", passenger_main_conf.log_level);
+    pp_variant_map_set_ngx_str(params, "debug_log_file", &passenger_main_conf.debug_log_file);
+    pp_variant_map_set_ngx_str(params, "temp_dir", &passenger_main_conf.temp_dir);
+    pp_variant_map_set_bool   (params, "user_switching", passenger_main_conf.user_switching);
+    pp_variant_map_set_ngx_str(params, "default_user", &passenger_main_conf.default_user);
+    pp_variant_map_set_ngx_str(params, "default_group", &passenger_main_conf.default_group);
+    pp_variant_map_set_ngx_str(params, "default_ruby", &passenger_main_conf.default_ruby);
+    pp_variant_map_set_int    (params, "max_pool_size", passenger_main_conf.max_pool_size);
+    pp_variant_map_set_int    (params, "pool_idle_time", passenger_main_conf.pool_idle_time);
+    pp_variant_map_set_ngx_str(params, "analytics_log_user", &passenger_main_conf.analytics_log_user);
+    pp_variant_map_set_ngx_str(params, "analytics_log_group", &passenger_main_conf.analytics_log_group);
+    pp_variant_map_set_ngx_str(params, "union_station_gateway_address", &passenger_main_conf.union_station_gateway_address);
+    pp_variant_map_set_ngx_str(params, "union_station_gateway_cert", &passenger_main_conf.union_station_gateway_cert);
+    pp_variant_map_set_ngx_str(params, "union_station_proxy_address", &passenger_main_conf.union_station_proxy_address);
+    pp_variant_map_set_strset (params, "prestart_urls", (const char **) prestart_uris_ary, passenger_main_conf.prestart_uris->nelts);
 
     ctl = (ngx_keyval_t *) passenger_main_conf.ctl->elts;
     for (i = 0; i < passenger_main_conf.ctl->nelts; i++) {
-        psg_variant_map_set2(params,
+        pp_variant_map_set2(params,
             (const char *) ctl[i].key.data, ctl[i].key.len - 1,
             (const char *) ctl[i].value.data, ctl[i].value.len - 1);
     }
     
-    ret = psg_agents_starter_start(passenger_agents_starter,
+    ret = pp_agents_starter_start(pp_agents_starter,
         passenger_root,
         params,
         starting_helper_server_after_fork,
@@ -317,7 +317,7 @@ start_helper_server(ngx_cycle_t *cycle) {
      */
     last = ngx_snprintf(filename, sizeof(filename) - 1,
                         "%s/control_process.pid",
-                        psg_agents_starter_get_server_instance_dir(passenger_agents_starter));
+                        pp_agents_starter_get_server_instance_dir(pp_agents_starter));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, (const u_char *) "", 0) != NGX_OK) {
         result = NGX_ERROR;
@@ -334,7 +334,7 @@ start_helper_server(ngx_cycle_t *cycle) {
     /* Create various other info files. */
     last = ngx_snprintf(filename, sizeof(filename) - 1,
                         "%s/web_server.txt",
-                        psg_agents_starter_get_generation_dir(passenger_agents_starter));
+                        pp_agents_starter_get_generation_dir(pp_agents_starter));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, (const u_char *) NGINX_VER, strlen(NGINX_VER)) != NGX_OK) {
         result = NGX_ERROR;
@@ -343,7 +343,7 @@ start_helper_server(ngx_cycle_t *cycle) {
 
     last = ngx_snprintf(filename, sizeof(filename) - 1,
                         "%s/config_files.txt",
-                        psg_agents_starter_get_generation_dir(passenger_agents_starter));
+                        pp_agents_starter_get_generation_dir(pp_agents_starter));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, cycle->conf_file.data, cycle->conf_file.len) != NGX_OK) {
         result = NGX_ERROR;
@@ -351,7 +351,7 @@ start_helper_server(ngx_cycle_t *cycle) {
     }
     
 cleanup:
-    psg_variant_map_free(params);
+    pp_variant_map_free(params);
     free(passenger_root);
     free(error_message);
     if (prestart_uris_ary != NULL) {
@@ -373,9 +373,9 @@ cleanup:
  */
 static void
 shutdown_helper_server() {
-    if (passenger_agents_starter != NULL) {
-        psg_agents_starter_free(passenger_agents_starter);
-        passenger_agents_starter = NULL;
+    if (pp_agents_starter != NULL) {
+        pp_agents_starter_free(pp_agents_starter);
+        pp_agents_starter = NULL;
     }
 }
 
@@ -393,15 +393,15 @@ pre_config_init(ngx_conf_t *cf)
     shutdown_helper_server();
     
     ngx_memzero(&passenger_main_conf, sizeof(passenger_main_conf_t));
-    passenger_schema_string.data = (u_char *) "passenger:";
-    passenger_schema_string.len  = sizeof("passenger:") - 1;
-    passenger_placeholder_upstream_address.data = (u_char *) "unix:/passenger_helper_server";
-    passenger_placeholder_upstream_address.len  = sizeof("unix:/passenger_helper_server") - 1;
-    passenger_stat_cache = cached_file_stat_new(1024);
-    passenger_app_type_detector = passenger_app_type_detector_new();
-    passenger_agents_starter = psg_agents_starter_new(AS_NGINX, &error_message);
+    pp_schema_string.data = (u_char *) "passenger:";
+    pp_schema_string.len  = sizeof("passenger:") - 1;
+    pp_placeholder_upstream_address.data = (u_char *) "unix:/passenger_helper_server";
+    pp_placeholder_upstream_address.len  = sizeof("unix:/passenger_helper_server") - 1;
+    pp_stat_cache = pp_cached_file_stat_new(1024);
+    pp_app_type_detector = pp_app_type_detector_new();
+    pp_agents_starter = pp_agents_starter_new(AS_NGINX, &error_message);
     
-    if (passenger_agents_starter == NULL) {
+    if (pp_agents_starter == NULL) {
         ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, "%s", error_message);
         free(error_message);
         return NGX_ERROR;
@@ -430,7 +430,7 @@ init_module(ngx_cycle_t *cycle) {
             passenger_main_conf.root_dir.len = 0;
             return NGX_OK;
         }
-        passenger_current_cycle = cycle;
+        pp_current_cycle = cycle;
     }
     return NGX_OK;
 }
@@ -452,7 +452,7 @@ init_worker_process(ngx_cycle_t *cycle) {
         
         core_conf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
         if (core_conf->master) {
-            psg_agents_starter_detach(passenger_agents_starter);
+            pp_agents_starter_detach(pp_agents_starter);
         }
     }
     return NGX_OK;