passenger 3.9.1.beta → 3.9.2.beta

data/ext/nginx/Configuration.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010, 2011, 2012 Phusion
+ * Copyright (C) 2010-2013 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -84,14 +84,10 @@ passenger_create_main_conf(ngx_conf_t *cf)
     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;
@@ -114,8 +110,6 @@ 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];
@@ -188,28 +182,6 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
         }
     }
     
-    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;
@@ -220,11 +192,6 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
         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.len = sizeof(DEFAULT_UNION_STATION_GATEWAY_ADDRESS) - 1;
         conf->union_station_gateway_address.data = (u_char *) DEFAULT_UNION_STATION_GATEWAY_ADDRESS;
@@ -462,19 +429,19 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->upstream_config.store_access, 0600);
 
     ngx_conf_merge_value(conf->upstream_config.buffering,
-                              prev->upstream_config.buffering, 1);
+                              prev->upstream_config.buffering, 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_config.connect_timeout,
-                              prev->upstream_config.connect_timeout, 600000);
+                              prev->upstream_config.connect_timeout, 12000000);
 
     ngx_conf_merge_msec_value(conf->upstream_config.send_timeout,
-                              prev->upstream_config.send_timeout, 600000);
+                              prev->upstream_config.send_timeout, 12000000);
 
     ngx_conf_merge_msec_value(conf->upstream_config.read_timeout,
-                              prev->upstream_config.read_timeout, 600000);
+                              prev->upstream_config.read_timeout, 12000000);
 
     ngx_conf_merge_size_value(conf->upstream_config.send_lowat,
                               prev->upstream_config.send_lowat, 0);
@@ -575,6 +542,9 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         return NGX_CONF_ERROR;
     }
 
+    ngx_conf_merge_bitmask_value(conf->upstream_config.ignore_headers,
+                                 prev->upstream_config.ignore_headers,
+                                 NGX_CONF_BITMASK_SET);
 
     ngx_conf_merge_bitmask_value(conf->upstream_config.next_upstream,
                               prev->upstream_config.next_upstream,
@@ -1210,13 +1180,6 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_loc_conf_t, union_station_support),
       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,
@@ -1231,13 +1194,6 @@ const ngx_command_t passenger_commands[] = {
       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,
@@ -1308,6 +1264,13 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_loc_conf_t, max_preloader_idle_time),
       NULL },
 
+    { ngx_string("passenger_ignore_headers"),
+      NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE,
+      ngx_conf_set_bitmask_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, upstream_config.ignore_headers),
+      &ngx_http_upstream_ignore_headers_masks },
+
     { ngx_string("passenger_pass_header"),
       NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_str_array_slot,

data/ext/nginx/Configuration.h

@@ -76,10 +76,8 @@ typedef struct {
     ngx_flag_t   user_switching;
     ngx_str_t    default_user;
     ngx_str_t    default_group;
-    ngx_str_t    analytics_log_dir;
     ngx_str_t    analytics_log_user;
     ngx_str_t    analytics_log_group;
-    ngx_str_t    analytics_log_permissions;
     ngx_str_t    union_station_gateway_address;
     ngx_uint_t   union_station_gateway_port;
     ngx_str_t    union_station_gateway_cert;

data/ext/nginx/ContentHandler.c

@@ -26,6 +26,7 @@
  */
 
 #include <nginx.h>
+#include <ngx_http.h>
 #include "ngx_http_passenger_module.h"
 #include "ContentHandler.h"
 #include "StaticContentHandler.h"
@@ -1150,9 +1151,11 @@ process_header(ngx_http_request_t *r)
     ngx_table_elt_t                *h;
     ngx_http_upstream_header_t     *hh;
     ngx_http_upstream_main_conf_t  *umcf;
+    ngx_http_core_loc_conf_t       *clcf;
     passenger_loc_conf_t           *slcf;
 
     umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
+    clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);
 
     for ( ;;  ) {
@@ -1234,9 +1237,17 @@ process_header(ngx_http_request_t *r)
                 h->key.len = sizeof("Server") - 1;
                 h->key.data = (u_char *) "Server";
                 if( slcf->show_version_in_header == 0 ) {
-                    h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger (mod_rails/mod_rack)");
+                    if (clcf->server_tokens) {
+                        h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger");
+                    } else {
+                        h->value.data = (u_char *) ("nginx + Phusion Passenger");
+                    }
                 } else {
-                    h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger " PASSENGER_VERSION " (mod_rails/mod_rack)");
+                    if (clcf->server_tokens) {
+                        h->value.data = (u_char *) (NGINX_VER " + Phusion Passenger " PASSENGER_VERSION);
+                    } else {
+                        h->value.data = (u_char *) ("nginx + Phusion Passenger " PASSENGER_VERSION);
+                    }
                 }
                 h->value.len = ngx_strlen(h->value.data);
                 h->lowcase_key = (u_char *) "server";

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 Phusion
+ * Copyright (C) 2010-2012 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -231,10 +231,8 @@ start_helper_server(ngx_cycle_t *cycle) {
     char   *default_user = NULL;
     char   *default_group = NULL;
     char   *passenger_root = NULL;
-    char   *analytics_log_dir;
     char   *analytics_log_user;
     char   *analytics_log_group;
-    char   *analytics_log_permissions;
     char   *union_station_gateway_address;
     char   *union_station_gateway_cert;
     char   *union_station_proxy_address;
@@ -249,10 +247,8 @@ start_helper_server(ngx_cycle_t *cycle) {
     default_user   = ngx_str_null_terminate(&passenger_main_conf.default_user);
     default_group  = ngx_str_null_terminate(&passenger_main_conf.default_group);
     passenger_root = ngx_str_null_terminate(&passenger_main_conf.root_dir);
-    analytics_log_dir = ngx_str_null_terminate(&passenger_main_conf.analytics_log_dir);
     analytics_log_user = ngx_str_null_terminate(&passenger_main_conf.analytics_log_user);
     analytics_log_group = ngx_str_null_terminate(&passenger_main_conf.analytics_log_group);
-    analytics_log_permissions = ngx_str_null_terminate(&passenger_main_conf.analytics_log_permissions);
     union_station_gateway_address = ngx_str_null_terminate(&passenger_main_conf.union_station_gateway_address);
     union_station_gateway_cert = ngx_str_null_terminate(&passenger_main_conf.union_station_gateway_cert);
     union_station_proxy_address = ngx_str_null_terminate(&passenger_main_conf.union_station_proxy_address);
@@ -280,8 +276,7 @@ start_helper_server(ngx_cycle_t *cycle) {
         passenger_main_conf.max_instances_per_app,
         passenger_main_conf.pool_idle_time,
         "",
-        analytics_log_dir, analytics_log_user,
-        analytics_log_group, analytics_log_permissions,
+        analytics_log_user, analytics_log_group,
         union_station_gateway_address,
         passenger_main_conf.union_station_gateway_port,
         union_station_gateway_cert,
@@ -336,25 +331,13 @@ start_helper_server(ngx_cycle_t *cycle) {
         goto cleanup;
     }
     
-    last = ngx_snprintf(filename, sizeof(filename) - 1,
-                        "%s/analytics_log_dir.txt",
-                        agents_starter_get_generation_dir(passenger_agents_starter));
-    *last = (u_char) '\0';
-    if (create_file(cycle, filename, passenger_main_conf.analytics_log_dir.data,
-                    passenger_main_conf.analytics_log_dir.len) != NGX_OK) {
-        result = NGX_ERROR;
-        goto cleanup;
-    }
-
 cleanup:
     free(debug_log_file);
     free(default_user);
     free(default_group);
     free(passenger_root);
-    free(analytics_log_dir);
     free(analytics_log_user);
     free(analytics_log_group);
-    free(analytics_log_permissions);
     free(union_station_gateway_address);
     free(union_station_gateway_cert);
     free(union_station_proxy_address);

data/ext/oxt/detail/spin_lock_pthreads.hpp

@@ -92,7 +92,7 @@ public:
 		}
 	}
 
-	void try_lock() {
+	bool try_lock() {
 		int ret;
 		do {
 			ret = pthread_spin_trylock(&spin);

data/ext/oxt/dynamic_thread_group.hpp

@@ -152,7 +152,7 @@ public:
 	 *
 	 * @post num_threads() == 0
 	 */
-	void interrupt_and_join_all() {
+	void interrupt_and_join_all(bool interruptSyscalls = true) {
 		/* While interrupting and joining the threads, each thread
 		 * will try to lock the mutex and remove itself from
 		 * 'thread_handles'. We want to avoid deadlocks so we
@@ -178,7 +178,7 @@ public:
 		nthreads = 0;
 		
 		l.unlock();
-		thread::interrupt_and_join_multiple(threads, nthreads_copy);
+		thread::interrupt_and_join_multiple(threads, nthreads_copy, interruptSyscalls);
 	}
 	
 	void join_all() {

data/ext/oxt/spin_lock.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-2012 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

data/ext/oxt/system_calls.cpp

@@ -122,15 +122,22 @@ shouldSimulateFailure() {
 			ctx->syscall_interruption_lock.unlock(); \
 		} \
 		int _my_errno; \
+		bool _intr_requested; \
 		do { \
 			code; \
 			_my_errno = errno; \
-		} while ((error_expression) && _my_errno == EINTR \
-			&& !this_thread::syscalls_interruptable()); \
+		} while ((error_expression) \
+			&& _my_errno == EINTR \
+			&& (!this_thread::syscalls_interruptable() \
+			    || !(_intr_requested = this_thread::interruption_requested())) \
+		); \
 		if (OXT_UNLIKELY(ctx != NULL)) { \
 			ctx->syscall_interruption_lock.lock(); \
 		} \
-		if ((error_expression) && _my_errno == EINTR && this_thread::syscalls_interruptable()) { \
+		if ((error_expression) \
+		 && _my_errno == EINTR \
+		 && this_thread::syscalls_interruptable() \
+		 && _intr_requested) { \
 			throw thread_interrupted(); \
 		} \
 		errno = _my_errno; \
@@ -247,7 +254,10 @@ syscalls::close(int fd) {
 			ctx->syscall_interruption_lock.lock();
 			errno = e;
 		}
-		if (ret == -1 && errno == EINTR && this_thread::syscalls_interruptable()) {
+		if (ret == -1
+		 && errno == EINTR
+		 && this_thread::syscalls_interruptable()
+		 && this_thread::interruption_requested()) {
 			throw thread_interrupted();
 		} else {
 			return ret;
@@ -597,6 +607,7 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 	struct timespec req2 = *req;
 	struct timespec rem2;
 	int ret, e;
+	bool intr_requested;
 
 	/* We never simulate failure in this function. */
 
@@ -621,13 +632,20 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 				req2.tv_nsec = 0;
 			}
 		}
-	} while (ret == -1 && e == EINTR && !this_thread::syscalls_interruptable());
+	} while (ret == -1
+		&& e == EINTR
+		&& (!this_thread::syscalls_interruptable()
+		    || !(intr_requested = this_thread::interruption_requested()))
+	);
 	
 	if (OXT_UNLIKELY(ctx != NULL)) {
 		ctx->syscall_interruption_lock.lock();
 	}
 	
-	if (ret == -1 && e == EINTR && this_thread::syscalls_interruptable()) {
+	if (ret == -1
+	 && e == EINTR
+	 && this_thread::syscalls_interruptable()
+	 && intr_requested) {
 		throw thread_interrupted();
 	}
 	errno = e;
@@ -639,13 +657,18 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 
 pid_t
 syscalls::fork() {
-	int ret;
-	CHECK_INTERRUPTION(
-		ret == -1,
-		true,
-		ret = -1,
-		ret = ::fork()
-	);
+	/* We don't do anything with the syscall_interruption_lock here
+	 * because that can cause an infinite loop. Suppose that we unlock
+	 * syscall_interruption_lock, then another thread calls interrupt()
+	 * on this thread (which in turn locks syscall_interruption_lock),
+	 * and then we context switch back to this thread anf the fork()
+	 * proceeds. In the subprocess, syscall_interruption_lock will never
+	 * be unlocked and so we're stuck forever trying to obtain the lock.
+	 */
+	pid_t ret;
+	do {
+		ret = ::fork();
+	} while (ret == -1 && errno == EINTR);
 	return ret;
 }
 

data/ext/oxt/thread.hpp

@@ -70,11 +70,15 @@ public:
 	 * @throws boost::thread_resource_error Something went wrong during
 	 *     creation of the thread.
 	 */
-	explicit thread(const boost::function<void ()> func, const std::string &name = std::string(), unsigned int stack_size = 0) {
+	explicit thread(const boost::function<void ()> func,
+		const std::string &name = std::string(),
+		unsigned int stack_size = 0)
+		: boost::thread()
+	{
 		context = thread_local_context::make_shared_ptr();
 		context->thread_name = make_thread_name(name);
-		set_thread_main_function(boost::bind(thread_main, func, context));
-		
+		thread_info = make_thread_info(boost::bind(thread_main, func, context));
+
 		unsigned long min_stack_size;
 		bool stack_min_size_defined;
 		bool round_stack_size;
@@ -114,8 +118,10 @@ public:
 				stack_size = stack_size - (stack_size % page_size) + page_size;
 			}
 		}
-		
-		start_thread(stack_size);
+
+		attributes attrs;
+		attrs.set_stack_size(stack_size);
+		start_thread(attrs);
 	}
 	
 	/**

data/ext/ruby/extconf.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/ext/ruby/passenger_native_support.c

@@ -1,6 +1,6 @@
 /*
- *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010, 2011, 2012 Phusion
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -29,6 +29,7 @@
 	#include "ruby/io.h"
 #else
 	#include "rubysig.h"
+	#include "rubyio.h"
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>