passenger 3.0.0 → 3.0.1

data/ext/boost/type_traits/remove_const.hpp

@@ -54,6 +54,18 @@ struct remove_const_impl
         >::type type;
 };
 
+#ifndef BOOST_NO_RVALUE_REFERENCES
+//
+// We can't filter out rvalue_references at the same level as
+// references or we get ambiguities from msvc:
+//
+template <typename T>
+struct remove_const_impl<T&&>
+{
+    typedef T&& type;
+};
+#endif
+
 } // namespace detail
 
 // * convert a type T to non-const type - remove_const<T>

data/ext/boost/type_traits/remove_cv.hpp

@@ -27,10 +27,32 @@
 
 namespace boost {
 
+namespace detail{
+
+template <class T>
+struct rvalue_ref_filter_rem_cv
+{
+	typedef typename boost::detail::cv_traits_imp<T*>::unqualified_type type;
+};
+
+#ifndef BOOST_NO_RVALUE_REFERENCES
+//
+// We can't filter out rvalue_references at the same level as
+// references or we get ambiguities from msvc:
+//
+template <class T>
+struct rvalue_ref_filter_rem_cv<T&&>
+{
+	typedef T&& type;
+};
+#endif
+
+}
+
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
 //  convert a type T to a non-cv-qualified type - remove_cv<T>
-BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_cv,T,typename boost::detail::cv_traits_imp<T*>::unqualified_type)
+BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_cv,T,typename boost::detail::rvalue_ref_filter_rem_cv<T>::type)
 BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_1(typename T,remove_cv,T&,T&)
 #if !defined(BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS)
 BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_2(typename T,std::size_t N,remove_cv,T const[N],T type[N])

data/ext/boost/type_traits/remove_reference.hpp

@@ -24,7 +24,27 @@ namespace boost {
 
 #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
-BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_reference,T,T)
+namespace detail{
+//
+// We can't filter out rvalue_references at the same level as
+// references or we get ambiguities from msvc:
+//
+template <class T>
+struct remove_rvalue_ref
+{
+	typedef T type;
+};
+#ifndef BOOST_NO_RVALUE_REFERENCES
+template <class T>
+struct remove_rvalue_ref<T&&>
+{
+	typedef T type;
+};
+#endif
+
+} // namespace detail
+
+BOOST_TT_AUX_TYPE_TRAIT_DEF1(remove_reference,T,typename boost::detail::remove_rvalue_ref<T>::type)
 BOOST_TT_AUX_TYPE_TRAIT_PARTIAL_SPEC1_1(typename T,remove_reference,T&,T)
 
 #if defined(BOOST_ILLEGAL_CV_REFERENCES)

data/ext/boost/type_traits/type_with_alignment.hpp

@@ -286,43 +286,43 @@ struct __declspec(align(128)) a128 {
 template<> class type_with_alignment<8>  
 { 
    typedef mpl::if_c<
-      ::boost::alignment_of<detail::max_align>::value < 8,
+      ::boost::alignment_of<boost::detail::max_align>::value < 8,
       align::a8,
-      detail::type_with_alignment_imp<8> >::type t1; 
+      boost::detail::type_with_alignment_imp<8> >::type t1; 
 public: 
    typedef t1::type type;
 };
 template<> class type_with_alignment<16> 
 { 
    typedef mpl::if_c<
-      ::boost::alignment_of<detail::max_align>::value < 16,
+      ::boost::alignment_of<boost::detail::max_align>::value < 16,
       align::a16,
-      detail::type_with_alignment_imp<16> >::type t1; 
+      boost::detail::type_with_alignment_imp<16> >::type t1; 
 public: 
    typedef t1::type type;
 };
 template<> class type_with_alignment<32> 
 { 
    typedef mpl::if_c<
-      ::boost::alignment_of<detail::max_align>::value < 32,
+      ::boost::alignment_of<boost::detail::max_align>::value < 32,
       align::a32,
-      detail::type_with_alignment_imp<32> >::type t1; 
+      boost::detail::type_with_alignment_imp<32> >::type t1; 
 public: 
    typedef t1::type type;
 };
 template<> class type_with_alignment<64> {
    typedef mpl::if_c<
-      ::boost::alignment_of<detail::max_align>::value < 64,
+      ::boost::alignment_of<boost::detail::max_align>::value < 64,
       align::a64,
-      detail::type_with_alignment_imp<64> >::type t1; 
+      boost::detail::type_with_alignment_imp<64> >::type t1; 
 public: 
    typedef t1::type type;
 };
 template<> class type_with_alignment<128> {
    typedef mpl::if_c<
-      ::boost::alignment_of<detail::max_align>::value < 128,
+      ::boost::alignment_of<boost::detail::max_align>::value < 128,
       align::a128,
-      detail::type_with_alignment_imp<128> >::type t1; 
+      boost::detail::type_with_alignment_imp<128> >::type t1; 
 public: 
    typedef t1::type type;
 };

data/ext/boost/units/detail/utility.hpp

@@ -0,0 +1,104 @@
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and 
+// unit/quantity manipulation and conversion
+//
+// Copyright (C) 2003-2008 Matthias Christian Schabel
+// Copyright (C) 2008 Steven Watanabe
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_UNITS_UTILITY_HPP
+#define BOOST_UNITS_UTILITY_HPP
+
+#include <cstdlib>
+#include <typeinfo>
+#include <string>
+
+#if defined(__GLIBCXX__) || defined(__GLIBCPP__)
+#define BOOST_UNITS_USE_DEMANGLING
+#include <cxxabi.h>
+#endif // __GNUC__
+
+#ifdef BOOST_UNITS_USE_DEMANGLING
+
+#include <boost/algorithm/string/replace.hpp>
+
+namespace boost {
+
+namespace units {
+
+namespace detail {
+
+inline
+std::string
+demangle(const char* name)
+{
+    // need to demangle C++ symbols
+    char*       realname;
+    std::size_t len; 
+    int         stat;
+     
+    realname = abi::__cxa_demangle(name,NULL,&len,&stat);
+    
+    if (realname != NULL)
+    {
+        std::string   out(realname);
+        
+        std::free(realname);
+        
+        boost::replace_all(out,"boost::units::","");
+        
+        return out;
+    }
+    
+    return std::string("demangle :: error - unable to demangle specified symbol");
+}
+
+} // namespace detail
+
+template<class L>
+std::string simplify_typename(const L& /*source*/)
+{
+    const std::string   demangled = detail::demangle(typeid(L).name());
+
+    return demangled;
+}
+
+} // namespace units
+
+} // namespace boost
+
+#else // BOOST_UNITS_USE_DEMANGLING
+
+namespace boost {
+
+namespace units {
+
+namespace detail {
+
+inline
+std::string
+demangle(const char* name)
+{
+    return name;
+}
+
+} // namespace detail
+
+template<class L>
+std::string simplify_typename(const L& /*source*/)
+{
+    return std::string(typeid(L).name());
+}
+
+} // namespace units
+
+} // namespace boost
+
+// To get system-specific predefined macros:
+// gcc -arch ppc -dM -E - < /dev/null | sort 
+
+#endif // BOOST_UNITS_USE_DEMANGLING
+
+#endif // BOOST_UNITS_UTILITY_HPP

data/ext/boost/utility/compare_pointees.hpp

@@ -4,7 +4,7 @@
 // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-// See http://www.boost.org/lib/optional for documentation.
+// See http://www.boost.org/libs/optional for documentation.
 //
 // You are welcome to contact the author at:
 //  fernando_cacciola@hotmail.com

data/ext/common/AgentsStarter.hpp

@@ -47,6 +47,7 @@
 #include "Utils/IOUtils.h"
 #include "Utils/Base64.h"
 #include "Utils/Timer.h"
+#include "Utils/ScopeGuard.h"
 #include "Utils/VariantMap.h"
 
 namespace Passenger {
@@ -117,12 +118,78 @@ private:
 	 */
 	ServerInstanceDir::GenerationPtr generation;
 	
-	static void
-	killAndWait(pid_t pid, unsigned long long timeout = 0) {
-		if (timeout == 0 || timedWaitPid(pid, NULL, timeout) == 0) {
+	/**
+	 * Safely dup2() the given file descriptor to 3 (FEEDBACK_FD).
+	 */
+	void installFeedbackFd(const FileDescriptor &fd) {
+		if (fd != FEEDBACK_FD && syscalls::dup2(fd, FEEDBACK_FD) == -1) {
+			int e = errno;
+			try {
+				MessageChannel channel(fd);
+				channel.write("system error",
+					"dup2() failed",
+					toString(e).c_str(),
+					NULL);
+				_exit(1);
+			} catch (...) {
+				fprintf(stderr, "Passenger AgentsStarter: dup2() failed: %s (%d)\n",
+					strerror(e), e);
+				fflush(stderr);
+				_exit(1);
+			}
+		}
+	}
+	
+	/**
+	 * Call this if the watchdog seems to have crashed. This function will try
+	 * to determine whether the watchdog is still running, whether it crashed
+	 * with a signal, etc. If it has detected that the watchdog is no longer running
+	 * then it will set <em>pid</em> to -1.
+	 */
+	void inspectWatchdogCrashReason(pid_t &pid) {
+		this_thread::disable_interruption di;
+		this_thread::disable_syscall_interruption dsi;
+		int ret, status;
+		
+		/* Upon noticing that something went wrong, the watchdog
+		 * or its subprocesses might still be writing out an error
+		 * report, so we wait a while before killing the watchdog.
+		 */
+		ret = timedWaitPid(pid, &status, 5000);
+		if (ret == 0) {
+			/* Looks like the watchdog didn't crash and is still running. */
+			throw RuntimeException(
+				"Unable to start the Phusion Passenger watchdog: "
+				"it froze during startup and reported an unknown error");
+		} else if (ret != -1 && WIFSIGNALED(status)) {
+			/* Looks like a crash which caused a signal. */
+			pid = -1;
+			throw RuntimeException(
+				"Unable to start the Phusion Passenger watchdog: "
+				"it seems to have been killed with signal " +
+				getSignalName(WTERMSIG(status)) + " during startup");
+		} else if (ret == -1) {
+			/* Looks like it exited for a different reason and has no exit code. */
+			pid = -1;
+			throw RuntimeException(
+				"Unable to start the Phusion Passenger watchdog: "
+				"it seems to have crashed during startup for an unknown reason");
+		} else {
+			/* Looks like it exited for a different reason, but has an exit code. */
+			pid = -1;
+			throw RuntimeException(
+				"Unable to start the Phusion Passenger watchdog: "
+				"it seems to have crashed during startup for an unknown reason, "
+				"with exit code " + toString(WEXITSTATUS(status)));
+		}
+	}
+	
+	static void killProcessGroupAndWait(pid_t *pid, unsigned long long timeout = 0) {
+		if (*pid != -1 && (timeout == 0 || timedWaitPid(*pid, NULL, timeout) <= 0)) {
 			this_thread::disable_syscall_interruption dsi;
-			syscalls::kill(pid, SIGKILL);
-			syscalls::waitpid(pid, NULL, 0);
+			syscalls::killpg(*pid, SIGKILL);
+			syscalls::waitpid(*pid, NULL, 0);
+			*pid = -1;
 		}
 	}
 	
@@ -327,7 +394,7 @@ public:
 		
 		string realUnionStationGatewayCert;
 		if (unionStationGatewayCert.empty()) {
-			realUnionStationGatewayCert = locator.getCertificatesDir() + "/union_station_gateway.crt";
+			realUnionStationGatewayCert = locator.getResourcesDir() + "/union_station_gateway.crt";
 		} else if (unionStationGatewayCert != "-") {
 			realUnionStationGatewayCert = unionStationGatewayCert;
 		}
@@ -360,46 +427,33 @@ public:
 			.set    ("union_station_gateway_cert", realUnionStationGatewayCert)
 			.set    ("prestart_urls",   serializePrestartURLs(prestartURLs));
 		
-		int fds[2], e, ret;
+		SocketPair fds;
+		int e;
 		pid_t pid;
 		
-		if (syscalls::socketpair(AF_UNIX, SOCK_STREAM, 0, fds) == -1) {
-			e = errno;
-			throw SystemException("Cannot create a Unix socket pair", e);
-		}
-		
+		fds = createUnixSocketPair();
 		pid = syscalls::fork();
 		if (pid == 0) {
 			// Child
-			long max_fds, i;
+			
+			/* Become the session leader so that Apache can't kill the
+			 * watchdog with killpg() during shutdown, so that a
+			 * Ctrl-C only affects the web server, and so that
+			 * we can kill all of our subprocesses in a single killpg().
+			 */
+			setsid();
 			
 			// Make sure the feedback fd is 3 and close all file descriptors
 			// except stdin, stdout, stderr and 3.
 			syscalls::close(fds[0]);
+			installFeedbackFd(fds[1]);
+			closeAllFileDescriptors(FEEDBACK_FD);
 			
-			if (fds[1] != FEEDBACK_FD) {
-				if (syscalls::dup2(fds[1], FEEDBACK_FD) == -1) {
-					e = errno;
-					try {
-						MessageChannel(fds[1]).write("system error",
-							"dup2() failed",
-							toString(e).c_str(),
-							NULL);
-						_exit(1);
-					} catch (...) {
-						fprintf(stderr, "Passenger AgentsStarter: dup2() failed: %s (%d)\n",
-							strerror(e), e);
-						fflush(stderr);
-						_exit(1);
-					}
-				}
-			}
-			max_fds = sysconf(_SC_OPEN_MAX);
-			for (i = FEEDBACK_FD + 1; i < max_fds; i++) {
-				if (i != fds[1]) {
-					syscalls::close(i);
-				}
-			}
+			/* We don't know how the web server or the environment affect
+			 * signal handlers and the signal mask, so reset this stuff
+			 * just in case.
+			 */
+			resetSignalHandlersAndMask();
 			
 			if (afterFork) {
 				afterFork();
@@ -408,7 +462,8 @@ public:
 			execl(watchdogFilename.c_str(), "PassengerWatchdog", (char *) 0);
 			e = errno;
 			try {
-				MessageChannel(3).write("exec error", toString(e).c_str(), NULL);
+				MessageChannel channel(FEEDBACK_FD);
+				channel.write("exec error", toString(e).c_str(), NULL);
 				_exit(1);
 			} catch (...) {
 				fprintf(stderr, "Passenger AgentsStarter: could not execute %s: %s (%d)\n",
@@ -419,64 +474,37 @@ public:
 		} else if (pid == -1) {
 			// Error
 			e = errno;
-			syscalls::close(fds[0]);
-			syscalls::close(fds[1]);
 			throw SystemException("Cannot fork a new process", e);
 		} else {
 			// Parent
 			UPDATE_TRACE_POINT();
-			FileDescriptor feedbackFd(fds[0]);
+			FileDescriptor feedbackFd = fds[0];
 			MessageChannel feedbackChannel(fds[0]);
 			vector<string> args;
-			bool allAgentsStarted;
-			int status;
+			bool result, allAgentsStarted;
 			
 			ServerInstanceDirPtr serverInstanceDir;
 			ServerInstanceDir::GenerationPtr generation;
+			ScopeGuard guard(boost::bind(&AgentsStarter::killProcessGroupAndWait, &pid, 0));
+			fds[1].close();
 			
-			syscalls::close(fds[1]);
 			
 			/****** Send arguments to watchdog through the feedback channel ******/
 			
 			UPDATE_TRACE_POINT();
+			/* Here we don't care about EPIPE and ECONNRESET errors. The watchdog
+			 * could have sent an error message over the feedback fd without
+			 * reading the arguments. We'll notice that later.
+			 */
 			try {
 				watchdogArgs.writeToChannel(feedbackChannel);
-			} catch (const SystemException &) {
-				/* Did the watchdog crash?
-				 * At the time the channel was closed it might not have
-				 * exited yet so give it a short while to exit and to
-				 * print an error.
-				 */
-				ret = timedWaitPid(pid, &status, 2000);
-				if (ret == 0) {
-					/* Doesn't look like it; it seems it's still running.
-					 * We can't do anything in this state anyway, so
-					 * throw an exception.
-					 */
-					killAndWait(pid);
-					throw RuntimeException(
-						"Unable to start the Phusion Passenger watchdog: "
-						"an unknown error occurred during its startup");
-				} else if (ret != -1 && WIFSIGNALED(status)) {
-					/* Looks like a crash which caused a signal. */
-					throw RuntimeException(
-						"Unable to start the Phusion Passenger watchdog: "
-						"it seems to have been killed with signal " +
-						getSignalName(WTERMSIG(status)) + " during startup");
-				} else if (ret == -1) {
-					/* Looks like it exited for a different reason and has no exit code. */
-					throw RuntimeException(
-						"Unable to start the Phusion Passenger watchdog: "
-						"it seems to have crashed during startup for an unknown reason");
-				} else {
-					/* Looks like it exited for a different reason, but has an exit code. */
-					throw RuntimeException(
-						"Unable to start the Phusion Passenger watchdog: "
-						"it seems to have crashed during startup for an unknown reason, "
-						"with exit code " + toString(WEXITSTATUS(status)));
+			} catch (const SystemException &e) {
+				if (e.code() != EPIPE && e.code() != ECONNRESET) {
+					inspectWatchdogCrashReason(pid);
 				}
 			}
 			
+			
 			/****** Read basic startup information ******/
 			
 			this_thread::restore_interruption ri(di);
@@ -484,49 +512,21 @@ public:
 			UPDATE_TRACE_POINT();
 			
 			try {
-				if (!feedbackChannel.read(args)) {
-					this_thread::disable_interruption di2;
-					this_thread::disable_syscall_interruption dsi2;
-					
-					/* The feedback fd was closed for an unknown reason.
-					 * Did the watchdog crash?
-					 */
-					ret = timedWaitPid(pid, &status, 2000);
-					if (ret == 0) {
-						/* Doesn't look like it; it seems it's still running.
-						 * We can't do anything without proper feedback so kill
-						 * the watchdog and throw an exception.
-						 */
-						killAndWait(pid);
-						throw RuntimeException("Unable to start the Phusion Passenger watchdog: "
-							"an unknown error occurred during its startup");
-					} else if (ret != -1 && WIFSIGNALED(status)) {
-						/* Looks like a crash which caused a signal. */
-						throw RuntimeException("Unable to start the Phusion Passenger watchdog: "
-							"it seems to have been killed with signal " +
-							getSignalName(WTERMSIG(status)) + " during startup");
-					} else if (ret == -1) {
-						/* Looks like it exited after detecting an error. */
-						throw RuntimeException("Unable to start the Phusion Passenger watchdog: "
-							"it seems to have crashed during startup for an unknown reason");
-					} else {
-						throw RuntimeException(
-							"Unable to start the Phusion Passenger watchdog: "
-							"it seems to have crashed during startup for an unknown reason, "
-							"with exit code " + toString(WEXITSTATUS(status)));
-					}
-				}
+				result = feedbackChannel.read(args);
 			} catch (const SystemException &ex) {
-				killAndWait(pid, 2000);
-				throw SystemException("Unable to start the Phusion Passenger watchdog: "
-					"unable to read its startup information",
-					ex.code());
-			} catch (const RuntimeException &) {
-				// Watchdog has already exited, no need to kill it.
-				throw;
-			} catch (...) {
-				killAndWait(pid, 2000);
-				throw;
+				if (ex.code() == ECONNRESET) {
+					inspectWatchdogCrashReason(pid);
+				} else {
+					killProcessGroupAndWait(&pid, 5000);
+					guard.clear();
+					throw SystemException("Unable to start the Phusion Passenger watchdog: "
+						"unable to read its startup information",
+						ex.code());
+				}
+			}
+			if (!result) {
+				UPDATE_TRACE_POINT();
+				inspectWatchdogCrashReason(pid);
 			}
 			
 			UPDATE_TRACE_POINT();
@@ -535,24 +535,36 @@ public:
 					serverInstanceDir.reset(new ServerInstanceDir(args[1], false));
 					generation = serverInstanceDir->getGeneration(atoi(args[2]));
 				} else {
-					killAndWait(pid, 2000);
 					throw IOException("Unable to start the Phusion Passenger watchdog: "
 						"it returned an invalid basic startup information message");
 				}
 			} else if (args[0] == "Watchdog startup error") {
-				syscalls::waitpid(pid, NULL, 0);
+				killProcessGroupAndWait(&pid, 5000);
+				guard.clear();
 				throw RuntimeException("Unable to start the Phusion Passenger watchdog "
 					"because it encountered the following error during startup: " +
 					args[1]);
 			} else if (args[0] == "system error") {
-				killAndWait(pid, 2000);
+				killProcessGroupAndWait(&pid, 5000);
+				guard.clear();
 				throw SystemException(args[1], atoi(args[2]));
 			} else if (args[0] == "exec error") {
-				killAndWait(pid, 2000);
-				throw SystemException("Unable to start the Phusion Passenger watchdog (" +
-					watchdogFilename + ")", atoi(args[1]));
+				e = atoi(args[1]);
+				killProcessGroupAndWait(&pid, 5000);
+				guard.clear();
+				if (e == ENOENT) {
+					throw RuntimeException("Unable to start the Phusion Passenger watchdog "
+						"because its executable (" + watchdogFilename + ") does "
+						"not exist. This probably means that your Phusion Passenger "
+						"installation is broken or incomplete. Please reinstall "
+						"Phusion Passenger");
+				} else {
+					throw SystemException("Unable to start the Phusion Passenger watchdog (" +
+						watchdogFilename + ")", e);
+				}
 			}
 			
+			
 			/****** Read agents startup information ******/
 			
 			UPDATE_TRACE_POINT();
@@ -561,44 +573,17 @@ public:
 			while (!allAgentsStarted) {
 				try {
 					UPDATE_TRACE_POINT();
-					if (!feedbackChannel.read(args)) {
-						this_thread::disable_interruption di2;
-						this_thread::disable_syscall_interruption dsi2;
-						
-						/* The feedback fd was closed for an unknown reason.
-						 * Did the watchdog crash?
-						 */
-						ret = syscalls::waitpid(pid, &status, WNOHANG);
-						if (ret == 0) {
-							/* Doesn't look like it; it seems it's still running.
-							 * We can't do anything without proper feedback so kill
-							 * the watchdo and throw an exception.
-							 */
-							killAndWait(pid, 2000);
-							throw RuntimeException("Unable to start the Phusion Passenger watchdog: "
-								"an unknown error occurred during its startup");
-						} else if (ret != -1 && WIFSIGNALED(status)) {
-							/* Looks like a crash which caused a signal. */
-							throw RuntimeException("Unable to start the Phusion Passenger watchdog: "
-								"it seems to have been killed with signal " +
-								getSignalName(WTERMSIG(status)) + " during startup");
-						} else {
-							/* Looks like it exited after detecting an error. */
-							throw RuntimeException("Unable to start the Phusion Passenger watchdog: "
-								"it seems to have crashed during startup for an unknown reason");
-						}
-					}
+					result = feedbackChannel.read(args);
 				} catch (const SystemException &ex) {
-					killAndWait(pid, 2000);
+					killProcessGroupAndWait(&pid, 5000);
+					guard.clear();
 					throw SystemException("Unable to start the Phusion Passenger watchdog: "
 						"unable to read all agent startup information",
 						ex.code());
-				} catch (const RuntimeException &) {
-					// Watchdog has already exited, no need to kill it.
-					throw;
-				} catch (...) {
-					killAndWait(pid, 2000);
-					throw;
+				}
+				if (!result) {
+					UPDATE_TRACE_POINT();
+					inspectWatchdogCrashReason(pid);
 				}
 				
 				if (args[0] == "HelperAgent info") {
@@ -613,7 +598,8 @@ public:
 						this->serverInstanceDir = serverInstanceDir;
 						this->generation        = generation;
 					} else {
-						killAndWait(pid);
+						killProcessGroupAndWait(&pid, 5000);
+						guard.clear();
 						throw IOException("Unable to start the Phusion Passenger watchdog: "
 							"it returned an invalid initialization feedback message");
 					}
@@ -624,7 +610,8 @@ public:
 						loggingSocketAddress  = args[1];
 						loggingSocketPassword = args[2];
 					} else {
-						killAndWait(pid, 2000);
+						killProcessGroupAndWait(&pid, 5000);
+						guard.clear();
 						throw IOException("Unable to start the Phusion Passenger watchdog: "
 							"it returned an invalid initialization feedback message");
 					}
@@ -632,10 +619,13 @@ public:
 					allAgentsStarted = true;
 				} else {
 					UPDATE_TRACE_POINT();
-					killAndWait(pid, 2000);
+					killProcessGroupAndWait(&pid, 5000);
+					guard.clear();
 					throw RuntimeException("One of the Passenger agents sent an unknown feedback message '" + args[0] + "'");
 				}
 			}
+			
+			guard.clear();
 		}
 	}