passenger 5.0.4 → 5.0.5

data/ext/common/agents/Watchdog/AgentWatcher.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -265,7 +265,7 @@ public:
 		 * arguments to this agent process through this fd, and we'll receive
 		 * startup information through it as well.
 		 */
-		fds = createUnixSocketPair();
+		fds = createUnixSocketPair(__FILE__, __LINE__);
 
 		pid = syscalls::fork();
 		if (pid == 0) {
@@ -334,7 +334,7 @@ public:
 			throw SystemException("Cannot fork a new process", e);
 		} else {
 			// Parent
-			FileDescriptor feedbackFd = fds[0];
+			FileDescriptor feedbackFd(fds[0]);
 			vector<string> args;
 
 			fds[1].close();

data/ext/common/agents/Watchdog/Main.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -120,7 +120,9 @@ namespace WatchdogAgent {
 		AdminServer *adminServer;
 
 		WorkingObjects()
-			: reportFile(-1),
+			: errorEvent(__FILE__, __LINE__, "WorkingObjects: errorEvent"),
+			  exitEvent(__FILE__, __LINE__, "WorkingObjects: exitEvent"),
+			  reportFile(-1),
 			  pidsCleanedUp(false),
 			  pidFileCleanedUp(false),
 			  bgloop(NULL),
@@ -338,6 +340,7 @@ readCleanupPids(const WorkingObjectsPtr &wo) {
 			size_t ret;
 
 			ret = fread(buf, 1, 32, f);
+			fclose(f);
 			if (ret > 0) {
 				buf[ret] = '\0';
 				result.push_back(atoi(buf));
@@ -866,8 +869,8 @@ createPidFile() {
 		}
 
 		UPDATE_TRACE_POINT();
+		FdGuard guard(fd, __FILE__, __LINE__);
 		writeExact(fd, pidStr, strlen(pidStr));
-		syscalls::close(fd);
 	}
 }
 
@@ -882,6 +885,7 @@ openReportFile(const WorkingObjectsPtr &wo) {
 			throw FileSystemException("Cannot open report file " + reportFile, e, reportFile);
 		}
 
+		P_LOG_FILE_DESCRIPTOR_OPEN4(fd, __FILE__, __LINE__, "WorkingObjects: reportFile");
 		wo->reportFile = fd;
 	}
 }
@@ -990,6 +994,7 @@ initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &ins
 		throw FileSystemException("Cannot open " + lockFilePath + " for reading",
 			e, lockFilePath);
 	}
+	P_LOG_FILE_DESCRIPTOR_OPEN4(wo->lockFile, __FILE__, __LINE__, "WorkingObjects: lock file");
 
 	createFile(wo->instanceDir->getPath() + "/watchdog.pid", toString(getpid()));
 
@@ -1055,8 +1060,8 @@ initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &ins
 static void
 initializeAgentWatchers(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers) {
 	TRACE_POINT();
-	watchers.push_back(make_shared<HelperAgentWatcher>(wo));
-	watchers.push_back(make_shared<LoggingAgentWatcher>(wo));
+	watchers.push_back(boost::make_shared<HelperAgentWatcher>(wo));
+	watchers.push_back(boost::make_shared<LoggingAgentWatcher>(wo));
 }
 
 static void
@@ -1120,7 +1125,8 @@ initializeAdminServer(const WorkingObjectsPtr &wo) {
 	UPDATE_TRACE_POINT();
 	for (unsigned int i = 0; i < adminAddresses.size(); i++) {
 		P_DEBUG("Admin server will listen on " << adminAddresses[i]);
-		wo->adminServerFds[i] = createServer(adminAddresses[i]);
+		wo->adminServerFds[i] = createServer(adminAddresses[i], 0, true,
+			__FILE__, __LINE__);
 		if (getSocketAddressType(adminAddresses[i]) == SAT_UNIX) {
 			makeFileWorldReadableAndWritable(parseUnixSocketAddress(adminAddresses[i]));
 		}
@@ -1216,6 +1222,7 @@ reportAgentsInformation(const WorkingObjectsPtr &wo, const vector<AgentWatcherPt
 
 		writeExact(wo->reportFile, str.data(), str.size());
 		close(wo->reportFile);
+		P_LOG_FILE_DESCRIPTOR_CLOSE(wo->reportFile);
 		wo->reportFile = -1;
 	}
 }

data/ext/libeio/ecb.h

@@ -472,7 +472,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (
   #define ecb_unreachable() __builtin_unreachable ()
 #else
   /* this seems to work fine, but gcc always emits a warning for it :/ */
-  ecb_inline void ecb_unreachable (void) ecb_noreturn;
+  ecb_inline ecb_noreturn void ecb_unreachable (void);
   ecb_inline void ecb_unreachable (void) { }
 #endif
 

data/ext/libev/ev.c

@@ -967,7 +967,7 @@ ecb_inline uint64_t ecb_rotr64 (uint64_t x, unsigned int count) { return (x << (
   #define ecb_unreachable() __builtin_unreachable ()
 #else
   /* this seems to work fine, but gcc always emits a warning for it :/ */
-  ecb_inline void ecb_unreachable (void) ecb_noreturn;
+  ecb_inline ecb_noreturn void ecb_unreachable (void);
   ecb_inline void ecb_unreachable (void) { }
 #endif
 
@@ -2477,6 +2477,18 @@ ev_backend (EV_P) EV_THROW
   return backend;
 }
 
+int
+ev_backend_fd (EV_P) EV_THROW
+{
+  return backend_fd;
+}
+
+int
+ev_loop_get_pipe (EV_P_ unsigned int index) EV_THROW
+{
+  return evpipe[index];
+}
+
 #if EV_FEATURE_API
 unsigned int
 ev_iteration (EV_P) EV_THROW

data/ext/libev/ev.h

@@ -605,6 +605,9 @@ EV_API_DECL void ev_loop_fork (EV_P) EV_THROW;
 
 EV_API_DECL unsigned int ev_backend (EV_P) EV_THROW; /* backend in use by loop */
 
+EV_API_DECL int ev_backend_fd (EV_P) EV_THROW;
+EV_API_DECL int ev_loop_get_pipe (EV_P_ unsigned int index) EV_THROW;
+
 EV_API_DECL void ev_now_update (EV_P) EV_THROW; /* update event loop time */
 
 #if EV_WALK_ENABLE

data/ext/nginx/Configuration.c

@@ -84,8 +84,10 @@ passenger_create_main_conf(ngx_conf_t *cf)
     conf->default_ruby.data = NULL;
     conf->default_ruby.len = 0;
     conf->log_level = (ngx_int_t) NGX_CONF_UNSET;
-    conf->debug_log_file.data = NULL;
-    conf->debug_log_file.len = 0;
+    conf->log_file.data = NULL;
+    conf->log_file.len = 0;
+    conf->file_descriptor_log_file.data = NULL;
+    conf->file_descriptor_log_file.len = 0;
     conf->data_buffer_dir.data = NULL;
     conf->data_buffer_dir.len = 0;
     conf->instance_registry_dir.data = NULL;
@@ -142,8 +144,12 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
         conf->log_level = DEFAULT_LOG_LEVEL;
     }
 
-    if (conf->debug_log_file.len == 0) {
-        conf->debug_log_file.data = (u_char *) "";
+    if (conf->log_file.len == 0) {
+        conf->log_file.data = (u_char *) "";
+    }
+
+    if (conf->file_descriptor_log_file.len == 0) {
+        conf->file_descriptor_log_file.data = (u_char *) "";
     }
 
     if (conf->data_buffer_dir.len == 0) {
@@ -1272,11 +1278,18 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, log_level),
       NULL },
 
-    { ngx_string("passenger_debug_log_file"),
+    { ngx_string("passenger_log_file"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, log_file),
+      NULL },
+
+    { ngx_string("passenger_file_descriptor_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),
+      offsetof(passenger_main_conf_t, file_descriptor_log_file),
       NULL },
 
     { ngx_string("passenger_data_buffer_dir"),
@@ -1416,6 +1429,15 @@ const ngx_command_t passenger_commands[] = {
 
     #include "ConfigurationCommands.c"
 
+    /******** Backward compatibility ********/
+
+    { 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, log_file),
+      NULL },
+
     ngx_null_command
 };
 

data/ext/nginx/Configuration.h

@@ -56,7 +56,8 @@ typedef struct {
     ngx_array_t *ctl;
     ngx_str_t    default_ruby;
     ngx_int_t    log_level;
-    ngx_str_t    debug_log_file;
+    ngx_str_t    log_file;
+    ngx_str_t    file_descriptor_log_file;
     ngx_str_t    data_buffer_dir;
     ngx_str_t    instance_registry_dir;
     ngx_flag_t   abort_on_startup_error;

data/ext/nginx/ngx_http_passenger_module.c

@@ -279,6 +279,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     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, "file_descriptor_log_file", &passenger_main_conf.file_descriptor_log_file);
     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);
@@ -299,12 +300,12 @@ 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);
+    if (passenger_main_conf.log_file.len > 0) {
+        pp_variant_map_set_ngx_str(params, "log_file", &passenger_main_conf.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);
+        pp_variant_map_set_ngx_str(params, "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);
+        pp_variant_map_set_ngx_str(params, "log_file", &cycle->log->file->name);
     }
 
     ctl = (ngx_keyval_t *) passenger_main_conf.ctl->elts;

data/ext/oxt/dynamic_thread_group.hpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2010-2013 Phusion
+ * Copyright (c) 2010-2015 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
@@ -84,6 +84,27 @@ private:
 	/** The number of threads in this thread group. */
 	unsigned int nthreads;
 
+	struct thread_func_data {
+		boost::function<void ()> entry_point;
+		thread_handle *handle;
+	};
+
+	struct thread_func_data_guard {
+		thread_func_data *data;
+
+		thread_func_data_guard(thread_func_data *_data)
+			: data(_data)
+			{ }
+
+		~thread_func_data_guard() {
+			delete data;
+		}
+
+		void clear() {
+			data = NULL;
+		}
+	};
+
 	struct thread_cleanup {
 		dynamic_thread_group *thread_group;
 		thread_handle *handle;
@@ -104,9 +125,16 @@ private:
 		}
 	};
 
-	void thread_main(boost::function<void ()> &func, thread_handle *handle) {
-		thread_cleanup c(this, handle);
-		func();
+	void thread_main(thread_func_data *data) {
+		thread_func_data_guard guard(data);
+		thread_cleanup c(this, data->handle);
+		data->entry_point();
+		// Clear the entry point object now because it may contain bound objects.
+		// We want to run the destructor for these objects now, before this thread
+		// is removed from the thread group list, so that if anybody calls
+		// dynamic_thread_group::join_all() the caller can be sure that the
+		// threads are really done.
+		data->entry_point = boost::function<void ()>();
 	}
 
 public:
@@ -136,11 +164,16 @@ public:
 		handle->iterator = thread_handles.end();
 		handle->iterator--;
 		try {
+			thread_func_data *data = new thread_func_data();
+			thread_func_data_guard guard(data);
+			data->entry_point = func;
+			data->handle = handle.get();
 			handle->thr = new thread(
-				boost::bind(&dynamic_thread_group::thread_main, this, func, handle.get()),
+				boost::bind(&dynamic_thread_group::thread_main, this, data),
 				name,
 				stack_size
 			);
+			guard.clear();
 			nthreads++;
 		} catch (...) {
 			thread_handles.erase(handle->iterator);

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake ext/common/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.4'
+  VERSION_STRING = '5.0.5'
 
   PREFERRED_NGINX_VERSION = '1.6.2'
   NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'

data/lib/phusion_passenger/common_library.rb

@@ -103,7 +103,7 @@ class CommonLibraryBuilder
   def enable_optimizations!(lto = false)
     @default_optimization_level = "-O"
     if lto
-      @default_optimization_level << " -flto"
+      @default_extra_optimization_flags = "-flto"
     end
   end
 
@@ -135,22 +135,26 @@ private
       file(object_file => dependencies_for(options)) do
         case options[:optimize]
         when :light
-          optimize = "-O"
+          optimization_level = "-O"
         when true, :heavy
-          optimize = "-O2"
+          optimization_level = "-O2"
         when :very_heavy
-          optimize = "-O3"
+          optimization_level = "-O3"
         when nil
-          optimize = @default_optimization_level
+          optimization_level = @default_optimization_level
         else
           raise "Unknown optimization level #{options[:optimize]}"
         end
+
+        optimize = "#{optimization_level} #{@default_extra_optimization_flags}".strip
+
         if options[:strict_aliasing] == false # and not nil
           optimize = "#{optimize} -fno-strict-aliasing"
           # Disable link-time optimization so that we can no-strict-aliasing
           # works: http://stackoverflow.com/a/25765338/20816
           optimize.sub!(/-flto/, "")
         end
+
         ensure_directory_exists(File.dirname(object_file))
         # We put 'optimize' at the end of the command string so that it overrides
         # the default optimization level embedded in 'cflags'.

data/lib/phusion_passenger/config/reopen_logs_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -49,7 +49,7 @@ module PhusionPassenger
           opts.banner = "Usage: passenger-config reopen-logs [OPTIONS]\n"
           opts.separator ""
           opts.separator "  Instruct #{PROGRAM_NAME} agent processes to reopen their log files. This"
-          opts.separator "  should be involved after you've rotated logs. This command returns after"
+          opts.separator "  should be invoked after you've rotated log files. This command returns after"
           opts.separator "  the log files have been reopened."
           opts.separator ""
 

data/lib/phusion_passenger/packaging.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -68,14 +68,9 @@ module PhusionPassenger
     # A list of globs which match all files that should be packaged
     # in the Phusion Passenger gem or tarball.
     GLOB = [
-      '.gitignore',
-      '.travis.yml',
       '.editorconfig',
       'configure',
       'Rakefile',
-      'Gemfile',
-      'Gemfile.lock',
-      'Vagrantfile',
       'README.md',
       'CONTRIBUTORS',
       'CONTRIBUTING.md',
@@ -94,8 +89,7 @@ module PhusionPassenger
       'bin/*',
       'doc/**/*',
       'man/*',
-      'debian.template/**/*',
-      'packaging/**/*',
+      'dev/**/*',
       'helper-scripts/**/*',
       'ext/common/**/*.{cpp,c,h,hpp,md,erb}',
       'ext/apache2/*.{cpp,h,hpp,c,erb}',
@@ -115,53 +109,45 @@ module PhusionPassenger
       'ext/oxt/*.txt',
       'ext/oxt/detail/*.hpp',
       'ext/ruby/*.{c,rb}',
-      'dev/**/*',
-      'resources/**/*',
-      'test/.rspec',
-      'test/*.example',
-      'test/*.travis',
-      'test/*.rpm-automation',
-      'test/*.vagrant',
-      'test/*.supp',
-      'test/support/*.{c,cpp,h,rb}',
-      'test/tut/*',
-      'test/cxx/**/*.{cpp,h}',
-      'test/oxt/*.{cpp,hpp}',
-      'test/ruby/**/*',
-      'test/node/**/*',
-      'test/integration_tests/**/*',
-      'test/stub/**/*',
-      'test/stub/**/.*'
+      'resources/**/*'
     ]
 
+    # Files that should be excluded from the gem or tarball. Overrides GLOB.
     EXCLUDE_GLOB = [
       '**/.DS_Store',
-      'packaging/*/.git',
-      'test/stub/rails_apps/3.0/empty/help/**/*',
-      'test/stub/*.dSYM'
+      '.gitignore',
+      '.gitmodules',
+      '.travis.yml',
+      '.settings/*',
+      '.externalToolBuilders/*',
+      '.cproject',
+      '.project',
+      'Gemfile',
+      'Gemfile.lock',
+      'Vagrantfile',
+      'Passenger.sublime-project',
+      'Passenger.xcodeproj/**/*',
+      'debian.template/**/*',
+      'packaging/**/*',
+      'test/**/*'
     ]
 
     # Files that should be excluded from the Debian tarball.
-    DEBIAN_EXCLUDE_GLOB = [
-      "debian.template/**/*",
-      "packaging/**/*",
-    ]
+    DEBIAN_EXCLUDE_GLOB = []
 
     # Files and directories that should be excluded from the Homebrew installation.
     HOMEBREW_EXCLUDE = [
-      ".gitignore", ".gitmodules", ".travis.yml", "package.json", "Vagrantfile",
-      "npm-shrinkwrap.json", "Gemfile", "Gemfile.lock", "debian.template",
-      "packaging", "dev", "test"
+      "package.json", "npm-shrinkwrap.json"
     ]
 
     def self.files
       result = Dir[*GLOB] - Dir[*EXCLUDE_GLOB]
       result.reject! { |path| path =~ %r{/\.\.?$} }
-      return result
+      result
     end
 
     def self.debian_orig_tarball_files
-      return files - Dir[*DEBIAN_EXCLUDE_GLOB]
+      files - Dir[*DEBIAN_EXCLUDE_GLOB]
     end
   end