passenger 4.0.60 → 5.0.0.beta1

data/ext/libeio/eio.c

@@ -592,6 +592,17 @@ etp_init (void (*want_poll)(void), void (*done_poll)(void))
   return 0;
 }
 
+static void ecb_cold etp_end_thread (void);
+
+static int
+etp_deinit ()
+{
+  while (started > 0)
+    etp_end_thread ();
+
+  return 0;
+}
+
 X_THREAD_PROC (etp_proc);
 
 static void ecb_cold
@@ -2241,6 +2252,12 @@ eio_init (void (*want_poll)(void), void (*done_poll)(void))
   return etp_init (want_poll, done_poll);
 }
 
+int ecb_cold
+eio_deinit ()
+{
+  return etp_deinit ();
+}
+
 ecb_inline void
 eio_api_destroy (eio_req *req)
 {

data/ext/libeio/eio.h

@@ -298,6 +298,8 @@ enum {
  */
 int eio_init (void (*want_poll)(void), void (*done_poll)(void));
 
+int eio_deinit ();
+
 /* must be called regularly to handle pending requests */
 /* returns 0 if all requests were handled, -1 if not, or the value of EIO_FINISH if != 0 */
 int eio_poll (void);

data/ext/nginx/CacheLocationConfig.c

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion
+ *  Copyright (c) 2010-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -45,36 +45,42 @@ u_char int_buf[32], *end, *buf, *pos;
 
 	
 		if (conf->ruby.data != NULL) {
-			len += 15;
-			len += conf->ruby.len + 1;
+			len += sizeof("!~PASSENGER_RUBY: ") - 1;
+			len += conf->ruby.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->python.data != NULL) {
-			len += 17;
-			len += conf->python.len + 1;
+			len += sizeof("!~PASSENGER_PYTHON: ") - 1;
+			len += conf->python.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->nodejs.data != NULL) {
-			len += 17;
-			len += conf->nodejs.len + 1;
+			len += sizeof("!~PASSENGER_NODEJS: ") - 1;
+			len += conf->nodejs.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->environment.data != NULL) {
-			len += 18;
-			len += conf->environment.len + 1;
+			len += sizeof("!~PASSENGER_APP_ENV: ") - 1;
+			len += conf->environment.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->friendly_error_pages != NGX_CONF_UNSET) {
-			len += 31;
-			len += conf->friendly_error_pages ? sizeof("true") : sizeof("false");
+			len += sizeof("!~PASSENGER_FRIENDLY_ERROR_PAGES: ") - 1;
+			len += conf->friendly_error_pages
+				? sizeof("t\r\n") - 1
+				: sizeof("f\r\n") - 1;
 		}
 	
 
@@ -84,8 +90,9 @@ u_char int_buf[32], *end, *buf, *pos;
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->min_instances);
-			len += 24;
-			len += end - int_buf + 1;
+			len += sizeof("!~PASSENGER_MIN_PROCESSES: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
@@ -95,8 +102,9 @@ u_char int_buf[32], *end, *buf, *pos;
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->max_instances_per_app);
-			len += 24;
-			len += end - int_buf + 1;
+			len += sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
@@ -106,8 +114,9 @@ u_char int_buf[32], *end, *buf, *pos;
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->max_requests);
-			len += 23;
-			len += end - int_buf + 1;
+			len += sizeof("!~PASSENGER_MAX_REQUESTS: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
@@ -117,64 +126,67 @@ u_char int_buf[32], *end, *buf, *pos;
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->start_timeout);
-			len += 24;
-			len += end - int_buf + 1;
+			len += sizeof("!~PASSENGER_START_TIMEOUT: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->user.data != NULL) {
-			len += 15;
-			len += conf->user.len + 1;
+			len += sizeof("!~PASSENGER_USER: ") - 1;
+			len += conf->user.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->group.data != NULL) {
-			len += 16;
-			len += conf->group.len + 1;
+			len += sizeof("!~PASSENGER_GROUP: ") - 1;
+			len += conf->group.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->app_group_name.data != NULL) {
-			len += 25;
-			len += conf->app_group_name.len + 1;
+			len += sizeof("!~PASSENGER_APP_GROUP_NAME: ") - 1;
+			len += conf->app_group_name.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->app_root.data != NULL) {
-			len += 19;
-			len += conf->app_root.len + 1;
+			len += sizeof("!~PASSENGER_APP_ROOT: ") - 1;
+			len += conf->app_root.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->app_rights.data != NULL) {
-			len += 21;
-			len += conf->app_rights.len + 1;
+			len += sizeof("!~PASSENGER_APP_RIGHTS: ") - 1;
+			len += conf->app_rights.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->union_station_support != NGX_CONF_UNSET) {
-			len += 22;
-			len += conf->union_station_support ? sizeof("true") : sizeof("false");
+			len += sizeof("!~UNION_STATION_SUPPORT: ") - 1;
+			len += conf->union_station_support
+				? sizeof("t\r\n") - 1
+				: sizeof("f\r\n") - 1;
 		}
 	
 
 	
 		if (conf->debugger != NGX_CONF_UNSET) {
-			len += 19;
-			len += conf->debugger ? sizeof("true") : sizeof("false");
-		}
-	
-
-	
-		if (conf->show_version_in_header != NGX_CONF_UNSET) {
-			len += 33;
-			len += conf->show_version_in_header ? sizeof("true") : sizeof("false");
+			len += sizeof("!~PASSENGER_DEBUGGER: ") - 1;
+			len += conf->debugger
+				? sizeof("t\r\n") - 1
+				: sizeof("f\r\n") - 1;
 		}
 	
 
@@ -184,29 +196,34 @@ u_char int_buf[32], *end, *buf, *pos;
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->max_preloader_idle_time);
-			len += 34;
-			len += end - int_buf + 1;
+			len += sizeof("!~PASSENGER_MAX_PRELOADER_IDLE_TIME: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->spawn_method.data != NULL) {
-			len += 23;
-			len += conf->spawn_method.len + 1;
+			len += sizeof("!~PASSENGER_SPAWN_METHOD: ") - 1;
+			len += conf->spawn_method.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->load_shell_envvars != NGX_CONF_UNSET) {
-			len += 29;
-			len += conf->load_shell_envvars ? sizeof("true") : sizeof("false");
+			len += sizeof("!~PASSENGER_LOAD_SHELL_ENVVARS: ") - 1;
+			len += conf->load_shell_envvars
+				? sizeof("t\r\n") - 1
+				: sizeof("f\r\n") - 1;
 		}
 	
 
 	
 		if (conf->union_station_key.data != NULL) {
-			len += 18;
-			len += conf->union_station_key.len + 1;
+			len += sizeof("!~UNION_STATION_KEY: ") - 1;
+			len += conf->union_station_key.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
@@ -216,8 +233,9 @@ u_char int_buf[32], *end, *buf, *pos;
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->max_request_queue_size);
-			len += 33;
-			len += end - int_buf + 1;
+			len += sizeof("!~PASSENGER_MAX_REQUEST_QUEUE_SIZE: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
@@ -227,105 +245,110 @@ u_char int_buf[32], *end, *buf, *pos;
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->request_queue_overflow_status_code);
-			len += 45;
-			len += end - int_buf + 1;
+			len += sizeof("!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ") - 1;
+			len += end - int_buf;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->restart_dir.data != NULL) {
-			len += 22;
-			len += conf->restart_dir.len + 1;
+			len += sizeof("!~PASSENGER_RESTART_DIR: ") - 1;
+			len += conf->restart_dir.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->startup_file.data != NULL) {
-			len += 23;
-			len += conf->startup_file.len + 1;
+			len += sizeof("!~PASSENGER_STARTUP_FILE: ") - 1;
+			len += conf->startup_file.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 	
 		if (conf->sticky_sessions != NGX_CONF_UNSET) {
-			len += 26;
-			len += conf->sticky_sessions ? sizeof("true") : sizeof("false");
+			len += sizeof("!~PASSENGER_STICKY_SESSIONS: ") - 1;
+			len += conf->sticky_sessions
+				? sizeof("t\r\n") - 1
+				: sizeof("f\r\n") - 1;
 		}
 	
 
 	
 		if (conf->sticky_sessions_cookie_name.data != NULL) {
-			len += 38;
-			len += conf->sticky_sessions_cookie_name.len + 1;
+			len += sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME: ") - 1;
+			len += conf->sticky_sessions_cookie_name.len;
+			len += sizeof("\r\n") - 1;
 		}
 	
 
 
 /* Create string */
 buf = pos = ngx_pnalloc(cf->pool, len);
+if (buf == NULL) {
+	return NGX_ERROR;
+}
 
 
 	
 		if (conf->ruby.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_RUBY",
-				15);
+				"!~PASSENGER_RUBY: ",
+				sizeof("!~PASSENGER_RUBY: ") - 1);
 			pos = ngx_copy(pos,
 				conf->ruby.data,
 				conf->ruby.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->python.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_PYTHON",
-				17);
+				"!~PASSENGER_PYTHON: ",
+				sizeof("!~PASSENGER_PYTHON: ") - 1);
 			pos = ngx_copy(pos,
 				conf->python.data,
 				conf->python.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->nodejs.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_NODEJS",
-				17);
+				"!~PASSENGER_NODEJS: ",
+				sizeof("!~PASSENGER_NODEJS: ") - 1);
 			pos = ngx_copy(pos,
 				conf->nodejs.data,
 				conf->nodejs.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->environment.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_APP_ENV",
-				18);
+				"!~PASSENGER_APP_ENV: ",
+				sizeof("!~PASSENGER_APP_ENV: ") - 1);
 			pos = ngx_copy(pos,
 				conf->environment.data,
 				conf->environment.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->friendly_error_pages != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_FRIENDLY_ERROR_PAGES",
-				31);
+				"!~PASSENGER_FRIENDLY_ERROR_PAGES: ",
+				sizeof("!~PASSENGER_FRIENDLY_ERROR_PAGES: ") - 1);
 			if (conf->friendly_error_pages) {
-				pos = ngx_copy(pos, "true", sizeof("true"));
+				pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
 			} else {
-				pos = ngx_copy(pos, "false", sizeof("false"));
+				pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
 			}
 		}
 	
@@ -333,145 +356,128 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 		if (conf->min_instances != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_MIN_PROCESSES",
-				24);
+				"!~PASSENGER_MIN_PROCESSES: ",
+				sizeof("!~PASSENGER_MIN_PROCESSES: ") - 1);
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->min_instances);
-			pos = ngx_copy(pos,
-				int_buf,
-				end - int_buf);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->max_instances_per_app != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_MAX_PROCESSES",
-				24);
+				"!~PASSENGER_MAX_PROCESSES: ",
+				sizeof("!~PASSENGER_MAX_PROCESSES: ") - 1);
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->max_instances_per_app);
-			pos = ngx_copy(pos,
-				int_buf,
-				end - int_buf);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->max_requests != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_MAX_REQUESTS",
-				23);
+				"!~PASSENGER_MAX_REQUESTS: ",
+				sizeof("!~PASSENGER_MAX_REQUESTS: ") - 1);
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->max_requests);
-			pos = ngx_copy(pos,
-				int_buf,
-				end - int_buf);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->start_timeout != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_START_TIMEOUT",
-				24);
+				"!~PASSENGER_START_TIMEOUT: ",
+				sizeof("!~PASSENGER_START_TIMEOUT: ") - 1);
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->start_timeout);
-			pos = ngx_copy(pos,
-				int_buf,
-				end - int_buf);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->user.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_USER",
-				15);
+				"!~PASSENGER_USER: ",
+				sizeof("!~PASSENGER_USER: ") - 1);
 			pos = ngx_copy(pos,
 				conf->user.data,
 				conf->user.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->group.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_GROUP",
-				16);
+				"!~PASSENGER_GROUP: ",
+				sizeof("!~PASSENGER_GROUP: ") - 1);
 			pos = ngx_copy(pos,
 				conf->group.data,
 				conf->group.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->app_group_name.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_APP_GROUP_NAME",
-				25);
+				"!~PASSENGER_APP_GROUP_NAME: ",
+				sizeof("!~PASSENGER_APP_GROUP_NAME: ") - 1);
 			pos = ngx_copy(pos,
 				conf->app_group_name.data,
 				conf->app_group_name.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->app_root.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_APP_ROOT",
-				19);
+				"!~PASSENGER_APP_ROOT: ",
+				sizeof("!~PASSENGER_APP_ROOT: ") - 1);
 			pos = ngx_copy(pos,
 				conf->app_root.data,
 				conf->app_root.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->app_rights.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_APP_RIGHTS",
-				21);
+				"!~PASSENGER_APP_RIGHTS: ",
+				sizeof("!~PASSENGER_APP_RIGHTS: ") - 1);
 			pos = ngx_copy(pos,
 				conf->app_rights.data,
 				conf->app_rights.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->union_station_support != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"UNION_STATION_SUPPORT",
-				22);
+				"!~UNION_STATION_SUPPORT: ",
+				sizeof("!~UNION_STATION_SUPPORT: ") - 1);
 			if (conf->union_station_support) {
-				pos = ngx_copy(pos, "true", sizeof("true"));
+				pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
 			} else {
-				pos = ngx_copy(pos, "false", sizeof("false"));
+				pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
 			}
 		}
 	
@@ -479,25 +485,12 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 		if (conf->debugger != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_DEBUGGER",
-				19);
+				"!~PASSENGER_DEBUGGER: ",
+				sizeof("!~PASSENGER_DEBUGGER: ") - 1);
 			if (conf->debugger) {
-				pos = ngx_copy(pos, "true", sizeof("true"));
-			} else {
-				pos = ngx_copy(pos, "false", sizeof("false"));
-			}
-		}
-	
-
-	
-		if (conf->show_version_in_header != NGX_CONF_UNSET) {
-			pos = ngx_copy(pos,
-				"PASSENGER_SHOW_VERSION_IN_HEADER",
-				33);
-			if (conf->show_version_in_header) {
-				pos = ngx_copy(pos, "true", sizeof("true"));
+				pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
 			} else {
-				pos = ngx_copy(pos, "false", sizeof("false"));
+				pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
 			}
 		}
 	
@@ -505,42 +498,38 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 		if (conf->max_preloader_idle_time != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_MAX_PRELOADER_IDLE_TIME",
-				34);
+				"!~PASSENGER_MAX_PRELOADER_IDLE_TIME: ",
+				sizeof("!~PASSENGER_MAX_PRELOADER_IDLE_TIME: ") - 1);
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->max_preloader_idle_time);
-			pos = ngx_copy(pos,
-				int_buf,
-				end - int_buf);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->spawn_method.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_SPAWN_METHOD",
-				23);
+				"!~PASSENGER_SPAWN_METHOD: ",
+				sizeof("!~PASSENGER_SPAWN_METHOD: ") - 1);
 			pos = ngx_copy(pos,
 				conf->spawn_method.data,
 				conf->spawn_method.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->load_shell_envvars != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_LOAD_SHELL_ENVVARS",
-				29);
+				"!~PASSENGER_LOAD_SHELL_ENVVARS: ",
+				sizeof("!~PASSENGER_LOAD_SHELL_ENVVARS: ") - 1);
 			if (conf->load_shell_envvars) {
-				pos = ngx_copy(pos, "true", sizeof("true"));
+				pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
 			} else {
-				pos = ngx_copy(pos, "false", sizeof("false"));
+				pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
 			}
 		}
 	
@@ -548,85 +537,76 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 		if (conf->union_station_key.data != NULL) {
 			pos = ngx_copy(pos,
-				"UNION_STATION_KEY",
-				18);
+				"!~UNION_STATION_KEY: ",
+				sizeof("!~UNION_STATION_KEY: ") - 1);
 			pos = ngx_copy(pos,
 				conf->union_station_key.data,
 				conf->union_station_key.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->max_request_queue_size != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_MAX_REQUEST_QUEUE_SIZE",
-				33);
+				"!~PASSENGER_MAX_REQUEST_QUEUE_SIZE: ",
+				sizeof("!~PASSENGER_MAX_REQUEST_QUEUE_SIZE: ") - 1);
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->max_request_queue_size);
-			pos = ngx_copy(pos,
-				int_buf,
-				end - int_buf);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->request_queue_overflow_status_code != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE",
-				45);
+				"!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ",
+				sizeof("!~PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE: ") - 1);
 			end = ngx_snprintf(int_buf,
 				sizeof(int_buf) - 1,
 				"%d",
 				conf->request_queue_overflow_status_code);
-			pos = ngx_copy(pos,
-				int_buf,
-				end - int_buf);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, int_buf, end - int_buf);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->restart_dir.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_RESTART_DIR",
-				22);
+				"!~PASSENGER_RESTART_DIR: ",
+				sizeof("!~PASSENGER_RESTART_DIR: ") - 1);
 			pos = ngx_copy(pos,
 				conf->restart_dir.data,
 				conf->restart_dir.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->startup_file.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_STARTUP_FILE",
-				23);
+				"!~PASSENGER_STARTUP_FILE: ",
+				sizeof("!~PASSENGER_STARTUP_FILE: ") - 1);
 			pos = ngx_copy(pos,
 				conf->startup_file.data,
 				conf->startup_file.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}
 	
 
 	
 		if (conf->sticky_sessions != NGX_CONF_UNSET) {
 			pos = ngx_copy(pos,
-				"PASSENGER_STICKY_SESSIONS",
-				26);
+				"!~PASSENGER_STICKY_SESSIONS: ",
+				sizeof("!~PASSENGER_STICKY_SESSIONS: ") - 1);
 			if (conf->sticky_sessions) {
-				pos = ngx_copy(pos, "true", sizeof("true"));
+				pos = ngx_copy(pos, "t\r\n", sizeof("t\r\n") - 1);
 			} else {
-				pos = ngx_copy(pos, "false", sizeof("false"));
+				pos = ngx_copy(pos, "f\r\n", sizeof("f\r\n") - 1);
 			}
 		}
 	
@@ -634,13 +614,12 @@ buf = pos = ngx_pnalloc(cf->pool, len);
 	
 		if (conf->sticky_sessions_cookie_name.data != NULL) {
 			pos = ngx_copy(pos,
-				"PASSENGER_STICKY_SESSIONS_COOKIE_NAME",
-				38);
+				"!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME: ",
+				sizeof("!~PASSENGER_STICKY_SESSIONS_COOKIE_NAME: ") - 1);
 			pos = ngx_copy(pos,
 				conf->sticky_sessions_cookie_name.data,
 				conf->sticky_sessions_cookie_name.len);
-			*pos = '\0';
-			pos++;
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
 		}