passenger 5.0.18 → 5.0.19

data/ext/nginx/MergeLocationConfig.c.erb

@@ -1,117 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 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.
- */
-
-/*
- * MergeLocationConfig.c is automatically generated from MergeLocationConfig.c.erb,
- * using definitions from lib/phusion_passenger/nginx/config_options.rb.
- * Edits to MergeLocationConfig.c will be lost.
- *
- * To update MergeLocationConfig.c:
- *   rake nginx
- *
- * To force regeneration of MergeLocationConfig.c:
- *   rm -f ext/nginx/MergeLocationConfig.c
- *   rake ext/nginx/MergeLocationConfig.c
- */
-
-/* 0: NGX_CONF_ERROR, 1: OK */
-int generated_merge_part(passenger_loc_conf_t *conf, passenger_loc_conf_t *prev, ngx_conf_t *cf) {
-<%
-require 'phusion_passenger/nginx/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
-		return option[:name].sub(/^passenger_/, '')
-	end
-end
-
-def default_value_for(option)
-	case option[:type]
-	when :string
-		if option[:default]
-			return option[:default].inspect
-		else
-			return "NULL"
-		end
-	when :integer, :flag
-		if option[:default]
-			return option[:default]
-		else
-			return "NGX_CONF_UNSET"
-		end
-	when :uinteger
-		if option[:default]
-			return option[:default]
-		else
-			return "NGX_CONF_UNSET_UINT"
-		end
-	else
-		raise "Unknown type #{option[:type].inspect} for option #{option[:name]}"
-	end
-end
-%>
-
-<% for option in filter_eligible_options(LOCATION_CONFIGURATION_OPTIONS) %>
-	<% if option[:type] == :string %>
-		ngx_conf_merge_str_value(conf-><%= struct_field_for(option) %>,
-			prev-><%= struct_field_for(option) %>,
-			NULL);
-	<% elsif option[:type] == :integer || option[:type] == :flag %>
-		ngx_conf_merge_value(conf-><%= struct_field_for(option) %>,
-			prev-><%= struct_field_for(option) %>,
-			NGX_CONF_UNSET);
-	<% elsif option[:type] == :uinteger %>
-		ngx_conf_merge_uint_value(conf-><%= struct_field_for(option) %>,
-			prev-><%= struct_field_for(option) %>,
-			<%= default_value_for(option) || "NGX_CONF_UNSET_UINT" %>);
-	<% elsif option[:type] == :string_array %>
-		if (merge_string_array(cf, &prev-><%= struct_field_for(option) %>, &conf-><%= struct_field_for(option) %>) != NGX_OK) {
-			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-				"cannot merge \"<%= option[:name] %>\" configurations");
-			return 0;
-		}
-	<% elsif option[:type] == :string_keyval %>
-		if (merge_string_keyval_table(cf, &prev-><%= struct_field_for(option) %>, &conf-><%= struct_field_for(option) %>) != NGX_OK) {
-			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-				"cannot merge \"<%= option[:name] %>\" configurations");
-			return 0;
-		}
-	<% else %>
-		<% raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}" %>
-	<% end %>
-<% end %>
-	return 1;
-}

data/ext/nginx/config

@@ -1,102 +0,0 @@
-# passenger-config is run with the 'ruby' command in $PATH, even when natively packaged,
-# so we check whether 'ruby' is correctly in $PATH.
-if ! ruby -v >/dev/null 2>/dev/null; then
-    echo '*** ERROR: Cannot find the "ruby" command in $PATH. Please fix your $PATH. You can learn more about $PATH at: https://www.phusionpassenger.com/library/indepth/environment_variables.html#the-path-environment-variable'
-    echo '*** Do you think that you set $PATH correctly, and you happen to be using sudo or rvmsudo? Read this: https://www.phusionpassenger.com/library/indepth/environment_variables.html#environment-variables-and-sudo'
-    exit 1
-fi
-
-## Magic comment: begin bootstrap ##
-# Ensure that this script finds the passenger-config that belongs to this Phusion Passenger installation.
-PATH="$ngx_addon_dir/../../bin:$PATH"
-export PATH
-
-PASSENGER_CONFIG=${PASSENGER_CONFIG:-passenger-config}
-
-if test "x$PASSENGER_LIBS" = "x" && ! $PASSENGER_CONFIG --compiled; then
-    echo "*** The Phusion Passenger support files are not yet compiled. Compiling them for you... ***"
-    echo "*** Running 'rake nginx CACHING=false' in $ngx_addon_dir... ***"
-    old_dir=`pwd`
-    if ! cd $ngx_addon_dir; then
-        exit 1
-    fi
-    if test "x$TRACE" = 1; then
-        if ! rake --trace nginx CACHING=false; then
-            exit 1
-        fi
-    else
-        if ! rake nginx CACHING=false; then
-            exit 1
-        fi
-    fi
-    cd "$old_dir"
-    echo "*** Phusion Passenger support files have been successfully compiled. ***"
-fi
-## Magic comment: end bootstrap ##
-
-if test "x$PASSENGER_INCLUDEDIR" = "x"; then
-    PASSENGER_INCLUDEDIR=`$PASSENGER_CONFIG --includedir`
-fi
-if test "x$PASSENGER_LIBS" = "x"; then
-    PASSENGER_LIBS=`$PASSENGER_CONFIG --nginx-libs`
-fi
-
-ngx_addon_name=ngx_http_passenger_module
-HTTP_MODULES="$HTTP_MODULES ngx_http_passenger_module"
-NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
-    ${ngx_addon_dir}/ngx_http_passenger_module.c \
-    ${ngx_addon_dir}/Configuration.c \
-    ${ngx_addon_dir}/ContentHandler.c \
-    ${ngx_addon_dir}/StaticContentHandler.c"
-NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
-    ${ngx_addon_dir}/Configuration.h \
-    ${ngx_addon_dir}/ConfigurationCommands.c \
-    ${ngx_addon_dir}/CreateLocationConfig.c \
-    ${ngx_addon_dir}/MergeLocationConfig.c \
-    ${ngx_addon_dir}/CacheLocationConfig.c \
-    ${ngx_addon_dir}/ContentHandler.h \
-    ${ngx_addon_dir}/StaticContentHandler.h \
-    ${ngx_addon_dir}/ngx_http_passenger_module.h \
-    ${PASSENGER_INCLUDEDIR}/common/Constants.h \
-    ${PASSENGER_INCLUDEDIR}/common/AgentsStarter.h \
-    ${PASSENGER_INCLUDEDIR}/common/ApplicationPool2/AppTypes.h"
-CORE_INCS="$CORE_INCS $PASSENGER_INCLUDEDIR"
-CORE_LIBS="$CORE_LIBS $PASSENGER_LIBS -lstdc++ -lpthread"
-
-ngx_feature="Math library"
-ngx_feature_name=
-ngx_feature_run=no
-ngx_feature_incs="#include <math.h>"
-ngx_feature_path=
-ngx_feature_libs="-lm"
-ngx_feature_test="pow(1, 2)"
-. auto/feature
-if [ $ngx_found = yes ]; then
-    CORE_LIBS="$CORE_LIBS -lm"
-fi
-
-ngx_feature="POSIX realtime library"
-ngx_feature_name=
-ngx_feature_run=no
-ngx_feature_incs=
-ngx_feature_path=
-ngx_feature_libs="-lrt"
-ngx_feature_test=
-. auto/feature
-if [ $ngx_found = yes ]; then
-    CORE_LIBS="$CORE_LIBS -lrt"
-fi
-
-nginx_version=`grep 'NGINX_VERSION ' src/core/nginx.h | awk '{ print $3 }' | sed 's/"//g' | head -n1`
-
-nginx_major_version=`echo "$nginx_version" | cut -d . -f 1`
-have=PASSENGER_NGINX_MAJOR_VERSION value="$nginx_major_version"
-. auto/define
-
-nginx_minor_version=`echo "$nginx_version" | cut -d . -f 2`
-have=PASSENGER_NGINX_MINOR_VERSION value="$nginx_minor_version"
-. auto/define
-
-nginx_micro_version=`echo "$nginx_version" | cut -d . -f 3`
-have=PASSENGER_NGINX_MICRO_VERSION value="$nginx_micro_version"
-. auto/define

data/ext/nginx/ngx_http_passenger_module.c

@@ -1,512 +0,0 @@
-/*
- * Copyright (C) Igor Sysoev
- * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010-2015 Phusion
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <nginx.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-
-#include "ngx_http_passenger_module.h"
-#include "Configuration.h"
-#include "ContentHandler.h"
-#include "common/Constants.h"
-#include "common/Utils/modp_b64.cpp" /* File is C compatible. */
-
-
-static int                first_start = 1;
-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;
-
-
-/*
-    HISTORIC NOTE:
-    We used to register passenger_content_handler as a default content handler,
-    instead of setting ngx_http_core_loc_conf_t->handler. However, if
-    ngx_http_read_client_request_body (and thus passenger_content_handler)
-    returns NGX_AGAIN, then Nginx will pass the not-fully-receive file upload
-    data to the upstream handler even though it shouldn't. Is this an Nginx
-    bug? In any case, setting ngx_http_core_loc_conf_t->handler fixed the
-    problem.
-
-static ngx_int_t
-register_content_handler(ngx_conf_t *cf)
-{
-    ngx_http_handler_pt        *h;
-    ngx_http_core_main_conf_t  *cmcf;
-
-    cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
-
-    h = ngx_array_push(&cmcf->phases[NGX_HTTP_CONTENT_PHASE].handlers);
-    if (h == NULL) {
-        return NGX_ERROR;
-    }
-    *h = passenger_content_handler;
-
-    return NGX_OK;
-}
-*/
-
-static void
-ignore_sigpipe() {
-    struct sigaction action;
-
-    action.sa_handler = SIG_IGN;
-    action.sa_flags   = 0;
-    sigemptyset(&action.sa_mask);
-    sigaction(SIGPIPE, &action, NULL);
-}
-
-static char *
-ngx_str_null_terminate(ngx_str_t *str) {
-    char *result = malloc(str->len + 1);
-    if (result != NULL) {
-        memcpy(result, str->data, str->len);
-        result[str->len] = '\0';
-    }
-    return result;
-}
-
-static void
-pp_variant_map_set_ngx_str(PP_VariantMap *m,
-    const char *name,
-    ngx_str_t *value)
-{
-    pp_variant_map_set(m, name, (const char *) value->data, value->len);
-}
-
-/**
- * Save the Nginx master process's PID into a file in the instance directory.
- * This PID file isn't currently used, but it might be useful for future tooling.
- *
- * The master process's PID is already passed to the Watchdog through the
- * "web_server_control_process_pid" property, but that isn't enough. The Watchdog
- * is started *before* Nginx has daemonized, so after Nginx has daemonized,
- * the PID that we passed to the Watchdog is no longer valid. We fix that by
- * creating this PID file after daemonization.
- */
-static ngx_int_t
-save_master_process_pid(ngx_cycle_t *cycle) {
-    u_char filename[NGX_MAX_PATH];
-    u_char *last;
-    FILE *f;
-
-    last = ngx_snprintf(filename, sizeof(filename) - 1, "%s/web_server_control_process.pid",
-                        pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
-    *last = (u_char) '\0';
-
-    f = fopen((const char *) filename, "w");
-    if (f != NULL) {
-        fprintf(f, "%ld", (long) getppid());
-        fclose(f);
-    } else {
-        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                      "could not create %s", filename);
-    }
-
-    return NGX_OK;
-}
-
-/**
- * This function is called after forking and just before exec()ing the watchdog.
- */
-static void
-starting_watchdog_after_fork(void *arg) {
-    ngx_cycle_t *cycle = (void *) arg;
-    char        *log_filename;
-    FILE        *log_file;
-    ngx_core_conf_t *ccf;
-    ngx_uint_t   i;
-    ngx_str_t   *envs;
-    const char  *env;
-
-    /* At this point, stdout and stderr may still point to the console.
-     * Make sure that they're both redirected to the log file.
-     */
-    log_file = NULL;
-    if (cycle->new_log.file->name.len > 0) {
-        log_filename = ngx_str_null_terminate(&cycle->new_log.file->name);
-        log_file = fopen((const char *) log_filename, "a");
-        if (log_file == NULL) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                          "could not open the error log file for writing");
-        }
-        free(log_filename);
-    } else if (cycle->log != NULL && cycle->log->file->name.len > 0) {
-        log_filename = ngx_str_null_terminate(&cycle->log->file->name);
-        log_file = fopen((const char *) log_filename, "a");
-        if (log_file == NULL) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-                          "could not open the error log file for writing");
-        }
-        free(log_filename);
-    }
-    if (log_file == NULL) {
-        /* If the log file cannot be opened then we redirect stdout
-         * and stderr to /dev/null, because if the user disconnects
-         * from the console on which Nginx is started, then on Linux
-         * any writes to stdout or stderr will result in an EIO error.
-         */
-        log_file = fopen("/dev/null", "w");
-    }
-    if (log_file != NULL) {
-        dup2(fileno(log_file), 1);
-        dup2(fileno(log_file), 2);
-        fclose(log_file);
-    }
-
-    /* Set environment variables in Nginx config file. */
-    ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-    envs = ccf->env.elts;
-    for (i = 0; i < ccf->env.nelts; i++) {
-        env = (const char *) envs[i].data;
-        if (strchr(env, '=') != NULL) {
-            putenv(strdup(env));
-        }
-    }
-}
-
-static ngx_int_t
-create_file(ngx_cycle_t *cycle, const u_char *filename, const u_char *contents, size_t len) {
-    FILE  *f;
-    int    ret;
-    size_t total_written = 0, written;
-
-    f = fopen((const char *) filename, "w");
-    if (f != NULL) {
-        /* We must do something with these return values because
-         * otherwise on some platforms it will cause a compiler
-         * warning.
-         */
-        do {
-            ret = fchmod(fileno(f), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-        } while (ret == -1 && errno == EINTR);
-        do {
-            written = fwrite(contents + total_written, 1,
-                len - total_written, f);
-            total_written += written;
-        } while (total_written < len);
-        fclose(f);
-        return NGX_OK;
-    } else {
-        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
-            "could not create %s", filename);
-            return NGX_ERROR;
-    }
-}
-
-/**
- * Start the watchdog and save the runtime information into various variables.
- *
- * @pre The watchdog isn't already started.
- * @pre The Nginx configuration has been loaded.
- */
-static ngx_int_t
-start_watchdog(ngx_cycle_t *cycle) {
-    ngx_core_conf_t *core_conf;
-    ngx_int_t        ret, result;
-    ngx_uint_t       i;
-    char            *config_file = NULL;
-    ngx_str_t       *prestart_uris;
-    char           **prestart_uris_ary = NULL;
-    ngx_keyval_t    *ctl = 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    = pp_variant_map_new();
-    passenger_root = ngx_str_null_terminate(&passenger_main_conf.root_dir);
-    if (passenger_root == NULL) {
-        goto error_enomem;
-    }
-
-    pp_app_type_detector_set_throttle_rate(pp_app_type_detector,
-        passenger_main_conf.stat_throttle_rate);
-
-    config_file = ngx_str_null_terminate(&cycle->conf_file);
-    if (config_file == NULL) {
-        goto error_enomem;
-    }
-
-    prestart_uris = (ngx_str_t *) passenger_main_conf.prestart_uris->elts;
-    prestart_uris_ary = calloc(sizeof(char *), passenger_main_conf.prestart_uris->nelts);
-    for (i = 0; i < passenger_main_conf.prestart_uris->nelts; i++) {
-        prestart_uris_ary[i] = ngx_str_null_terminate(&prestart_uris[i]);
-        if (prestart_uris_ary[i] == NULL) {
-            goto error_enomem;
-        }
-    }
-
-    pp_variant_map_set_int    (params, "web_server_control_process_pid", getpid());
-    pp_variant_map_set_strset (params, "web_server_config_files", (const char **) &config_file, 1);
-    pp_variant_map_set        (params, "server_software", NGINX_VER, strlen(NGINX_VER));
-    pp_variant_map_set_bool   (params, "multi_app", 1);
-    pp_variant_map_set_bool   (params, "load_shell_envvars", 1);
-    pp_variant_map_set_int    (params, "log_level", passenger_main_conf.log_level);
-    pp_variant_map_set_ngx_str(params, "file_descriptor_log_file", &passenger_main_conf.file_descriptor_log_file);
-    pp_variant_map_set_ngx_str(params, "data_buffer_dir", &passenger_main_conf.data_buffer_dir);
-    pp_variant_map_set_ngx_str(params, "instance_registry_dir", &passenger_main_conf.instance_registry_dir);
-    pp_variant_map_set_bool   (params, "user_switching", passenger_main_conf.user_switching);
-    pp_variant_map_set_bool   (params, "show_version_in_header", passenger_main_conf.show_version_in_header);
-    pp_variant_map_set_bool   (params, "turbocaching", passenger_main_conf.turbocaching);
-    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_int    (params, "response_buffer_high_watermark", passenger_main_conf.response_buffer_high_watermark);
-    pp_variant_map_set_int    (params, "stat_throttle_rate", passenger_main_conf.stat_throttle_rate);
-    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_int    (params, "union_station_gateway_port", passenger_main_conf.union_station_gateway_port);
-    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);
-
-    if (passenger_main_conf.log_file.len > 0) {
-        pp_variant_map_set_ngx_str(params, "log_file", &passenger_main_conf.log_file);
-    } else if (cycle->new_log.file == NULL) {
-        ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, "Cannot initialize " PROGRAM_NAME
-            " because Nginx is not configured with an error log file."
-            " Please either configure Nginx with an error log file, or configure "
-            PROGRAM_NAME " with a `passenger_log_file`");
-        result = NGX_ERROR;
-        goto cleanup;
-    } else if (cycle->new_log.file->name.len > 0) {
-        pp_variant_map_set_ngx_str(params, "log_file", &cycle->new_log.file->name);
-    } else if (cycle->log->file->name.len > 0) {
-        pp_variant_map_set_ngx_str(params, "log_file", &cycle->log->file->name);
-    }
-
-    ctl = (ngx_keyval_t *) passenger_main_conf.ctl->elts;
-    for (i = 0; i < passenger_main_conf.ctl->nelts; i++) {
-        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 = pp_agents_starter_start(pp_agents_starter,
-        passenger_root,
-        params,
-        starting_watchdog_after_fork,
-        cycle,
-        &error_message);
-    if (!ret) {
-        ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "%s", error_message);
-        result = NGX_ERROR;
-        goto cleanup;
-    }
-
-    /* Create the file instance_dir + "/web_server_control_process.pid"
-     * and make it writable by the worker processes. This is because
-     * save_master_process_pid is run after Nginx has lowered privileges.
-     */
-    last = ngx_snprintf(filename, sizeof(filename) - 1,
-                        "%s/web_server_control_process.pid",
-                        pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
-    *last = (u_char) '\0';
-    if (create_file(cycle, filename, (const u_char *) "", 0) != NGX_OK) {
-        result = NGX_ERROR;
-        goto cleanup;
-    }
-    do {
-        ret = chown((const char *) filename, (uid_t) core_conf->user, (gid_t) -1);
-    } while (ret == -1 && errno == EINTR);
-    if (ret == -1) {
-        result = NGX_ERROR;
-        goto cleanup;
-    }
-
-cleanup:
-    pp_variant_map_free(params);
-    free(passenger_root);
-    free(error_message);
-    free(config_file);
-    if (prestart_uris_ary != NULL) {
-        for (i = 0; i < passenger_main_conf.prestart_uris->nelts; i++) {
-            free(prestart_uris_ary[i]);
-        }
-        free(prestart_uris_ary);
-    }
-
-    if (result == NGX_ERROR && passenger_main_conf.abort_on_startup_error) {
-        exit(1);
-    }
-
-    return result;
-
-error_enomem:
-    ngx_log_error(NGX_LOG_ALERT, cycle->log, ENOMEM, "Cannot allocate memory");
-    result = NGX_ERROR;
-    goto cleanup;
-}
-
-/**
- * Shutdown the watchdog, if there's one running.
- */
-static void
-shutdown_watchdog() {
-    if (pp_agents_starter != NULL) {
-        pp_agents_starter_free(pp_agents_starter);
-        pp_agents_starter = NULL;
-    }
-}
-
-
-/**
- * Called when:
- * - Nginx is started, before the configuration is loaded and before daemonization.
- * - Nginx is restarted, before the configuration is reloaded.
- */
-static ngx_int_t
-pre_config_init(ngx_conf_t *cf)
-{
-    char *error_message;
-
-    shutdown_watchdog();
-
-    ngx_memzero(&passenger_main_conf, sizeof(passenger_main_conf_t));
-    pp_schema_string.data = (u_char *) "passenger:";
-    pp_schema_string.len  = sizeof("passenger:") - 1;
-    pp_placeholder_upstream_address.data = (u_char *) "unix:/passenger_core";
-    pp_placeholder_upstream_address.len  = sizeof("unix:/passenger_core") - 1;
-    pp_stat_cache = pp_cached_file_stat_new(1024);
-    pp_app_type_detector = pp_app_type_detector_new(DEFAULT_STAT_THROTTLE_RATE);
-    pp_agents_starter = pp_agents_starter_new(AS_NGINX, &error_message);
-
-    if (pp_agents_starter == NULL) {
-        ngx_log_error(NGX_LOG_ALERT, cf->log, ngx_errno, "%s", error_message);
-        free(error_message);
-        return NGX_ERROR;
-    }
-
-    return NGX_OK;
-}
-
-/**
- * Called when:
- * - Nginx is started, before daemonization and after the configuration has loaded.
- * - Nginx is restarted, after the configuration has reloaded.
- */
-static ngx_int_t
-init_module(ngx_cycle_t *cycle) {
-    if (passenger_main_conf.root_dir.len != 0 && !ngx_test_config) {
-        if (first_start) {
-            /* Ignore SIGPIPE now so that, if the watchdog fails to start,
-             * Nginx doesn't get killed by the default SIGPIPE handler upon
-             * writing the password to the watchdog.
-             */
-            ignore_sigpipe();
-            first_start = 0;
-        }
-        if (start_watchdog(cycle) != NGX_OK) {
-            passenger_main_conf.root_dir.len = 0;
-            return NGX_OK;
-        }
-        pp_current_cycle = cycle;
-    }
-    return NGX_OK;
-}
-
-/**
- * Called when an Nginx worker process is started. This happens after init_module
- * is called.
- *
- * If 'master_process' is turned off, then there is only one single Nginx process
- * in total, and this process also acts as the worker process. In this case
- * init_worker_process is only called when Nginx is started, but not when it's restarted.
- */
-static ngx_int_t
-init_worker_process(ngx_cycle_t *cycle) {
-    ngx_core_conf_t *core_conf;
-
-    if (passenger_main_conf.root_dir.len != 0 && !ngx_test_config) {
-        save_master_process_pid(cycle);
-
-        core_conf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
-        if (core_conf->master) {
-            pp_agents_starter_detach(pp_agents_starter);
-        }
-    }
-    return NGX_OK;
-}
-
-/**
- * Called when Nginx exits. Not called when Nginx is restarted.
- */
-static void
-exit_master(ngx_cycle_t *cycle) {
-    shutdown_watchdog();
-}
-
-
-static ngx_http_module_t passenger_module_ctx = {
-    pre_config_init,                     /* preconfiguration */
-    /* register_content_handler */ NULL, /* postconfiguration */
-
-    passenger_create_main_conf,          /* create main configuration */
-    passenger_init_main_conf,            /* init main configuration */
-
-    NULL,                                /* create server configuration */
-    NULL,                                /* merge server configuration */
-
-    passenger_create_loc_conf,           /* create location configuration */
-    passenger_merge_loc_conf             /* merge location configuration */
-};
-
-
-ngx_module_t ngx_http_passenger_module = {
-    NGX_MODULE_V1,
-    &passenger_module_ctx,                  /* module context */
-    (ngx_command_t *) passenger_commands,   /* module directives */
-    NGX_HTTP_MODULE,                        /* module type */
-    NULL,                                   /* init master */
-    init_module,                            /* init module */
-    init_worker_process,                    /* init process */
-    NULL,                                   /* init thread */
-    NULL,                                   /* exit thread */
-    NULL,                                   /* exit process */
-    exit_master,                            /* exit master */
-    NGX_MODULE_V1_PADDING
-};