passenger 4.0.60 → 5.0.0.beta1

data/ext/nginx/CreateLocationConfig.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.
  *
@@ -130,15 +130,19 @@
 	
 
 	
-		conf->show_version_in_header = NGX_CONF_UNSET;
+		conf->max_preloader_idle_time = NGX_CONF_UNSET;
 	
 
 	
-		conf->max_preloader_idle_time = NGX_CONF_UNSET;
+		conf->env_vars = NULL;
+	
+
+	
+		conf->headers_hash_max_size = NGX_CONF_UNSET_UINT;
 	
 
 	
-		conf->vars_source = NGX_CONF_UNSET_PTR;
+		conf->headers_hash_bucket_size = NGX_CONF_UNSET_UINT;
 	
 
 	

data/ext/nginx/CreateLocationConfig.c.erb

@@ -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.
  *
@@ -43,7 +43,8 @@ def filter_eligible_options(options)
 	return options.reject do |option|
 		option[:alias_for] ||
 			option.fetch(:field, true).nil? ||
-			option[:field].to_s =~ /\./
+			option[:field].to_s =~ /\./ ||
+			option[:auto_generate_nginx_create_code] == false
 	end
 end
 
@@ -62,8 +63,12 @@ end
 		conf-><%= struct_field_for(option) %>.len  = 0;
 	<% elsif option[:type] == :integer || option[:type] == :flag %>
 		conf-><%= struct_field_for(option) %> = NGX_CONF_UNSET;
-	<% elsif option[:type] == :string_array || option[:type] == :string_keyval %>
+	<% elsif option[:type] == :uinteger %>
+		conf-><%= struct_field_for(option) %> = NGX_CONF_UNSET_UINT;
+	<% elsif option[:type] == :string_array %>
 		conf-><%= struct_field_for(option) %> = NGX_CONF_UNSET_PTR;
+	<% elsif option[:type] == :string_keyval %>
+		conf-><%= struct_field_for(option) %> = NULL;
 	<% else %>
 		<% raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}" %>
 	<% end %>

data/ext/nginx/MergeLocationConfig.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.
  *
@@ -100,6 +100,14 @@
 	
 
 	
+		if (merge_string_array(cf, &prev->base_uris, &conf->base_uris) != NGX_OK) {
+			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+				"cannot merge \"passenger_base_uri\" configurations");
+			return NGX_CONF_ERROR;
+		}
+	
+
+	
 		ngx_conf_merge_str_value(conf->document_root,
 			prev->document_root,
 			NULL);
@@ -142,14 +150,16 @@
 	
 
 	
-		ngx_conf_merge_value(conf->debugger,
-			prev->debugger,
-			NGX_CONF_UNSET);
+		if (merge_string_array(cf, &prev->union_station_filters, &conf->union_station_filters) != NGX_OK) {
+			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+				"cannot merge \"union_station_filter\" configurations");
+			return NGX_CONF_ERROR;
+		}
 	
 
 	
-		ngx_conf_merge_value(conf->show_version_in_header,
-			prev->show_version_in_header,
+		ngx_conf_merge_value(conf->debugger,
+			prev->debugger,
 			NGX_CONF_UNSET);
 	
 
@@ -160,6 +170,26 @@
 	
 
 	
+		if (merge_string_keyval_table(cf, &prev->env_vars, &conf->env_vars) != NGX_OK) {
+			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+				"cannot merge \"passenger_env_var\" configurations");
+			return NGX_CONF_ERROR;
+		}
+	
+
+	
+		ngx_conf_merge_uint_value(conf->headers_hash_max_size,
+			prev->headers_hash_max_size,
+			512);
+	
+
+	
+		ngx_conf_merge_uint_value(conf->headers_hash_bucket_size,
+			prev->headers_hash_bucket_size,
+			64);
+	
+
+	
 		ngx_conf_merge_str_value(conf->spawn_method,
 			prev->spawn_method,
 			NULL);

data/ext/nginx/MergeLocationConfig.c.erb

@@ -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.
  *
@@ -55,6 +55,31 @@ def struct_field_for(option)
 		return option[:name].sub(/^passenger_/, '')
 	end
 end
+
+def default_value_for(option)
+	case option[:type]
+	when :string
+		if option[:default]
+			return option[:default].inspect
+		else
+			return "NULL"
+		end
+	when :integer, :flag
+		if option[:default]
+			return option[:default]
+		else
+			return "NGX_CONF_UNSET"
+		end
+	when :uinteger
+		if option[:default]
+			return option[:default]
+		else
+			return "NGX_CONF_UNSET_UINT"
+		end
+	else
+		raise "Unknown type #{option[:type].inspect} for option #{option[:name]}"
+	end
+end
 %>
 
 <% for option in filter_eligible_options(LOCATION_CONFIGURATION_OPTIONS) %>
@@ -66,6 +91,22 @@ end
 		ngx_conf_merge_value(conf-><%= struct_field_for(option) %>,
 			prev-><%= struct_field_for(option) %>,
 			NGX_CONF_UNSET);
+	<% elsif option[:type] == :uinteger %>
+		ngx_conf_merge_uint_value(conf-><%= struct_field_for(option) %>,
+			prev-><%= struct_field_for(option) %>,
+			<%= default_value_for(option) || "NGX_CONF_UNSET_UINT" %>);
+	<% elsif option[:type] == :string_array %>
+		if (merge_string_array(cf, &prev-><%= struct_field_for(option) %>, &conf-><%= struct_field_for(option) %>) != NGX_OK) {
+			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+				"cannot merge \"<%= option[:name] %>\" configurations");
+			return NGX_CONF_ERROR;
+		}
+	<% elsif option[:type] == :string_keyval %>
+		if (merge_string_keyval_table(cf, &prev-><%= struct_field_for(option) %>, &conf-><%= struct_field_for(option) %>) != NGX_OK) {
+			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+				"cannot merge \"<%= option[:name] %>\" configurations");
+			return NGX_CONF_ERROR;
+		}
 	<% else %>
 		<% raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}" %>
 	<% end %>

data/ext/nginx/ngx_http_passenger_module.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010-2013 Phusion
+ * Copyright (C) 2010-2014 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -43,6 +43,8 @@
 #include "ngx_http_passenger_module.h"
 #include "Configuration.h"
 #include "ContentHandler.h"
+#include "common/Constants.h"
+#include "common/Utils/modp_b64.cpp" /* File is C compatible. */
 
 
 #define HELPER_SERVER_MAX_SHUTDOWN_TIME 5
@@ -129,7 +131,7 @@ save_master_process_pid(ngx_cycle_t *cycle) {
     FILE *f;
 
     last = ngx_snprintf(filename, sizeof(filename) - 1, "%s/control_process.pid",
-                        pp_agents_starter_get_server_instance_dir(pp_agents_starter));
+                        pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
     *last = (u_char) '\0';
 
     f = fopen((const char *) filename, "w");
@@ -201,10 +203,6 @@ starting_helper_server_after_fork(void *arg) {
             putenv(strdup(env));
         }
     }
-
-    /* Set SERVER_SOFTWARE so that application processes know what web
-     * server they're running on during startup. */
-    setenv("SERVER_SOFTWARE", NGINX_VER, 1);
 }
 
 static ngx_int_t
@@ -260,6 +258,9 @@ start_watchdog(ngx_cycle_t *cycle) {
     params    = pp_variant_map_new();
     passenger_root = ngx_str_null_terminate(&passenger_main_conf.root_dir);
 
+    pp_app_type_detector_set_throttle_rate(pp_app_type_detector,
+        passenger_main_conf.stat_throttle_rate);
+
     prestart_uris = (ngx_str_t *) passenger_main_conf.prestart_uris->elts;
     prestart_uris_ary = calloc(sizeof(char *), passenger_main_conf.prestart_uris->nelts);
     for (i = 0; i < passenger_main_conf.prestart_uris->nelts; i++) {
@@ -274,17 +275,21 @@ start_watchdog(ngx_cycle_t *cycle) {
     }
 
     pp_variant_map_set_int    (params, "web_server_pid", getpid());
-    pp_variant_map_set_int    (params, "web_server_worker_uid", core_conf->user);
-    pp_variant_map_set_int    (params, "web_server_worker_gid", core_conf->group);
+    pp_variant_map_set        (params, "server_software", NGINX_VER, strlen(NGINX_VER));
+    pp_variant_map_set_bool   (params, "multi_app", 1);
+    pp_variant_map_set_bool   (params, "load_shell_envvars", 1);
     pp_variant_map_set_int    (params, "log_level", passenger_main_conf.log_level);
-    pp_variant_map_set_ngx_str(params, "debug_log_file", &passenger_main_conf.debug_log_file);
-    pp_variant_map_set_ngx_str(params, "temp_dir", &passenger_main_conf.temp_dir);
+    pp_variant_map_set_ngx_str(params, "data_buffer_dir", &passenger_main_conf.data_buffer_dir);
+    pp_variant_map_set_ngx_str(params, "instance_registry_dir", &passenger_main_conf.instance_registry_dir);
     pp_variant_map_set_bool   (params, "user_switching", passenger_main_conf.user_switching);
+    pp_variant_map_set_bool   (params, "show_version_in_header", passenger_main_conf.show_version_in_header);
+    pp_variant_map_set_bool   (params, "turbocaching", passenger_main_conf.turbocaching);
     pp_variant_map_set_ngx_str(params, "default_user", &passenger_main_conf.default_user);
     pp_variant_map_set_ngx_str(params, "default_group", &passenger_main_conf.default_group);
     pp_variant_map_set_ngx_str(params, "default_ruby", &passenger_main_conf.default_ruby);
     pp_variant_map_set_int    (params, "max_pool_size", passenger_main_conf.max_pool_size);
     pp_variant_map_set_int    (params, "pool_idle_time", passenger_main_conf.pool_idle_time);
+    pp_variant_map_set_int    (params, "stat_throttle_rate", passenger_main_conf.stat_throttle_rate);
     pp_variant_map_set_ngx_str(params, "analytics_log_user", &passenger_main_conf.analytics_log_user);
     pp_variant_map_set_ngx_str(params, "analytics_log_group", &passenger_main_conf.analytics_log_group);
     pp_variant_map_set_ngx_str(params, "union_station_gateway_address", &passenger_main_conf.union_station_gateway_address);
@@ -293,6 +298,14 @@ start_watchdog(ngx_cycle_t *cycle) {
     pp_variant_map_set_ngx_str(params, "union_station_proxy_address", &passenger_main_conf.union_station_proxy_address);
     pp_variant_map_set_strset (params, "prestart_urls", (const char **) prestart_uris_ary, passenger_main_conf.prestart_uris->nelts);
 
+    if (passenger_main_conf.debug_log_file.len > 0) {
+        pp_variant_map_set_ngx_str(params, "debug_log_file", &passenger_main_conf.debug_log_file);
+    } else if (cycle->new_log.file->name.len > 0) {
+        pp_variant_map_set_ngx_str(params, "debug_log_file", &cycle->new_log.file->name);
+    } else if (cycle->log->file->name.len > 0) {
+        pp_variant_map_set_ngx_str(params, "debug_log_file", &cycle->log->file->name);
+    }
+
     ctl = (ngx_keyval_t *) passenger_main_conf.ctl->elts;
     for (i = 0; i < passenger_main_conf.ctl->nelts; i++) {
         pp_variant_map_set2(params,
@@ -312,13 +325,13 @@ start_watchdog(ngx_cycle_t *cycle) {
         goto cleanup;
     }
 
-    /* Create the file passenger_temp_dir + "/control_process.pid"
+    /* Create the file instance_dir + "/control_process.pid"
      * and make it writable by the worker processes. This is because
      * save_master_process_pid is run after Nginx has lowered privileges.
      */
     last = ngx_snprintf(filename, sizeof(filename) - 1,
                         "%s/control_process.pid",
-                        pp_agents_starter_get_server_instance_dir(pp_agents_starter));
+                        pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, (const u_char *) "", 0) != NGX_OK) {
         result = NGX_ERROR;
@@ -335,7 +348,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     /* Create various other info files. */
     last = ngx_snprintf(filename, sizeof(filename) - 1,
                         "%s/web_server.txt",
-                        pp_agents_starter_get_generation_dir(pp_agents_starter));
+                        pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, (const u_char *) NGINX_VER, strlen(NGINX_VER)) != NGX_OK) {
         result = NGX_ERROR;
@@ -344,7 +357,7 @@ start_watchdog(ngx_cycle_t *cycle) {
 
     last = ngx_snprintf(filename, sizeof(filename) - 1,
                         "%s/config_files.txt",
-                        pp_agents_starter_get_generation_dir(pp_agents_starter));
+                        pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
     *last = (u_char) '\0';
     if (create_file(cycle, filename, cycle->conf_file.data, cycle->conf_file.len) != NGX_OK) {
         result = NGX_ERROR;
@@ -399,7 +412,7 @@ pre_config_init(ngx_conf_t *cf)
     pp_placeholder_upstream_address.data = (u_char *) "unix:/passenger_helper_server";
     pp_placeholder_upstream_address.len  = sizeof("unix:/passenger_helper_server") - 1;
     pp_stat_cache = pp_cached_file_stat_new(1024);
-    pp_app_type_detector = pp_app_type_detector_new();
+    pp_app_type_detector = pp_app_type_detector_new(DEFAULT_STAT_THROTTLE_RATE);
     pp_agents_starter = pp_agents_starter_new(AS_NGINX, &error_message);
 
     if (pp_agents_starter == NULL) {

data/ext/oxt/detail/backtrace_disabled.hpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2010 Phusion
+ * Copyright (c) 2010-2014 Phusion
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,7 @@ namespace oxt {
 #define TRACE_POINT() do { /* nothing */ } while (false)
 #define TRACE_POINT_WITH_NAME(name) do { /* nothing */ } while (false)
 #define TRACE_POINT_WITH_DATA(data) do { /* nothing */ } while (false)
+#define TRACE_POINT_WITH_DATA_FUNCTION(func, userData) do { /* nothing */ } while (false)
 #define UPDATE_TRACE_POINT() do { /* nothing */ } while (false)
 
 } // namespace oxt

data/ext/oxt/detail/backtrace_enabled.hpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2010, 2011, 2012 Phusion
+ * Copyright (c) 2010-2014 Phusion
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -41,16 +41,27 @@ namespace oxt {
  * Except if you set the 'detached' argument to true.
  */
 struct trace_point {
+	typedef bool (*DataFunction)(char *output, unsigned int size, void *userData);
+
 	struct detached { };
 
 	const char *function;
 	const char *source;
-	const char *data;
+	union {
+		const char *data;
+		struct {
+			DataFunction func;
+			void *userData;
+		} dataFunc;
+	} u;
 	unsigned short line;
 	bool m_detached;
+	bool m_hasDataFunc;
 
 	trace_point(const char *function, const char *source, unsigned short line,
 		const char *data = 0);
+	trace_point(const char *function, const char *source, unsigned short line,
+		DataFunction dataFunc, void *userData, bool detached = false);
 	trace_point(const char *function, const char *source, unsigned short line,
 		const char *data, const detached &detached_tag);
 	~trace_point();
@@ -60,6 +71,8 @@ struct trace_point {
 #define TRACE_POINT() oxt::trace_point __p(BOOST_CURRENT_FUNCTION, __FILE__, __LINE__)
 #define TRACE_POINT_WITH_NAME(name) oxt::trace_point __p(name, __FILE__, __LINE__)
 #define TRACE_POINT_WITH_DATA(data) oxt::trace_point __p(BOOST_CURRENT_FUNCTION, __FILE__, __LINE__, data)
+#define TRACE_POINT_WITH_DATA_FUNCTION(func, userData) \
+	oxt::trace_point __p(BOOST_CURRENT_FUNCTION, __FILE__, __LINE__, func, (void *) userData)
 #define UPDATE_TRACE_POINT() __p.update(__FILE__, __LINE__)
 
 } // namespace oxt

data/ext/oxt/implementation.cpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2008-2013 Phusion
+ * Copyright (c) 2008-2014 Phusion
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -41,6 +41,7 @@
 	#include <sstream>
 	#include <cstring>
 #endif
+#include <cstring>
 
 
 namespace oxt {
@@ -136,9 +137,9 @@ trace_point::trace_point(const char *_function, const char *_source, unsigned sh
 	const char *_data)
 	: function(_function),
 	  source(_source),
-	  data(_data),
 	  line(_line),
-	  m_detached(false)
+	  m_detached(false),
+	  m_hasDataFunc(false)
 {
 	thread_local_context *ctx = get_thread_local_context();
 	if (OXT_LIKELY(ctx != NULL)) {
@@ -147,16 +148,40 @@ trace_point::trace_point(const char *_function, const char *_source, unsigned sh
 	} else {
 		m_detached = true;
 	}
+	u.data = _data;
+}
+
+trace_point::trace_point(const char *_function, const char *_source, unsigned short _line,
+	DataFunction _dataFunc, void *_userData, bool detached)
+	: function(_function),
+	  source(_source),
+	  line(_line),
+	  m_detached(detached),
+	  m_hasDataFunc(true)
+{
+	if (!detached) {
+		thread_local_context *ctx = get_thread_local_context();
+		if (OXT_LIKELY(ctx != NULL)) {
+			spin_lock::scoped_lock l(ctx->backtrace_lock);
+			ctx->backtrace_list.push_back(this);
+		} else {
+			m_detached = true;
+		}
+	}
+	u.dataFunc.func = _dataFunc;
+	u.dataFunc.userData = _userData;
 }
 
 trace_point::trace_point(const char *_function, const char *_source, unsigned short _line,
 	const char *_data, const detached &detached_tag)
 	: function(_function),
 	  source(_source),
-	  data(_data),
 	  line(_line),
-	  m_detached(true)
-{ }
+	  m_detached(true),
+	  m_hasDataFunc(false)
+{
+	u.data = _data;
+}
 
 trace_point::~trace_point() {
 	if (OXT_LIKELY(!m_detached)) {
@@ -184,12 +209,23 @@ tracable_exception::tracable_exception() {
 
 		backtrace_copy.reserve(ctx->backtrace_list.size());
 		for (it = ctx->backtrace_list.begin(); it != end; it++) {
-			trace_point *p = new trace_point(
-				(*it)->function,
-				(*it)->source,
-				(*it)->line,
-				(*it)->data,
-				trace_point::detached());
+			trace_point *p;
+			if ((*it)->m_hasDataFunc) {
+				p = new trace_point(
+					(*it)->function,
+					(*it)->source,
+					(*it)->line,
+					(*it)->u.dataFunc.func,
+					(*it)->u.dataFunc.userData,
+					true);
+			} else {
+				p = new trace_point(
+					(*it)->function,
+					(*it)->source,
+					(*it)->line,
+					(*it)->u.data,
+					trace_point::detached());
+			}
 			backtrace_copy.push_back(p);
 		}
 	}
@@ -201,12 +237,23 @@ tracable_exception::tracable_exception(const tracable_exception &other)
 	vector<trace_point *>::const_iterator it, end = other.backtrace_copy.end();
 	backtrace_copy.reserve(other.backtrace_copy.size());
 	for (it = other.backtrace_copy.begin(); it != end; it++) {
-		trace_point *p = new trace_point(
-			(*it)->function,
-			(*it)->source,
-			(*it)->line,
-			(*it)->data,
-			trace_point::detached());
+		trace_point *p;
+		if ((*it)->m_hasDataFunc) {
+			p = new trace_point(
+				(*it)->function,
+				(*it)->source,
+				(*it)->line,
+				(*it)->u.dataFunc.func,
+				(*it)->u.dataFunc.userData,
+				true);
+		} else {
+			p = new trace_point(
+				(*it)->function,
+				(*it)->source,
+				(*it)->line,
+				(*it)->u.data,
+				trace_point::detached());
+		}
 		backtrace_copy.push_back(p);
 	}
 }
@@ -246,8 +293,18 @@ format_backtrace(const Collection &backtrace_list) {
 					source = p->source;
 				}
 				result << " (" << source << ":" << p->line << ")";
-				if (p->data != NULL) {
-					result << " -- " << p->data;
+				if (p->m_hasDataFunc) {
+					if (p->u.dataFunc.func != NULL) {
+						char buf[64];
+
+						memset(buf, 0, sizeof(buf));
+						if (p->u.dataFunc.func(buf, sizeof(buf) - 1, p->u.dataFunc.userData)) {
+							buf[63] = '\0';
+							result << " -- " << buf;
+						}
+					}
+				} else if (p->u.data != NULL) {
+					result << " -- " << p->u.data;
 				}
 			}
 			result << endl;
@@ -418,6 +475,21 @@ thread::all_backtraces() throw() {
 	#endif
 }
 
+string
+thread::current_backtrace() throw() {
+	#ifdef OXT_BACKTRACE_IS_ENABLED
+		thread_local_context *ctx = get_thread_local_context();
+		if (OXT_LIKELY(ctx != NULL)) {
+			spin_lock::scoped_lock l(ctx->backtrace_lock);
+			return format_backtrace(ctx->backtrace_list);
+		} else {
+			return "(OXT not initialized)";
+		}
+	#else
+		return "(backtrace support disabled during compile time)";
+	#endif
+}
+
 void
 thread::interrupt(bool interruptSyscalls) {
 	int ret;