passenger 3.0.21 → 3.9.1.beta

data/ext/nginx/Configuration.c

@@ -36,7 +36,7 @@
 #include "Configuration.h"
 #include "ContentHandler.h"
 #include "../common/Constants.h"
-#include "../common/LoggingAgent/FilterSupport.h"
+#include "../common/agents/LoggingAgent/FilterSupport.h"
 
 
 static ngx_str_t headers_to_hide[] = {
@@ -123,11 +123,6 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
     conf = &passenger_main_conf;
     *conf = *((passenger_main_conf_t *) conf_pointer);
     
-    if (conf->ruby.len == 0) {
-        conf->ruby.data = (u_char *) "ruby";
-        conf->ruby.len  = sizeof("ruby") - 1;
-    }
-    
     if (conf->log_level == (ngx_int_t) NGX_CONF_UNSET) {
         conf->log_level = DEFAULT_LOG_LEVEL;
     }
@@ -285,11 +280,12 @@ passenger_create_loc_conf(ngx_conf_t *cf)
      */
 
     conf->enabled = NGX_CONF_UNSET;
-    conf->use_global_queue = NGX_CONF_UNSET;
     conf->friendly_error_pages = NGX_CONF_UNSET;
     conf->union_station_support = NGX_CONF_UNSET;
     conf->debugger = NGX_CONF_UNSET;
     conf->show_version_in_header = NGX_CONF_UNSET;
+    conf->ruby.data = NULL;
+    conf->ruby.len = 0;
     conf->environment.data = NULL;
     conf->environment.len = 0;
     conf->spawn_method.data = NULL;
@@ -308,8 +304,7 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->union_station_filters = NGX_CONF_UNSET_PTR;
     conf->min_instances = NGX_CONF_UNSET;
     conf->max_requests = NGX_CONF_UNSET;
-    conf->framework_spawner_idle_time = NGX_CONF_UNSET;
-    conf->app_spawner_idle_time = NGX_CONF_UNSET;
+    conf->max_preloader_idle_time = NGX_CONF_UNSET;
 
     /******************************/
     /******************************/
@@ -398,13 +393,13 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_http_script_copy_code_t  *copy;
 
     ngx_conf_merge_value(conf->enabled, prev->enabled, 0);
-    ngx_conf_merge_value(conf->use_global_queue, prev->use_global_queue, 1);
     ngx_conf_merge_value(conf->friendly_error_pages, prev->friendly_error_pages, 1);
     ngx_conf_merge_value(conf->union_station_support, prev->union_station_support, 0);
     ngx_conf_merge_value(conf->debugger, prev->debugger, 0);
     ngx_conf_merge_value(conf->show_version_in_header, prev->show_version_in_header, 1);
+    ngx_conf_merge_str_value(conf->ruby, prev->ruby, NULL);
     ngx_conf_merge_str_value(conf->environment, prev->environment, "production");
-    ngx_conf_merge_str_value(conf->spawn_method, prev->spawn_method, "smart-lv2");
+    ngx_conf_merge_str_value(conf->spawn_method, prev->spawn_method, "smart");
     ngx_conf_merge_str_value(conf->union_station_key, prev->union_station_key, NULL);
     ngx_conf_merge_str_value(conf->user, prev->user, "");
     ngx_conf_merge_str_value(conf->group, prev->group, "");
@@ -412,8 +407,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_str_value(conf->app_rights, prev->app_rights, NULL);
     ngx_conf_merge_value(conf->min_instances, prev->min_instances, (ngx_int_t) -1);
     ngx_conf_merge_value(conf->max_requests, prev->max_requests, (ngx_int_t) -1);
-    ngx_conf_merge_value(conf->framework_spawner_idle_time, prev->framework_spawner_idle_time, (ngx_int_t) -1);
-    ngx_conf_merge_value(conf->app_spawner_idle_time, prev->app_spawner_idle_time, (ngx_int_t) -1);
+    ngx_conf_merge_value(conf->max_preloader_idle_time, prev->max_preloader_idle_time, (ngx_int_t) -1);
     
     if (prev->base_uris != NGX_CONF_UNSET_PTR) {
         if (conf->base_uris == NGX_CONF_UNSET_PTR) {
@@ -474,24 +468,24 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->upstream_config.ignore_client_abort, 0);
 
     ngx_conf_merge_msec_value(conf->upstream_config.connect_timeout,
-                              prev->upstream_config.connect_timeout, 12000000);
+                              prev->upstream_config.connect_timeout, 600000);
 
     ngx_conf_merge_msec_value(conf->upstream_config.send_timeout,
-                              prev->upstream_config.send_timeout, 12000000);
+                              prev->upstream_config.send_timeout, 600000);
 
     ngx_conf_merge_msec_value(conf->upstream_config.read_timeout,
-                              prev->upstream_config.read_timeout, 12000000);
+                              prev->upstream_config.read_timeout, 600000);
 
     ngx_conf_merge_size_value(conf->upstream_config.send_lowat,
                               prev->upstream_config.send_lowat, 0);
 
     ngx_conf_merge_size_value(conf->upstream_config.buffer_size,
                               prev->upstream_config.buffer_size,
-                              (size_t) ngx_pagesize);
+                              16 * 1024);
 
 
     ngx_conf_merge_bufs_value(conf->upstream_config.bufs, prev->upstream_config.bufs,
-                              8, ngx_pagesize);
+                              8, 16 * 1024);
 
     if (conf->upstream_config.bufs.num < 2) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -1004,6 +998,23 @@ union_station_filter(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     return NGX_CONF_OK;
 }
 
+static char *
+rails_framework_spawner_idle_time(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_conf_log_error(NGX_LOG_ALERT, cf, 0, "The 'rails_framework_spawner_idle_time' "
+        "directive is deprecated; please set 'passenger_max_preloader_idle_time' instead");
+    return NGX_CONF_OK;
+}
+
+static char *
+passenger_use_global_queue(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    ngx_conf_log_error(NGX_LOG_ALERT, cf, 0, "The 'passenger_use_global_queue' "
+        "directive is obsolete and doesn't do anything anymore. Global queuing "
+        "is now always enabled. Please remove this configuration directive.");
+    return NGX_CONF_OK;
+}
+
 static char *
 set_null_terminated_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -1067,10 +1078,10 @@ const ngx_command_t passenger_commands[] = {
       NULL },
 
     { ngx_string("passenger_ruby"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, ruby),
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, ruby),
       NULL },
 
     { ngx_string("passenger_log_level"),
@@ -1094,13 +1105,6 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, abort_on_startup_error),
       NULL },
 
-    { ngx_string("passenger_use_global_queue"),
-      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
-      ngx_conf_set_flag_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(passenger_loc_conf_t, use_global_queue),
-      NULL },
-
     { ngx_string("passenger_friendly_error_pages"),
       NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -1297,6 +1301,13 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, prestart_uris),
       NULL },
 
+    { ngx_string("passenger_max_preloader_idle_time"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, max_preloader_idle_time),
+      NULL },
+
     { ngx_string("passenger_pass_header"),
       NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_str_array_slot,
@@ -1367,20 +1378,6 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_loc_conf_t, environment),
       NULL },
 
-    { ngx_string("rails_framework_spawner_idle_time"),
-      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(passenger_loc_conf_t, framework_spawner_idle_time),
-      NULL },
-
-    { ngx_string("rails_app_spawner_idle_time"),
-      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_num_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(passenger_loc_conf_t, app_spawner_idle_time),
-      NULL },
-
     { ngx_string("rack_env"),
       NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
@@ -1411,6 +1408,20 @@ const ngx_command_t passenger_commands[] = {
       0,
       NULL },
 
+    { ngx_string("passenger_concurrency_model"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      passenger_enterprise_only,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("passenger_thread_count"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      passenger_enterprise_only,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
     { ngx_string("passenger_rolling_restarts"),
       NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
       passenger_enterprise_only,
@@ -1436,6 +1447,27 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_loc_conf_t, spawn_method),
       NULL },
 
+    { ngx_string("rails_framework_spawner_idle_time"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      rails_framework_spawner_idle_time,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("rails_app_spawner_idle_time"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, max_preloader_idle_time),
+      NULL },
+
+    { ngx_string("passenger_use_global_queue"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+      passenger_use_global_queue,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
       ngx_null_command
 };
 

data/ext/nginx/Configuration.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010 Phusion
+ * Copyright (C) 2010, 2011, 2012 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -40,11 +40,11 @@ typedef struct {
     ngx_array_t *vars_source;
     
     ngx_flag_t   enabled;
-    ngx_flag_t   use_global_queue;
     ngx_flag_t   friendly_error_pages;
     ngx_flag_t   union_station_support;
     ngx_flag_t   debugger;
     ngx_flag_t   show_version_in_header;
+    ngx_str_t    ruby;
     ngx_str_t    environment;
     ngx_str_t    user;
     ngx_str_t    group;
@@ -53,8 +53,7 @@ typedef struct {
     ngx_str_t    app_rights;
     ngx_int_t    min_instances;
     ngx_int_t    max_requests;
-    ngx_int_t    framework_spawner_idle_time;
-    ngx_int_t    app_spawner_idle_time;
+    ngx_int_t    max_preloader_idle_time;
     ngx_str_t    union_station_key;
     ngx_array_t *base_uris;
     ngx_array_t *union_station_filters;
@@ -68,7 +67,6 @@ typedef struct {
 
 typedef struct {
     ngx_str_t    root_dir;
-    ngx_str_t    ruby;
     ngx_int_t    log_level;
     ngx_str_t    debug_log_file;
     ngx_flag_t   abort_on_startup_error;

data/ext/nginx/ContentHandler.c

@@ -26,7 +26,6 @@
  */
 
 #include <nginx.h>
-#include <ngx_http.h>
 #include "ngx_http_passenger_module.h"
 #include "ContentHandler.h"
 #include "StaticContentHandler.h"
@@ -101,7 +100,7 @@ detect_application_type(const ngx_str_t *public_dir) {
     ngx_snprintf(filename, sizeof(filename), "%s/%s",
                  public_dir->data, "../config/environment.rb");
     if (file_exists(filename, 1)) {
-        return AP_RAILS;
+        return AP_CLASSIC_RAILS;
     }
         
     ngx_memzero(filename, sizeof(filename));
@@ -348,8 +347,7 @@ create_request(ngx_http_request_t *r)
     ngx_str_t                     *union_station_filters = NULL;
     u_char                         min_instances_string[12];
     u_char                         max_requests_string[12];
-    u_char                         framework_spawner_idle_time_string[12];
-    u_char                         app_spawner_idle_time_string[12];
+    u_char                         max_preloader_idle_time_string[12];
     u_char                        *end;
     void                          *tmp;
     ngx_uint_t                     i, n;
@@ -375,9 +373,9 @@ create_request(ngx_http_request_t *r)
     }
     
     switch (context->app_type) {
-    case AP_RAILS:
-        app_type_string = (const u_char *) "rails";
-        app_type_string_len = sizeof("rails");
+    case AP_CLASSIC_RAILS:
+        app_type_string = (const u_char *) "classic-rails";
+        app_type_string_len = sizeof("classic-rails");
         break;
     case AP_RACK:
         app_type_string = (const u_char *) "rack";
@@ -464,8 +462,6 @@ create_request(ngx_http_request_t *r)
     #endif
     
     /* Lengths of Passenger application pool options. */
-    ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_USE_GLOBAL_QUEUE",
-                                  slcf, use_global_queue);
     ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_FRIENDLY_ERROR_PAGES",
                                   slcf, friendly_error_pages);
     ANALYZE_BOOLEAN_CONFIG_LENGTH("UNION_STATION_SUPPORT",
@@ -474,14 +470,15 @@ create_request(ngx_http_request_t *r)
                                   slcf, debugger);
     ANALYZE_BOOLEAN_CONFIG_LENGTH("PASSENGER_SHOW_VERSION_IN_HEADER",
                                   slcf, show_version_in_header);
-    len += sizeof("PASSENGER_ENVIRONMENT") + slcf->environment.len + 1;
+    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_RUBY", slcf, ruby);
+    len += sizeof("PASSENGER_ENV") + slcf->environment.len + 1;
     len += sizeof("PASSENGER_SPAWN_METHOD") + slcf->spawn_method.len + 1;
     len += sizeof("PASSENGER_APP_TYPE") + app_type_string_len;
     ANALYZE_STR_CONFIG_LENGTH("PASSENGER_APP_GROUP_NAME", slcf, app_group_name);
     ANALYZE_STR_CONFIG_LENGTH("PASSENGER_APP_RIGHTS", slcf, app_rights);
     ANALYZE_STR_CONFIG_LENGTH("PASSENGER_USER", slcf, user);
     ANALYZE_STR_CONFIG_LENGTH("PASSENGER_GROUP", slcf, group);
-    ANALYZE_STR_CONFIG_LENGTH("PASSENGER_UNION_STATION_KEY", slcf, union_station_key);
+    ANALYZE_STR_CONFIG_LENGTH("UNION_STATION_KEY", slcf, union_station_key);
     
     end = ngx_snprintf(min_instances_string,
                        sizeof(min_instances_string) - 1,
@@ -499,23 +496,14 @@ create_request(ngx_http_request_t *r)
     len += sizeof("PASSENGER_MAX_REQUESTS") +
            ngx_strlen(max_requests_string) + 1;
     
-    end = ngx_snprintf(framework_spawner_idle_time_string,
-                       sizeof(framework_spawner_idle_time_string) - 1,
+    end = ngx_snprintf(max_preloader_idle_time_string,
+                       sizeof(max_preloader_idle_time_string) - 1,
                        "%d",
-                       (slcf->framework_spawner_idle_time == (ngx_int_t) -1) ?
-                           -1 : slcf->framework_spawner_idle_time);
+                       (slcf->max_preloader_idle_time == (ngx_int_t) -1) ?
+                           -1 : slcf->max_preloader_idle_time);
     *end = '\0';
-    len += sizeof("PASSENGER_FRAMEWORK_SPAWNER_IDLE_TIME") +
-           ngx_strlen(framework_spawner_idle_time_string) + 1;
-    
-    end = ngx_snprintf(app_spawner_idle_time_string,
-                       sizeof(app_spawner_idle_time_string) - 1,
-                       "%d",
-                       (slcf->app_spawner_idle_time == (ngx_int_t) -1) ?
-                           -1 : slcf->app_spawner_idle_time);
-    *end = '\0';
-    len += sizeof("PASSENGER_APP_SPAWNER_IDLE_TIME") +
-           ngx_strlen(app_spawner_idle_time_string) + 1;
+    len += sizeof("PASSENGER_MAX_PRELOADER_IDLE_TIME") +
+           ngx_strlen(max_preloader_idle_time_string) + 1;
     
     if (slcf->union_station_filters != NGX_CONF_UNSET_PTR && slcf->union_station_filters->nelts > 0) {
         len += sizeof("UNION_STATION_FILTERS");
@@ -581,33 +569,6 @@ create_request(ngx_http_request_t *r)
         }
     }
 
-    /* Trailing dummy header.
-     *
-     * If the last header value is an empty string, then the buffer
-     * will end with "\0\0". For example, if 'SSL_CLIENT_CERT'
-     * is the last header and it has an empty value, then the SCGI header
-     * will end with:
-     *
-     *   "SSL_CLIENT_CERT\0\0"
-     *
-     * The data in the buffer will be processed by the AbstractRequestHandler class,
-     * which is implemented in Ruby. But it uses Hash[*data.split("\0")] to
-     * unserialize the data. Unfortunately String#split will not transform
-     * the trailing "\0\0" into an empty string:
-     *
-     *   "SSL_CLIENT_CERT\0\0".split("\0")
-     *   # => desired result: ["SSL_CLIENT_CERT", ""]
-     *   # => actual result:  ["SSL_CLIENT_CERT"]
-     *
-     * When that happens, Hash[..] will raise an ArgumentError because
-     * data.split("\0") does not return an array with a length that is a
-     * multiple of 2.
-     *
-     * So here, we add a dummy header to prevent situations like that from
-     * happening.
-     */
-    len += sizeof("_") + sizeof("_");
-
 
     /**************************************************
      * Build the request header data.
@@ -713,8 +674,6 @@ create_request(ngx_http_request_t *r)
     
 
     /* Build Passenger application pool option headers. */
-    SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_USE_GLOBAL_QUEUE",
-                                  slcf, use_global_queue);
     SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_FRIENDLY_ERROR_PAGES",
                                   slcf, friendly_error_pages);
     SERIALIZE_BOOLEAN_CONFIG_DATA("UNION_STATION_SUPPORT",
@@ -724,8 +683,11 @@ create_request(ngx_http_request_t *r)
     SERIALIZE_BOOLEAN_CONFIG_DATA("PASSENGER_SHOW_VERSION_IN_HEADER",
                                   slcf, show_version_in_header);
     
-    b->last = ngx_copy(b->last, "PASSENGER_ENVIRONMENT",
-                       sizeof("PASSENGER_ENVIRONMENT"));
+    SERIALIZE_STR_CONFIG_DATA("PASSENGER_RUBY",
+                              slcf, ruby);
+
+    b->last = ngx_copy(b->last, "PASSENGER_ENV",
+                       sizeof("PASSENGER_ENV"));
     b->last = ngx_copy(b->last, slcf->environment.data,
                        slcf->environment.len + 1);
 
@@ -742,7 +704,7 @@ create_request(ngx_http_request_t *r)
                               slcf, user);
     SERIALIZE_STR_CONFIG_DATA("PASSENGER_GROUP",
                               slcf, group);
-    SERIALIZE_STR_CONFIG_DATA("PASSENGER_UNION_STATION_KEY",
+    SERIALIZE_STR_CONFIG_DATA("UNION_STATION_KEY",
                               slcf, union_station_key);
 
     b->last = ngx_copy(b->last, "PASSENGER_APP_TYPE",
@@ -759,15 +721,10 @@ create_request(ngx_http_request_t *r)
     b->last = ngx_copy(b->last, max_requests_string,
                        ngx_strlen(max_requests_string) + 1);
 
-    b->last = ngx_copy(b->last, "PASSENGER_FRAMEWORK_SPAWNER_IDLE_TIME",
-                       sizeof("PASSENGER_FRAMEWORK_SPAWNER_IDLE_TIME"));
-    b->last = ngx_copy(b->last, framework_spawner_idle_time_string,
-                       ngx_strlen(framework_spawner_idle_time_string) + 1);
-
-    b->last = ngx_copy(b->last, "PASSENGER_APP_SPAWNER_IDLE_TIME",
-                       sizeof("PASSENGER_APP_SPAWNER_IDLE_TIME"));
-    b->last = ngx_copy(b->last, app_spawner_idle_time_string,
-                       ngx_strlen(app_spawner_idle_time_string) + 1);
+    b->last = ngx_copy(b->last, "PASSENGER_MAX_PRELOADER_IDLE_TIME",
+                       sizeof("PASSENGER_MAX_PRELOADER_IDLE_TIME"));
+    b->last = ngx_copy(b->last, max_preloader_idle_time_string,
+                       ngx_strlen(max_preloader_idle_time_string) + 1);
 
     if (slcf->union_station_filters != NGX_CONF_UNSET_PTR && slcf->union_station_filters->nelts > 0) {
         b->last = ngx_copy(b->last, "UNION_STATION_FILTERS",
@@ -857,10 +814,6 @@ create_request(ngx_http_request_t *r)
          }
     }
     
-    /* Trailing dummy header. See earlier comment for explanation. */
-    b->last = ngx_copy(b->last, "_\0_", sizeof("_\0_"));
-
-
     *b->last++ = (u_char) ',';
 
     if (slcf->upstream_config.pass_request_body) {
@@ -1197,11 +1150,9 @@ process_header(ngx_http_request_t *r)
     ngx_table_elt_t                *h;
     ngx_http_upstream_header_t     *hh;
     ngx_http_upstream_main_conf_t  *umcf;
-    ngx_http_core_loc_conf_t       *clcf;
     passenger_loc_conf_t           *slcf;
 
     umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
-    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
 
     for ( ;;  ) {
@@ -1283,17 +1234,9 @@ process_header(ngx_http_request_t *r)
                 h->key.len = sizeof("Server") - 1;
                 h->key.data = (u_char *) "Server";
                 if( slcf->show_version_in_header == 0 ) {
-                    if (clcf->server_tokens) {
-                        h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger");
-                    } else {
-                        h->value.data = (u_char *) ("nginx + Phusion Passenger");
-                    }
+                    h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger (mod_rails/mod_rack)");
                 } else {
-                    if (clcf->server_tokens) {
-                        h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger " PASSENGER_VERSION);
-                    } else {
-                        h->value.data = (u_char *) ("nginx + Phusion Passenger " PASSENGER_VERSION);
-                    }
+                    h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger " PASSENGER_VERSION " (mod_rails/mod_rack)");
                 }
                 h->value.len = ngx_strlen(h->value.data);
                 h->lowcase_key = (u_char *) "server";