passenger 3.0.5 → 3.0.6

data/doc/cxxapi/namespacePassenger.html

@@ -164,6 +164,8 @@ string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gr
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the specified directory is a valid Rack application root directory.  <a href="group__Support.html#ga53969f8e3ee68d1d99ffe75af8db9be8"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__Support.html#gaaec51d2912999d611994c49341f36247">verifyWSGIDir</a> (const string &amp;dir, CachedFileStat *cstat=0, unsigned int throttleRate=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the specified directory is a valid WSGI application root directory.  <a href="group__Support.html#gaaec51d2912999d611994c49341f36247"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacePassenger.html#ad233ce971fa0e937182c637bf2d1f105">runAndPrintExceptions</a> (const function&lt; void()&gt; &amp;func, bool toAbort)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Runs the given function and catches any tracable_exceptions.  <a href="#ad233ce971fa0e937182c637bf2d1f105"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespacePassenger.html#a1d0a66b0e207c46dc6124ff3b2f331e6">getHostName</a> ()</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns the system's host name.  <a href="#a1d0a66b0e207c46dc6124ff3b2f331e6"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a979cb43cef743bf261c329b13e712366"></a><!-- doxytag: member="Passenger::getSignalName" ref="a979cb43cef743bf261c329b13e712366" args="(int sig)" -->
@@ -543,6 +545,36 @@ string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="na
 <p>One should call this every time one forks a child process; non-default signal masks/handler dispositions can cause all kinds of weird quirks, like waitpid() malfunctioning on OS X.</p>
 <p>This function is async-signal safe. </p>
 
+</div>
+</div>
+<a class="anchor" id="ad233ce971fa0e937182c637bf2d1f105"></a><!-- doxytag: member="Passenger::runAndPrintExceptions" ref="ad233ce971fa0e937182c637bf2d1f105" args="(const function&lt; void()&gt; &amp;func, bool toAbort)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void Passenger::runAndPrintExceptions </td>
+          <td>(</td>
+          <td class="paramtype">const function&lt; void()&gt; &amp;&nbsp;</td>
+          <td class="paramname"> <em>func</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">bool&nbsp;</td>
+          <td class="paramname"> <em>toAbort</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Runs the given function and catches any tracable_exceptions. </p>
+<p>Upon catching such an exception, its message and backtrace will be printed. If toAbort is true then it will call abort(), otherwise the exception is swallowed. thread_interrupted and all other exceptions are silently propagated. </p>
+
 </div>
 </div>
 </div>

data/doc/cxxapi/namespacemembers.html

@@ -33,12 +33,32 @@
       <li><a href="namespacemembers_eval.html"><span>Enumerator</span></a></li>
     </ul>
   </div>
+  <div class="tabs">
+    <ul>
+      <li><a href="#index_a"><span>a</span></a></li>
+      <li><a href="#index_c"><span>c</span></a></li>
+      <li><a href="#index_e"><span>e</span></a></li>
+      <li><a href="#index_f"><span>f</span></a></li>
+      <li><a href="#index_g"><span>g</span></a></li>
+      <li><a href="#index_m"><span>m</span></a></li>
+      <li><a href="#index_p"><span>p</span></a></li>
+      <li><a href="#index_r"><span>r</span></a></li>
+      <li><a href="#index_s"><span>s</span></a></li>
+      <li><a href="#index_v"><span>v</span></a></li>
+    </ul>
+  </div>
 </div>
 <div class="contents">
-Here is a list of all documented namespace members with links to the namespaces they belong to:<ul>
+Here is a list of all documented namespace members with links to the namespaces they belong to:
+
+<h3><a class="anchor" id="index_a">- a -</a></h3><ul>
 <li>AbstractSpawnManagerPtr
 : <a class="el" href="namespacePassenger.html#afd60d942a89fbb7f306e330d75704570">Passenger</a>
 </li>
+</ul>
+
+
+<h3><a class="anchor" id="index_c">- c -</a></h3><ul>
 <li>canonicalizePath()
 : <a class="el" href="group__Support.html#gaf3b0a483f0a252ae08d9de9f8b267d36">Passenger</a>
 </li>
@@ -48,6 +68,10 @@ Here is a list of all documented namespace members with links to the namespaces
 <li>createFile()
 : <a class="el" href="group__Support.html#ga6f414070373465da2e12947463f69953">Passenger</a>
 </li>
+</ul>
+
+
+<h3><a class="anchor" id="index_e">- e -</a></h3><ul>
 <li>escapeForXml()
 : <a class="el" href="group__Support.html#gae74addedf73782a1eb1f6dd48d6fce06">Passenger</a>
 </li>
@@ -57,6 +81,10 @@ Here is a list of all documented namespace members with links to the namespaces
 <li>extractDirName()
 : <a class="el" href="group__Support.html#gae651ece5281f22dc5fc974079f7c9187">Passenger</a>
 </li>
+</ul>
+
+
+<h3><a class="anchor" id="index_f">- f -</a></h3><ul>
 <li>fileExists()
 : <a class="el" href="group__Support.html#ga2a62e38a72c6c65992e3361f6d80c7ef">Passenger</a>
 </li>
@@ -75,6 +103,10 @@ Here is a list of all documented namespace members with links to the namespaces
 <li>FT_REGULAR
 : <a class="el" href="namespacePassenger.html#a14174b712df6046cb823cde43d7ef07da1538596a928321d1a282c6bb06e80563">Passenger</a>
 </li>
+</ul>
+
+
+<h3><a class="anchor" id="index_g">- g -</a></h3><ul>
 <li>getFileType()
 : <a class="el" href="group__Support.html#ga15298b031377d3ecb80295bd5b1a8180">Passenger</a>
 </li>
@@ -90,9 +122,17 @@ Here is a list of all documented namespace members with links to the namespaces
 <li>getSystemTempDir()
 : <a class="el" href="group__Support.html#ga68f4105c5a8e510520b5ea3eecb66213">Passenger</a>
 </li>
+</ul>
+
+
+<h3><a class="anchor" id="index_m">- m -</a></h3><ul>
 <li>makeDirTree()
 : <a class="el" href="namespacePassenger.html#a448f25263af0b37b91caee3d294ec4aa">Passenger</a>
 </li>
+</ul>
+
+
+<h3><a class="anchor" id="index_p">- p -</a></h3><ul>
 <li>parseModeString()
 : <a class="el" href="namespacePassenger.html#ada53f5a9bdcf3d22d4a710e7ea3678e9">Passenger</a>
 </li>
@@ -105,6 +145,10 @@ Here is a list of all documented namespace members with links to the namespaces
 <li>ptr()
 : <a class="el" href="group__Support.html#ga41b6c4a82fed72531a147de0505a8396">Passenger</a>
 </li>
+</ul>
+
+
+<h3><a class="anchor" id="index_r">- r -</a></h3><ul>
 <li>removeDirTree()
 : <a class="el" href="namespacePassenger.html#a8422d210cbd2f62d21254415b5a7f747">Passenger</a>
 </li>
@@ -114,9 +158,20 @@ Here is a list of all documented namespace members with links to the namespaces
 <li>resolveSymlink()
 : <a class="el" href="group__Support.html#gac3d2b3d608188527d888e63d22c5163c">Passenger</a>
 </li>
+<li>runAndPrintExceptions()
+: <a class="el" href="namespacePassenger.html#ad233ce971fa0e937182c637bf2d1f105">Passenger</a>
+</li>
+</ul>
+
+
+<h3><a class="anchor" id="index_s">- s -</a></h3><ul>
 <li>SpawnManagerPtr
 : <a class="el" href="namespacePassenger.html#a6ab2d566ff87a2676c23d8aa40204587">Passenger</a>
 </li>
+</ul>
+
+
+<h3><a class="anchor" id="index_v">- v -</a></h3><ul>
 <li>verifyRackDir()
 : <a class="el" href="group__Support.html#ga53969f8e3ee68d1d99ffe75af8db9be8">Passenger</a>
 </li>

data/doc/cxxapi/namespacemembers_func.html

@@ -93,6 +93,9 @@
 <li>resolveSymlink()
 : <a class="el" href="group__Support.html#gac3d2b3d608188527d888e63d22c5163c">Passenger</a>
 </li>
+<li>runAndPrintExceptions()
+: <a class="el" href="namespacePassenger.html#ad233ce971fa0e937182c637bf2d1f105">Passenger</a>
+</li>
 <li>verifyRackDir()
 : <a class="el" href="group__Support.html#ga53969f8e3ee68d1d99ffe75af8db9be8">Passenger</a>
 </li>

data/doc/cxxapi/ngx__http__passenger__module_8h_source.html

@@ -71,18 +71,18 @@
 <a name="l00046"></a>00046 <span class="comment">/**</span>
 <a name="l00047"></a>00047 <span class="comment"> * A static schema string to be assigned to Nginx &#39;upstream&#39; strctures.</span>
 <a name="l00048"></a>00048 <span class="comment"> */</span>
-<a name="l00049"></a>00049 <span class="keyword">extern</span> ngx_str_t    passenger_schema_string;
+<a name="l00049"></a>00049 <span class="keyword">extern</span> ngx_str_t                passenger_schema_string;
 <a name="l00050"></a>00050 
-<a name="l00051"></a>00051 <span class="keyword">extern</span> ngx_str_t    passenger_placeholder_upstream_address;
+<a name="l00051"></a>00051 <span class="keyword">extern</span> ngx_str_t                passenger_placeholder_upstream_address;
 <a name="l00052"></a>00052 <span class="comment"></span>
 <a name="l00053"></a>00053 <span class="comment">/**</span>
 <a name="l00054"></a>00054 <span class="comment"> * A CachedFileStat object used for caching stat() calls.</span>
 <a name="l00055"></a>00055 <span class="comment"> */</span>
-<a name="l00056"></a>00056 <span class="keyword">extern</span> CachedFileStat *passenger_stat_cache;
+<a name="l00056"></a>00056 <span class="keyword">extern</span> PassengerCachedFileStat *passenger_stat_cache;
 <a name="l00057"></a>00057 
-<a name="l00058"></a>00058 <span class="keyword">extern</span> AgentsStarter  *passenger_agents_starter;
+<a name="l00058"></a>00058 <span class="keyword">extern</span> AgentsStarter           *passenger_agents_starter;
 <a name="l00059"></a>00059 
-<a name="l00060"></a>00060 <span class="keyword">extern</span> ngx_cycle_t    *passenger_current_cycle;
+<a name="l00060"></a>00060 <span class="keyword">extern</span> ngx_cycle_t             *passenger_current_cycle;
 <a name="l00061"></a>00061 
 <a name="l00062"></a>00062 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_NGINX_MODULE_H_ */</span>
 <a name="l00063"></a>00063 

data/ext/apache2/Hooks.cpp

@@ -1058,7 +1058,7 @@ private:
 			addHeader(headers, env[i].key, env[i].val);
 		}
 		
-		if (config->useUnionStation()) {
+		if (!log->isNull()) {
 			addHeader(headers, "PASSENGER_GROUP_NAME",
 				config->getAppGroupName(appRoot).c_str());
 			addHeader(headers, "PASSENGER_TXN_ID", log->getTxnId().c_str());

data/ext/common/AgentBase.cpp

@@ -52,11 +52,10 @@ static const char digits[] = {
 	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
 };
 
-// Pre-allocate some static memory for use in signal handlers in case the stack isn't usable.
-static char messageBuf[1024];
-#ifdef LIBC_HAS_BACKTRACE_FUNC
-	static void *backtraceStore[512];
-#endif
+// Pre-allocate an alternative stack for use in signal handlers in case
+// the normal stack isn't usable.
+static char *alternativeStack;
+static unsigned int alternativeStackSize;
 
 static void
 ignoreSigpipe() {
@@ -117,6 +116,27 @@ appendULL(char *buf, unsigned long long value) {
 	return buf + size;
 }
 
+static char *
+appendSignalName(char *buf, int signo) {
+	switch (signo) {
+	case SIGABRT:
+		buf = appendText(buf, "SIGABRT");
+		break;
+	case SIGSEGV:
+		buf = appendText(buf, "SIGSEGV");
+		break;
+	case SIGBUS:
+		buf = appendText(buf, "SIGBUS");
+		break;
+	default:
+		return appendULL(buf, (unsigned long long) signo);
+	}
+	buf = appendText(buf, "(");
+	buf = appendULL(buf, (unsigned long long) signo);
+	buf = appendText(buf, ")");
+	return buf;
+}
+
 #define SI_CODE_HANDLER(name) \
 	case name: \
 		buf = appendText(buf, #name); \
@@ -125,6 +145,8 @@ appendULL(char *buf, unsigned long long value) {
 // Must be async signal safe.
 static char *
 appendSignalReason(char *buf, siginfo_t *info) {
+	bool handled = true;
+	
 	switch (info->si_code) {
 	SI_CODE_HANDLER(SI_USER);
 	#ifdef SI_KERNEL
@@ -141,8 +163,31 @@ appendSignalReason(char *buf, siginfo_t *info) {
 		SI_CODE_HANDLER(SI_TKILL);
 	#endif
 	default:
-		buf = appendText(buf, "#");
-		buf = appendULL(buf, (unsigned long long) info->si_code);
+		switch (info->si_signo) {
+		case SIGSEGV:
+			switch (info->si_code) {
+			SI_CODE_HANDLER(SEGV_MAPERR);
+			SI_CODE_HANDLER(SEGV_ACCERR);
+			default:
+				handled = false;
+				break;
+			}
+			break;
+		case SIGBUS:
+			switch (info->si_code) {
+			SI_CODE_HANDLER(BUS_ADRALN);
+			SI_CODE_HANDLER(BUS_ADRERR);
+			SI_CODE_HANDLER(BUS_OBJERR);
+			default:
+				handled = false;
+				break;
+			}
+			break;
+		};
+		if (!handled) {
+			buf = appendText(buf, "#");
+			buf = appendULL(buf, (unsigned long long) info->si_code);
+		}
 		break;
 	}
 	
@@ -159,6 +204,11 @@ appendSignalReason(char *buf, siginfo_t *info) {
 static void
 abortHandler(int signo, siginfo_t *info, void *ctx) {
 	pid_t pid = getpid();
+	char messageBuf[1024];
+	#ifdef LIBC_HAS_BACKTRACE_FUNC
+		void *backtraceStore[512];
+		backtraceStore[0] = '\0'; // Don't let gdb print uninitialized contents.
+	#endif
 	
 	char *end = messageBuf;
 	end = appendText(end, "[ pid=");
@@ -166,7 +216,7 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 	end = appendText(end, ", timestamp=");
 	end = appendULL(end, (unsigned long long) time(NULL));
 	end = appendText(end, " ] Process aborted! signo=");
-	end = appendULL(end, (unsigned long long) signo);
+	end = appendSignalName(end, signo);
 	end = appendText(end, ", reason=");
 	end = appendSignalReason(end, info);
 	
@@ -181,9 +231,11 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 	write(STDERR_FILENO, messageBuf, end - messageBuf);
 	
 	#ifdef LIBC_HAS_BACKTRACE_FUNC
-		/* For some reason, it would appear that the ABRT signal
-		 * handler has a deadline on some systems: the process will
+		/* For some reason, it would appear that fatal signal
+		 * handlers have a deadline on some systems: the process will
 		 * be killed if the signal handler doesn't finish in time.
+		 * This killing appears to be triggered at some system calls,
+		 * including but not limited to nanosleep().
 		 * backtrace() might be slow and running crash-watch is
 		 * definitely slow, so we do our work in a child process
 		 * in order not to be affected by the deadline. But preferably
@@ -226,16 +278,39 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 	#endif
 	
 	// Run default signal handler.
-	kill(getpid(), SIGABRT);
+	kill(getpid(), signo);
 }
 
 static void
 installAbortHandler() {
+	alternativeStackSize = MINSIGSTKSZ + 64 * 1024;
+	alternativeStack = (char *) malloc(alternativeStackSize);
+	if (alternativeStack == NULL) {
+		fprintf(stderr, "Cannot allocate an alternative with a size of %u bytes!\n",
+			alternativeStackSize);
+		fflush(stderr);
+		abort();
+	}
+	
+	stack_t stack;
+	stack.ss_sp = alternativeStack;
+	stack.ss_size = alternativeStackSize;
+	stack.ss_flags = 0;
+	if (sigaltstack(&stack, NULL) != 0) {
+		int e = errno;
+		fprintf(stderr, "Cannot install an alternative stack for use in signal handlers: %s (%d)\n",
+			strerror(e), e);
+		fflush(stderr);
+		abort();
+	}
+	
 	struct sigaction action;
 	action.sa_sigaction = abortHandler;
 	action.sa_flags = SA_RESETHAND | SA_SIGINFO;
 	sigemptyset(&action.sa_mask);
 	sigaction(SIGABRT, &action, NULL);
+	sigaction(SIGSEGV, &action, NULL);
+	sigaction(SIGBUS, &action, NULL);
 }
 
 bool

data/ext/common/Constants.h

@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.0.5"
+#define PASSENGER_VERSION "3.0.6"
 
 #define FEEDBACK_FD 3
 

data/ext/common/Logging.h

@@ -550,7 +550,7 @@ public:
 			maxConnectTries = 1;
 		}
 		maxConnectTries   = 10;
-		reconnectTimeout  = 60 * 1000000;
+		reconnectTimeout  = 1000000;
 		nextReconnectTime = 0;
 	}
 	
@@ -649,7 +649,7 @@ public:
 				
 				// Failed to connect.
 				P_WARN("Cannot connect to the logging agent (" << serverAddress << "); " <<
-					"retrying in " << reconnectTimeout / 1000000 << " seconds.");
+					"retrying in " << reconnectTimeout / 1000000 << " second(s).");
 				nextReconnectTime = SystemTime::getUsec() + reconnectTimeout;
 			}
 		}
@@ -711,7 +711,7 @@ public:
 			
 			// Failed to connect.
 			P_WARN("Cannot connect to the logging agent (" << serverAddress << "); " <<
-				"retrying in " << reconnectTimeout / 1000000 << " seconds.");
+				"retrying in " << reconnectTimeout / 1000000 << " second(s).");
 			nextReconnectTime = SystemTime::getUsec() + reconnectTimeout;
 		}
 		return ptr(new AnalyticsLog());

data/ext/common/LoggingAgent/FilterSupport.h

@@ -34,6 +34,7 @@
 #include <string>
 #include <set>
 #include <regex.h>
+#include <cstdio>
 #include <cstring>
 
 #include <StaticString.h>

data/ext/common/LoggingAgent/Main.cpp

@@ -53,6 +53,7 @@ using namespace Passenger;
 
 static struct ev_loop *eventLoop;
 static LoggingServer *loggingServer;
+static int exitCode = 0;
 
 static struct ev_loop *
 createEventLoop() {
@@ -119,6 +120,12 @@ void
 caughtExitSignal(ev::sig &watcher, int revents) {
 	P_DEBUG("Caught signal, exiting...");
 	ev_unloop(eventLoop, EVUNLOOP_ONE);
+	/* We only consider the "exit" command to be a graceful way to shut down
+	 * the logging agent, so upon receiving an exit signal we want to return
+	 * a non-zero exit code. This is because we want the watchdog to restart
+	 * the logging agent when it's killed by SIGTERM.
+	 */
+	exitCode = 1;
 }
 
 void
@@ -270,7 +277,7 @@ main(int argc, char *argv[]) {
 		/********** Initialized! Enter main loop... **********/
 		
 		ev_loop(eventLoop, 0);
-		return 0;
+		return exitCode;
 	} catch (const tracable_exception &e) {
 		P_ERROR("*** ERROR: " << e.what() << "\n" << e.backtrace());
 		return 1;

data/ext/common/MessageChannel.h

@@ -577,14 +577,14 @@ public:
 			unsigned int ret;
 			try {
 				ret = Passenger::readExact(fd, buf, size, &t);
-				#ifdef __NetBSD__
+				#if defined(__NetBSD__) || defined(__OpenBSD__)
 					*timeout = llround((double) t / 1000);
 				#else
 					*timeout = llroundl((long double) t / 1000);
 				#endif
 				return ret == size;
 			} catch (...) {
-				#ifdef __NetBSD__
+				#if defined(__NetBSD__) || defined(__OpenBSD__)
 					*timeout = llround((double) t / 1000);
 				#else
 					*timeout = llroundl((long double) t / 1000);