passenger 2.2.15 → 3.0.0.pre1

data/ext/libev/missing

@@ -0,0 +1,336 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing 0.4 - GNU automake"
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+  aclocal*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
+    touch $file
+    ;;
+
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0

data/ext/libev/mkinstalldirs

@@ -0,0 +1,111 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage" 1>&2
+      exit 0
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+case $dirmode in
+  '')
+    if mkdir -p -- . 2>/dev/null; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    fi
+    ;;
+esac
+
+for file
+do
+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  shift
+
+  pathcomp=
+  for d
+  do
+    pathcomp="$pathcomp$d"
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
+
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
+
+      mkdir "$pathcomp" || lasterr=$?
+
+      if test ! -d "$pathcomp"; then
+  	errstatus=$lasterr
+      else
+  	if test ! -z "$dirmode"; then
+	  echo "chmod $dirmode $pathcomp"
+    	  lasterr=""
+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+  	  if test ! -z "$lasterr"; then
+  	    errstatus=$lasterr
+  	  fi
+  	fi
+      fi
+    fi
+
+    pathcomp="$pathcomp/"
+  done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# End:
+# mkinstalldirs ends here

data/ext/nginx/Configuration.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2008, 2009 Phusion
+ * Copyright (C) 2010 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,9 +29,13 @@
 #include <ngx_core.h>
 #include <ngx_http.h>
 
+#include <sys/types.h>
+#include <pwd.h>
+
 #include "ngx_http_passenger_module.h"
 #include "Configuration.h"
 #include "ContentHandler.h"
+#include "../common/Constants.h"
 
 
 static ngx_str_t headers_to_hide[] = {
@@ -47,11 +51,9 @@ static ngx_str_t headers_to_hide[] = {
 
 passenger_main_conf_t passenger_main_conf;
 
-#if NGINX_VERSION_NUM >= 7000
-    static ngx_path_init_t  ngx_http_proxy_temp_path = {
-        ngx_string(NGX_HTTP_PROXY_TEMP_PATH), { 1, 2, 0 }
-    };
-#endif
+static ngx_path_init_t  ngx_http_proxy_temp_path = {
+    ngx_string(NGX_HTTP_PROXY_TEMP_PATH), { 1, 2, 0 }
+};
 
 
 void *
@@ -64,13 +66,36 @@ passenger_create_main_conf(ngx_conf_t *cf)
         return NGX_CONF_ERROR;
     }
     
-    conf->log_level     = (ngx_uint_t) NGX_CONF_UNSET;
+    conf->log_level     = (ngx_int_t) NGX_CONF_UNSET;
+    conf->debug_log_file.data = NULL;
+    conf->debug_log_file.len = 0;
+    conf->abort_on_startup_error = NGX_CONF_UNSET;
     conf->max_pool_size = (ngx_uint_t) NGX_CONF_UNSET;
     conf->max_instances_per_app = (ngx_uint_t) NGX_CONF_UNSET;
     conf->pool_idle_time = (ngx_uint_t) NGX_CONF_UNSET;
     conf->user_switching = NGX_CONF_UNSET;
     conf->default_user.data = NULL;
     conf->default_user.len  = 0;
+    conf->default_group.data = NULL;
+    conf->default_group.len  = 0;
+    conf->analytics_log_dir.data = NULL;
+    conf->analytics_log_dir.len  = 0;
+    conf->analytics_log_user.data = NULL;
+    conf->analytics_log_user.len  = 0;
+    conf->analytics_log_group.data = NULL;
+    conf->analytics_log_group.len  = 0;
+    conf->analytics_log_permissions.data = NULL;
+    conf->analytics_log_permissions.len  = 0;
+    conf->union_station_gateway_address.data = NULL;
+    conf->union_station_gateway_address.len = 0;
+    conf->union_station_gateway_port = (ngx_uint_t) NGX_CONF_UNSET;
+    conf->union_station_gateway_cert.data = NULL;
+    conf->union_station_gateway_cert.len = 0;
+    
+    conf->prestart_uris = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t));
+    if (conf->prestart_uris == NULL) {
+        return NGX_CONF_ERROR;
+    }
     
     return conf;
 }
@@ -79,6 +104,11 @@ char *
 passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
 {
     passenger_main_conf_t *conf;
+    u_char                 filename[NGX_MAX_PATH], *last;
+    ngx_str_t              str;
+    struct passwd         *user_entry;
+    struct group          *group_entry;
+    char buf[128];
     
     conf = &passenger_main_conf;
     *conf = *((passenger_main_conf_t *) conf_pointer);
@@ -88,20 +118,28 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
         conf->ruby.len  = sizeof("ruby") - 1;
     }
     
-    if (conf->log_level == (ngx_uint_t) NGX_CONF_UNSET) {
-        conf->log_level = 0;
+    if (conf->log_level == (ngx_int_t) NGX_CONF_UNSET) {
+        conf->log_level = DEFAULT_LOG_LEVEL;
+    }
+    
+    if (conf->debug_log_file.len == 0) {
+        conf->debug_log_file.data = (u_char *) "";
+    }
+    
+    if (conf->abort_on_startup_error == NGX_CONF_UNSET) {
+        conf->abort_on_startup_error = 0;
     }
     
     if (conf->max_pool_size == (ngx_uint_t) NGX_CONF_UNSET) {
-        conf->max_pool_size = 6;
+        conf->max_pool_size = DEFAULT_MAX_POOL_SIZE;
     }
     
     if (conf->max_instances_per_app == (ngx_uint_t) NGX_CONF_UNSET) {
-        conf->max_instances_per_app = 0;
+        conf->max_instances_per_app = DEFAULT_MAX_INSTANCES_PER_APP;
     }
     
     if (conf->pool_idle_time == (ngx_uint_t) NGX_CONF_UNSET) {
-        conf->pool_idle_time = 300;
+        conf->pool_idle_time = DEFAULT_POOL_IDLE_TIME;
     }
     
     if (conf->user_switching == NGX_CONF_UNSET) {
@@ -109,8 +147,89 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
     }
     
     if (conf->default_user.len == 0) {
-        conf->default_user.len  = sizeof("nobody") - 1;
-        conf->default_user.data = (u_char *) "nobody";
+        conf->default_user.len  = sizeof(DEFAULT_WEB_APP_USER) - 1;
+        conf->default_user.data = (u_char *) DEFAULT_WEB_APP_USER;
+    }
+    if (conf->default_user.len > sizeof(buf) - 1) {
+        return "Value for 'default_user' is too long.";
+    }
+    memcpy(buf, conf->default_user.data, conf->default_user.len);
+    buf[conf->default_user.len] = '\0';
+    user_entry = getpwnam(buf);
+    if (user_entry == NULL) {
+        return "The user specified by the 'default_user' option does not exist.";
+    }
+    
+    if (conf->default_group.len == 0) {
+        group_entry = getgrgid(user_entry->pw_gid);
+        if (group_entry != NULL) {
+            conf->default_group.len  = strlen(group_entry->gr_name);
+            conf->default_group.data = ngx_palloc(cf->pool, conf->default_group.len + 1);
+            memcpy(conf->default_group.data, group_entry->gr_name, conf->default_group.len + 1);
+        } else {
+            return "The primary group of the user specified by the 'default_user' "
+                   "option does not exist. Your system's user account database is "
+                   "probably broken, please fix it.";
+        }
+    } else {
+        if (conf->default_group.len > sizeof(buf) - 1) {
+            return "Value for 'default_group' is too long.";
+        }
+        memcpy(buf, conf->default_group.data, conf->default_group.len);
+        buf[conf->default_group.len] = '\0';
+        group_entry = getgrnam(buf);
+        if (group_entry == NULL) {
+            return "The group specified by the 'default_group' option does not exist.";
+        }
+    }
+    
+    if (conf->analytics_log_dir.len == 0) {
+        if (geteuid() == 0) {
+            conf->analytics_log_dir.data = (u_char *) "/var/log/passenger-analytics";
+            conf->analytics_log_dir.len  = sizeof("/var/log/passenger-analytics") - 1;
+        } else {
+            user_entry = getpwuid(geteuid());
+            if (user_entry == NULL) {
+                last = ngx_snprintf(filename, sizeof(filename),
+                                    "/tmp/passenger-analytics-logs.user-%L",
+                                    (int64_t) geteuid());
+            } else {
+                last = ngx_snprintf(filename, sizeof(filename),
+                                    "/tmp/passenger-analytics-logs.%s",
+                                    user_entry->pw_name);
+            }
+            str.data = filename;
+            str.len  = last - filename;
+            conf->analytics_log_dir.data = ngx_pstrdup(cf->pool, &str);
+            conf->analytics_log_dir.len  = str.len;
+        }
+    }
+    
+    if (conf->analytics_log_user.len == 0) {
+        conf->analytics_log_user.len  = sizeof(DEFAULT_ANALYTICS_LOG_USER) - 1;
+        conf->analytics_log_user.data = (u_char *) DEFAULT_ANALYTICS_LOG_USER;
+    }
+    
+    if (conf->analytics_log_group.len == 0) {
+        conf->analytics_log_group.len  = sizeof(DEFAULT_ANALYTICS_LOG_GROUP) - 1;
+        conf->analytics_log_group.data = (u_char *) DEFAULT_ANALYTICS_LOG_GROUP;
+    }
+    
+    if (conf->analytics_log_permissions.len == 0) {
+        conf->analytics_log_permissions.len  = sizeof(DEFAULT_ANALYTICS_LOG_PERMISSIONS) - 1;
+        conf->analytics_log_permissions.data = (u_char *) DEFAULT_ANALYTICS_LOG_PERMISSIONS;
+    }
+    
+    if (conf->union_station_gateway_address.len == 0) {
+        conf->union_station_gateway_address.data = (u_char *) "";
+    }
+    
+    if (conf->union_station_gateway_port == (ngx_uint_t) NGX_CONF_UNSET) {
+        conf->union_station_gateway_port = DEFAULT_UNION_STATION_GATEWAY_PORT;
+    }
+    
+    if (conf->union_station_gateway_cert.len == 0) {
+        conf->union_station_gateway_cert.data = (u_char *) "";
     }
     
     return NGX_CONF_OK;
@@ -130,17 +249,16 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     /*
      * set by ngx_pcalloc():
      *
-     *     conf->upstream.bufs.num = 0;
-     *     conf->upstream.next_upstream = 0;
-     *     conf->upstream.temp_path = NULL;
-     *     conf->upstream.hide_headers_hash = { NULL, 0 };
-     *     conf->upstream.hide_headers = NULL;
-     *     conf->upstream.pass_headers = NULL;
-     *     conf->upstream.schema = { 0, NULL };
-     *     conf->upstream.uri = { 0, NULL };
-     *     conf->upstream.location = NULL;
-     *     conf->upstream.store_lengths = NULL;
-     *     conf->upstream.store_values = NULL;
+     *     conf->upstream_config.bufs.num = 0;
+     *     conf->upstream_config.next_upstream = 0;
+     *     conf->upstream_config.temp_path = NULL;
+     *     conf->upstream_config.hide_headers_hash = { NULL, 0 };
+     *     conf->upstream_config.hide_headers = NULL;
+     *     conf->upstream_config.pass_headers = NULL;
+     *     conf->upstream_config.uri = { 0, NULL };
+     *     conf->upstream_config.location = NULL;
+     *     conf->upstream_config.store_lengths = NULL;
+     *     conf->upstream_config.store_values = NULL;
      *
      *     conf->index.len = 0;
      *     conf->index.data = NULL;
@@ -148,36 +266,56 @@ 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->analytics = NGX_CONF_UNSET;
+    conf->debugger = NGX_CONF_UNSET;
+    conf->show_version_in_header = NGX_CONF_UNSET;
     conf->environment.data = NULL;
     conf->environment.len = 0;
     conf->spawn_method.data = NULL;
     conf->spawn_method.len = 0;
+    conf->union_station_key.data = NULL;
+    conf->union_station_key.len = 0;
+    conf->user.data = NULL;
+    conf->user.len = 0;
+    conf->group.data = NULL;
+    conf->group.len = 0;
+    conf->app_group_name.data = NULL;
+    conf->app_group_name.len = 0;
+    conf->app_rights.data = NULL;
+    conf->app_rights.len = 0;
     conf->base_uris = NGX_CONF_UNSET_PTR;
+    conf->min_instances = NGX_CONF_UNSET;
     conf->framework_spawner_idle_time = NGX_CONF_UNSET;
     conf->app_spawner_idle_time = NGX_CONF_UNSET;
 
-    conf->upstream.store = NGX_CONF_UNSET;
-    conf->upstream.store_access = NGX_CONF_UNSET_UINT;
-    conf->upstream.buffering = NGX_CONF_UNSET;
-    conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
+    /******************************/
+    /******************************/
+
+    conf->upstream_config.pass_headers = ngx_array_create(cf->pool, 1, sizeof(ngx_keyval_t));
 
-    conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
-    conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
-    conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
+    conf->upstream_config.store = NGX_CONF_UNSET;
+    conf->upstream_config.store_access = NGX_CONF_UNSET_UINT;
+    conf->upstream_config.buffering = NGX_CONF_UNSET;
+    conf->upstream_config.ignore_client_abort = NGX_CONF_UNSET;
 
-    conf->upstream.send_lowat = NGX_CONF_UNSET_SIZE;
-    conf->upstream.buffer_size = NGX_CONF_UNSET_SIZE;
+    conf->upstream_config.connect_timeout = NGX_CONF_UNSET_MSEC;
+    conf->upstream_config.send_timeout = NGX_CONF_UNSET_MSEC;
+    conf->upstream_config.read_timeout = NGX_CONF_UNSET_MSEC;
 
-    conf->upstream.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE;
-    conf->upstream.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
-    conf->upstream.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE;
+    conf->upstream_config.send_lowat = NGX_CONF_UNSET_SIZE;
+    conf->upstream_config.buffer_size = NGX_CONF_UNSET_SIZE;
 
-    conf->upstream.pass_request_headers = NGX_CONF_UNSET;
-    conf->upstream.pass_request_body = NGX_CONF_UNSET;
+    conf->upstream_config.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE;
+    conf->upstream_config.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
+    conf->upstream_config.temp_file_write_size_conf = NGX_CONF_UNSET_SIZE;
 
-    conf->upstream.intercept_errors = NGX_CONF_UNSET;
+    conf->upstream_config.pass_request_headers = NGX_CONF_UNSET;
+    conf->upstream_config.pass_request_body = NGX_CONF_UNSET;
 
-    conf->upstream.cyclic_temp_file = 0;
+    conf->upstream_config.intercept_errors = NGX_CONF_UNSET;
+
+    conf->upstream_config.cyclic_temp_file = 0;
     
     #define DEFINE_VAR_TO_PASS(header_name, var_name) \
         kv = ngx_array_push(conf->vars_source);       \
@@ -224,14 +362,21 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_hash_init_t               hash;
     ngx_http_script_compile_t     sc;
     ngx_http_script_copy_code_t  *copy;
-    #if NGINX_VERSION_NUM < 7000
-        u_char                       *temp_path;
-    #endif
 
     ngx_conf_merge_value(conf->enabled, prev->enabled, 0);
-    ngx_conf_merge_value(conf->use_global_queue, prev->use_global_queue, 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->analytics, prev->analytics, 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->environment, prev->environment, "production");
     ngx_conf_merge_str_value(conf->spawn_method, prev->spawn_method, "smart-lv2");
+    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, "");
+    ngx_conf_merge_str_value(conf->app_group_name, prev->app_group_name, NULL);
+    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->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);
     
@@ -253,71 +398,73 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
+    /******************************/
+    /******************************/
 
-    if (conf->upstream.store != 0) {
-        ngx_conf_merge_value(conf->upstream.store,
-                                  prev->upstream.store, 0);
+    if (conf->upstream_config.store != 0) {
+        ngx_conf_merge_value(conf->upstream_config.store,
+                                  prev->upstream_config.store, 0);
 
-        if (conf->upstream.store_lengths == NULL) {
-            conf->upstream.store_lengths = prev->upstream.store_lengths;
-            conf->upstream.store_values = prev->upstream.store_values;
+        if (conf->upstream_config.store_lengths == NULL) {
+            conf->upstream_config.store_lengths = prev->upstream_config.store_lengths;
+            conf->upstream_config.store_values = prev->upstream_config.store_values;
         }
     }
 
-    ngx_conf_merge_uint_value(conf->upstream.store_access,
-                              prev->upstream.store_access, 0600);
+    ngx_conf_merge_uint_value(conf->upstream_config.store_access,
+                              prev->upstream_config.store_access, 0600);
 
-    ngx_conf_merge_value(conf->upstream.buffering,
-                              prev->upstream.buffering, 1);
+    ngx_conf_merge_value(conf->upstream_config.buffering,
+                              prev->upstream_config.buffering, 1);
 
-    ngx_conf_merge_value(conf->upstream.ignore_client_abort,
-                              prev->upstream.ignore_client_abort, 0);
+    ngx_conf_merge_value(conf->upstream_config.ignore_client_abort,
+                              prev->upstream_config.ignore_client_abort, 0);
 
-    ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
-                              prev->upstream.connect_timeout, 600000);
+    ngx_conf_merge_msec_value(conf->upstream_config.connect_timeout,
+                              prev->upstream_config.connect_timeout, 600000);
 
-    ngx_conf_merge_msec_value(conf->upstream.send_timeout,
-                              prev->upstream.send_timeout, 600000);
+    ngx_conf_merge_msec_value(conf->upstream_config.send_timeout,
+                              prev->upstream_config.send_timeout, 600000);
 
-    ngx_conf_merge_msec_value(conf->upstream.read_timeout,
-                              prev->upstream.read_timeout, 600000);
+    ngx_conf_merge_msec_value(conf->upstream_config.read_timeout,
+                              prev->upstream_config.read_timeout, 600000);
 
-    ngx_conf_merge_size_value(conf->upstream.send_lowat,
-                              prev->upstream.send_lowat, 0);
+    ngx_conf_merge_size_value(conf->upstream_config.send_lowat,
+                              prev->upstream_config.send_lowat, 0);
 
-    ngx_conf_merge_size_value(conf->upstream.buffer_size,
-                              prev->upstream.buffer_size,
+    ngx_conf_merge_size_value(conf->upstream_config.buffer_size,
+                              prev->upstream_config.buffer_size,
                               (size_t) ngx_pagesize);
 
 
-    ngx_conf_merge_bufs_value(conf->upstream.bufs, prev->upstream.bufs,
+    ngx_conf_merge_bufs_value(conf->upstream_config.bufs, prev->upstream_config.bufs,
                               8, ngx_pagesize);
 
-    if (conf->upstream.bufs.num < 2) {
+    if (conf->upstream_config.bufs.num < 2) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "there must be at least 2 \"scgi_buffers\"");
         return NGX_CONF_ERROR;
     }
 
 
-    size = conf->upstream.buffer_size;
-    if (size < conf->upstream.bufs.size) {
-        size = conf->upstream.bufs.size;
+    size = conf->upstream_config.buffer_size;
+    if (size < conf->upstream_config.bufs.size) {
+        size = conf->upstream_config.bufs.size;
     }
 
 
-    ngx_conf_merge_size_value(conf->upstream.busy_buffers_size_conf,
-                              prev->upstream.busy_buffers_size_conf,
+    ngx_conf_merge_size_value(conf->upstream_config.busy_buffers_size_conf,
+                              prev->upstream_config.busy_buffers_size_conf,
                               NGX_CONF_UNSET_SIZE);
 
-    if (conf->upstream.busy_buffers_size_conf == NGX_CONF_UNSET_SIZE) {
-        conf->upstream.busy_buffers_size = 2 * size;
+    if (conf->upstream_config.busy_buffers_size_conf == NGX_CONF_UNSET_SIZE) {
+        conf->upstream_config.busy_buffers_size = 2 * size;
     } else {
-        conf->upstream.busy_buffers_size =
-                                         conf->upstream.busy_buffers_size_conf;
+        conf->upstream_config.busy_buffers_size =
+                                         conf->upstream_config.busy_buffers_size_conf;
     }
 
-    if (conf->upstream.busy_buffers_size < size) {
+    if (conf->upstream_config.busy_buffers_size < size) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
              "\"scgi_busy_buffers_size\" must be equal or bigger than "
              "maximum of the value of \"scgi_buffer_size\" and "
@@ -326,8 +473,8 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
-    if (conf->upstream.busy_buffers_size
-        > (conf->upstream.bufs.num - 1) * conf->upstream.bufs.size)
+    if (conf->upstream_config.busy_buffers_size
+        > (conf->upstream_config.bufs.num - 1) * conf->upstream_config.bufs.size)
     {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
              "\"scgi_busy_buffers_size\" must be less than "
@@ -337,18 +484,18 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     }
 
 
-    ngx_conf_merge_size_value(conf->upstream.temp_file_write_size_conf,
-                              prev->upstream.temp_file_write_size_conf,
+    ngx_conf_merge_size_value(conf->upstream_config.temp_file_write_size_conf,
+                              prev->upstream_config.temp_file_write_size_conf,
                               NGX_CONF_UNSET_SIZE);
 
-    if (conf->upstream.temp_file_write_size_conf == NGX_CONF_UNSET_SIZE) {
-        conf->upstream.temp_file_write_size = 2 * size;
+    if (conf->upstream_config.temp_file_write_size_conf == NGX_CONF_UNSET_SIZE) {
+        conf->upstream_config.temp_file_write_size = 2 * size;
     } else {
-        conf->upstream.temp_file_write_size =
-                                      conf->upstream.temp_file_write_size_conf;
+        conf->upstream_config.temp_file_write_size =
+                                      conf->upstream_config.temp_file_write_size_conf;
     }
 
-    if (conf->upstream.temp_file_write_size < size) {
+    if (conf->upstream_config.temp_file_write_size < size) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
              "\"scgi_temp_file_write_size\" must be equal or bigger than "
              "maximum of the value of \"scgi_buffer_size\" and "
@@ -358,19 +505,19 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     }
 
 
-    ngx_conf_merge_size_value(conf->upstream.max_temp_file_size_conf,
-                              prev->upstream.max_temp_file_size_conf,
+    ngx_conf_merge_size_value(conf->upstream_config.max_temp_file_size_conf,
+                              prev->upstream_config.max_temp_file_size_conf,
                               NGX_CONF_UNSET_SIZE);
 
-    if (conf->upstream.max_temp_file_size_conf == NGX_CONF_UNSET_SIZE) {
-        conf->upstream.max_temp_file_size = 1024 * 1024 * 1024;
+    if (conf->upstream_config.max_temp_file_size_conf == NGX_CONF_UNSET_SIZE) {
+        conf->upstream_config.max_temp_file_size = 1024 * 1024 * 1024;
     } else {
-        conf->upstream.max_temp_file_size =
-                                        conf->upstream.max_temp_file_size_conf;
+        conf->upstream_config.max_temp_file_size =
+                                        conf->upstream_config.max_temp_file_size_conf;
     }
 
-    if (conf->upstream.max_temp_file_size != 0
-        && conf->upstream.max_temp_file_size < size)
+    if (conf->upstream_config.max_temp_file_size != 0
+        && conf->upstream_config.max_temp_file_size < size)
     {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
              "\"scgi_max_temp_file_size\" must be equal to zero to disable "
@@ -382,63 +529,52 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     }
 
 
-    ngx_conf_merge_bitmask_value(conf->upstream.next_upstream,
-                              prev->upstream.next_upstream,
+    ngx_conf_merge_bitmask_value(conf->upstream_config.next_upstream,
+                              prev->upstream_config.next_upstream,
                               (NGX_CONF_BITMASK_SET
                                |NGX_HTTP_UPSTREAM_FT_ERROR
                                |NGX_HTTP_UPSTREAM_FT_TIMEOUT));
 
-    if (conf->upstream.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
-        conf->upstream.next_upstream = NGX_CONF_BITMASK_SET
+    if (conf->upstream_config.next_upstream & NGX_HTTP_UPSTREAM_FT_OFF) {
+        conf->upstream_config.next_upstream = NGX_CONF_BITMASK_SET
                                        |NGX_HTTP_UPSTREAM_FT_OFF;
     }
 
-    #if NGINX_VERSION_NUM < 7000
-        temp_path = ngx_palloc(cf->pool, NGX_MAX_PATH);
-        ngx_memzero(temp_path, NGX_MAX_PATH);
-        ngx_snprintf(temp_path, NGX_MAX_PATH, "%s/webserver_private", passenger_temp_dir);
-        ngx_conf_merge_path_value(conf->upstream.temp_path,
-                                  prev->upstream.temp_path,
-                                  temp_path, 1, 2, 0,
-                                  ngx_garbage_collector_temp_handler, cf);
-        conf->upstream.temp_path->name.len = ngx_strlen(conf->upstream.temp_path->name.data);
-    #else
-        ngx_conf_merge_path_value(cf,
-                                  &conf->upstream.temp_path,
-                                  prev->upstream.temp_path,
-                                  &ngx_http_proxy_temp_path);
-    #endif
+    ngx_conf_merge_path_value(cf,
+                              &conf->upstream_config.temp_path,
+                              prev->upstream_config.temp_path,
+                              &ngx_http_proxy_temp_path);
 
-    ngx_conf_merge_value(conf->upstream.pass_request_headers,
-                              prev->upstream.pass_request_headers, 1);
-    ngx_conf_merge_value(conf->upstream.pass_request_body,
-                              prev->upstream.pass_request_body, 1);
+    ngx_conf_merge_value(conf->upstream_config.pass_request_headers,
+                         prev->upstream_config.pass_request_headers, 1);
+    ngx_conf_merge_value(conf->upstream_config.pass_request_body,
+                         prev->upstream_config.pass_request_body, 1);
 
-    ngx_conf_merge_value(conf->upstream.intercept_errors,
-                              prev->upstream.intercept_errors, 0);
+    ngx_conf_merge_value(conf->upstream_config.intercept_errors,
+                         prev->upstream_config.intercept_errors, 0);
 
 
 
     ngx_conf_merge_str_value(conf->index, prev->index, "");
 
-    if (conf->upstream.hide_headers == NULL
-        && conf->upstream.pass_headers == NULL)
+    if (conf->upstream_config.hide_headers == NULL
+        && conf->upstream_config.pass_headers == NULL)
     {
-        conf->upstream.hide_headers = prev->upstream.hide_headers;
-        conf->upstream.pass_headers = prev->upstream.pass_headers;
-        conf->upstream.hide_headers_hash = prev->upstream.hide_headers_hash;
+        conf->upstream_config.hide_headers = prev->upstream_config.hide_headers;
+        conf->upstream_config.pass_headers = prev->upstream_config.pass_headers;
+        conf->upstream_config.hide_headers_hash = prev->upstream_config.hide_headers_hash;
 
-        if (conf->upstream.hide_headers_hash.buckets) {
+        if (conf->upstream_config.hide_headers_hash.buckets) {
             goto peers;
         }
 
     } else {
-        if (conf->upstream.hide_headers == NULL) {
-            conf->upstream.hide_headers = prev->upstream.hide_headers;
+        if (conf->upstream_config.hide_headers == NULL) {
+            conf->upstream_config.hide_headers = prev->upstream_config.hide_headers;
         }
 
-        if (conf->upstream.pass_headers == NULL) {
-            conf->upstream.pass_headers = prev->upstream.pass_headers;
+        if (conf->upstream_config.pass_headers == NULL) {
+            conf->upstream_config.pass_headers = prev->upstream_config.pass_headers;
         }
     }
 
@@ -459,11 +595,11 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         hk->value = (void *) 1;
     }
 
-    if (conf->upstream.hide_headers) {
+    if (conf->upstream_config.hide_headers) {
 
-        header = conf->upstream.hide_headers->elts;
+        header = conf->upstream_config.hide_headers->elts;
 
-        for (i = 0; i < conf->upstream.hide_headers->nelts; i++) {
+        for (i = 0; i < conf->upstream_config.hide_headers->nelts; i++) {
 
             hk = hide_headers.elts;
 
@@ -488,12 +624,12 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
-    if (conf->upstream.pass_headers) {
+    if (conf->upstream_config.pass_headers) {
 
         hk = hide_headers.elts;
-        header = conf->upstream.pass_headers->elts;
+        header = conf->upstream_config.pass_headers->elts;
 
-        for (i = 0; i < conf->upstream.pass_headers->nelts; i++) {
+        for (i = 0; i < conf->upstream_config.pass_headers->nelts; i++) {
 
             for (j = 0; j < hide_headers.nelts; j++) {
 
@@ -509,7 +645,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         }
     }
 
-    hash.hash = &conf->upstream.hide_headers_hash;
+    hash.hash = &conf->upstream_config.hide_headers_hash;
     hash.key = ngx_hash_key_lc;
     hash.max_size = 512;
     hash.bucket_size = ngx_align(64, ngx_cacheline_size);
@@ -523,11 +659,8 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 peers:
 
-    if (conf->upstream.upstream == NULL) {
-        conf->upstream.upstream = prev->upstream.upstream;
-        #if NGINX_VERSION_NUM < 7000
-            conf->upstream.schema = prev->upstream.schema;
-        #endif
+    if (conf->upstream_config.upstream == NULL) {
+        conf->upstream_config.upstream = prev->upstream_config.upstream;
     }
 
     if (conf->vars_source == NULL) {
@@ -665,36 +798,28 @@ peers:
 static char *
 passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-    passenger_loc_conf_t        *lcf = conf;
-
-    ngx_url_t                    u;
+    passenger_loc_conf_t        *passenger_conf = conf;
     ngx_http_core_loc_conf_t    *clcf;
     ngx_str_t                   *value;
+    ngx_url_t                    upstream_url;
 
     value = cf->args->elts;
     if (ngx_strcasecmp(value[1].data, (u_char *) "on") == 0) {
-        #if NGINX_VERSION_NUM < 7000
-            if (lcf->upstream.schema.len) {
-                return "is duplicate";
-            }
-        #endif
-
-        lcf->enabled = 1;
-
-        ngx_memzero(&u, sizeof(ngx_url_t));
-        u.url.data = (u_char *) passenger_helper_server_socket;
-        u.url.len  = strlen(passenger_helper_server_socket);
-        u.no_resolve = 1;
-
-        lcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
-        if (lcf->upstream.upstream == NULL) {
+        passenger_conf->enabled = 1;
+        
+        /* Register a placeholder value as upstream address. The real upstream
+         * address (the helper agent socket filename) will be set while processing
+         * requests, because we can't start the helper agent until config
+         * loading is done.
+         */
+        ngx_memzero(&upstream_url, sizeof(ngx_url_t));
+        upstream_url.url = passenger_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) {
             return NGX_CONF_ERROR;
         }
-
-        #if NGINX_VERSION_NUM < 7000
-            lcf->upstream.schema = passenger_schema_string;
-        #endif
-
+        
         clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
         clcf->handler = passenger_content_handler;
 
@@ -703,7 +828,52 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             clcf->auto_redirect = 1;
         }
     } else {
-        lcf->enabled = 0;
+        passenger_conf->enabled = 0;
+    }
+
+    return NGX_CONF_OK;
+}
+
+static char *
+set_null_terminated_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
+{
+    char  *p = conf;
+
+    ngx_str_t         *value;
+    ngx_array_t      **a;
+    ngx_keyval_t      *kv;
+    ngx_conf_post_t   *post;
+    u_char            *last;
+
+    a = (ngx_array_t **) (p + cmd->offset);
+
+    if (*a == NULL) {
+        *a = ngx_array_create(cf->pool, 4, sizeof(ngx_keyval_t));
+        if (*a == NULL) {
+            return NGX_CONF_ERROR;
+        }
+    }
+
+    kv = ngx_array_push(*a);
+    if (kv == NULL) {
+        return NGX_CONF_ERROR;
+    }
+
+    value = cf->args->elts;
+
+    kv->key.data = ngx_palloc(cf->pool, value[1].len + 1);
+    kv->key.len  = value[1].len + 1;
+    last = ngx_copy(kv->key.data, value[1].data, value[1].len);
+    *last = '\0';
+    
+    kv->value.data = ngx_palloc(cf->pool, value[2].len + 1);
+    kv->value.len  = value[2].len + 1;
+    last = ngx_copy(kv->value.data, value[2].data, value[2].len);
+    *last = '\0';
+
+    if (cmd->post) {
+        post = cmd->post;
+        return post->post_handler(cf, post, kv);
     }
 
     return NGX_CONF_OK;
@@ -865,13 +1035,34 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, log_level),
       NULL },
 
+    { ngx_string("passenger_debug_log_file"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, debug_log_file),
+      NULL },
+
+    { ngx_string("passenger_abort_on_startup_error"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, abort_on_startup_error),
+      NULL },
+
     { ngx_string("passenger_use_global_queue"),
-      NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+      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,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, friendly_error_pages),
+      NULL },
+
     { ngx_string("passenger_max_pool_size"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -879,6 +1070,13 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, max_pool_size),
       NULL },
 
+    { ngx_string("passenger_min_instances"),
+      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, min_instances),
+      NULL },
+
     { ngx_string("passenger_max_instances_per_app"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -894,19 +1092,33 @@ const ngx_command_t passenger_commands[] = {
       NULL },
 
     { ngx_string("passenger_base_uri"),
-      NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_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_array_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(passenger_loc_conf_t, base_uris),
       NULL },
 
     { ngx_string("passenger_user_switching"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
       NGX_HTTP_MAIN_CONF_OFFSET,
       offsetof(passenger_main_conf_t, user_switching),
       NULL },
 
+    { ngx_string("passenger_user"),
+      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_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, user),
+      NULL },
+
+    { ngx_string("passenger_group"),
+      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_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, group),
+      NULL },
+
     { ngx_string("passenger_default_user"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
@@ -914,20 +1126,153 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, default_user),
       NULL },
 
-    { ngx_string("rails_env"),
-      NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    { ngx_string("passenger_default_group"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, default_group),
+      NULL },
+
+    { ngx_string("passenger_app_group_name"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
       ngx_conf_set_str_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(passenger_loc_conf_t, environment),
+      offsetof(passenger_loc_conf_t, app_group_name),
       NULL },
 
-    { ngx_string("rails_spawn_method"),
+    { ngx_string("passenger_app_rights"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, app_rights),
+      NULL },
+
+    { ngx_string("passenger_analytics"),
+      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, analytics),
+      NULL },
+
+    { ngx_string("passenger_analytics_log_dir"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, analytics_log_dir),
+      NULL },
+
+    { ngx_string("passenger_analytics_log_user"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, analytics_log_user),
+      NULL },
+
+    { ngx_string("passenger_analytics_log_group"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, analytics_log_group),
+      NULL },
+
+    { ngx_string("passenger_analytics_log_permissions"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, analytics_log_permissions),
+      NULL },
+
+    { ngx_string("union_station_gateway_address"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, union_station_gateway_address),
+      NULL },
+
+    { ngx_string("union_station_gateway_port"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, union_station_gateway_port),
+      NULL },
+
+    { ngx_string("union_station_gateway_cert"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, union_station_gateway_cert),
+      NULL },
+
+    { ngx_string("passenger_debugger"),
+      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, debugger),
+      NULL },
+
+    { ngx_string("passenger_show_version_in_header"),
+      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, show_version_in_header),
+      NULL },
+
+    { ngx_string("passenger_pre_start"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_array_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, prestart_uris),
+      NULL },
+
+    { ngx_string("passenger_pass_header"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+      ngx_conf_set_str_array_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, upstream_config.pass_headers),
+      NULL },
+
+    { ngx_string("passenger_set_cgi_param"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE2,
+      set_null_terminated_keyval_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, vars_source),
+      NULL },
+
+    { ngx_string("passenger_ignore_client_abort"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, upstream_config.ignore_client_abort),
+      NULL },
+
+    { ngx_string("passenger_buffer_response"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_CONF_FLAG,
+      ngx_conf_set_flag_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, upstream_config.buffering),
+      NULL },
+
+    { ngx_string("passenger_spawn_method"),
       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_LOC_CONF_OFFSET,
       offsetof(passenger_loc_conf_t, spawn_method),
       NULL },
 
+    { ngx_string("union_station_key"),
+      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_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, union_station_key),
+      NULL },
+
+    { ngx_string("rails_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,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      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,
@@ -943,12 +1288,24 @@ const ngx_command_t passenger_commands[] = {
       NULL },
 
     { ngx_string("rack_env"),
-      NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_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_LOC_CONF_OFFSET,
       offsetof(passenger_loc_conf_t, environment),
       NULL },
 
+    /************************************/
+    /************************************/
+
+    /******** Backward compatibility options ********/
+
+    { ngx_string("rails_spawn_method"),
+      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_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, spawn_method),
+      NULL },
+
 /*
 
     { ngx_string("scgi_index"),
@@ -1077,13 +1434,6 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_loc_conf_t, vars_source),
       NULL },
 
-    { ngx_string("scgi_pass_header"),
-      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
-      ngx_conf_set_str_array_slot,
-      NGX_HTTP_LOC_CONF_OFFSET,
-      offsetof(passenger_loc_conf_t, upstream.pass_headers),
-      NULL },
-
     { ngx_string("scgi_hide_header"),
       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
       ngx_conf_set_str_array_slot,