RubyGems - passenger - Versions diffs - 3.0.0.pre1 → 3.0.0.pre2 - Mend

passenger 3.0.0.pre1 → 3.0.0.pre2

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (189) hide show

@@ -0,0 +1,26 @@
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>Passenger Ruby API</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+</head>
+<frameset cols="20%,*">
+    <frameset rows="15%,55%,30%">
+        <frame src="fr_file_index.html"   title="Files" name="Files" />
+        <frame src="fr_class_index.html"  name="Classes" />
+        <frame src="fr_method_index.html" name="Methods" />
+    </frameset>
+    <frame  src="files/README.html" name="docwin" />
+    <noframes>
+          <body bgcolor="white">
+            Click <a href="html/index.html">here</a> for a non-frames
+            version of this page.
+          </body>
+    </noframes>
+</frameset>
+</html>

data/doc/rdoc/rdoc-style.css ADDED

@@ -0,0 +1,187 @@
+a {
+  color: #00F;
+  text-decoration: none;
+}
+a:hover {
+  color: #77F;
+  text-decoration: underline;
+}
+body, td, p {
+  font-family: "Bitstream Vera Sans", Verdana, Arial, Helvetica, sans-serif;
+  background: #FFF;
+  color: #000;
+  margin: 0px;
+  font-size: small;
+}
+p {
+  margin-top: 0.5em;
+  margin-bottom: 0.5em;
+}
+#content {
+  margin: 2em;
+  margin-left: 3.5em;
+  margin-right: 3.5em;
+}
+#description p {
+  margin-bottom: 0.5em;
+}
+.sectiontitle {
+  margin-top: 1em;
+  margin-bottom: 1em;
+  padding: 0.5em;
+  padding-left: 2em;
+  background: #005;
+  color: #FFF;
+  font-weight: bold;
+}
+.attr-rw {
+  padding-left: 1em;
+  padding-right: 1em;
+  text-align: center;
+  color: #055;
+}
+.attr-name {
+  font-weight: bold;
+}
+.attr-desc {
+}
+.attr-value {
+  font-family: monospace;
+}
+.file-title-prefix {
+  font-size: large;
+}
+.file-title {
+  font-size: large;
+  font-weight: bold;
+  background: #005;
+  color: #FFF;
+}
+.banner {
+  background: #005;
+  color: #FFF;
+  border: 1px solid black;
+  padding: 1em;
+}
+.banner td {
+  background: transparent;
+  color: #FFF;
+}
+h1 a, h2 a, .sectiontitle a, .banner a {
+  color: #FF0;
+}
+h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
+  color: #FF7;
+}
+.dyn-source {
+  display: none;
+  background: #fffde8;
+  color: #000;
+  border: #ffe0bb dotted 1px;
+  margin: 0.5em 2em 0.5em 2em;
+  padding: 0.5em;
+}
+.dyn-source .cmt {
+  color: #00F;
+  font-style: italic;
+}
+.dyn-source .kw {
+  color: #070;
+  font-weight: bold;
+}
+.method {
+  margin-left: 1em;
+  margin-right: 1em;
+  margin-bottom: 1em;
+}
+.description pre {
+  padding: 0.5em;
+  border: #ffe0bb dotted 1px;
+  background: #fffde8;
+}
+.method .title {
+  font-family: monospace;
+  font-size: large;
+  border-bottom: 1px dashed black;
+  margin-bottom: 0.3em;
+  padding-bottom: 0.1em;
+}
+.method .description, .method .sourcecode {
+  margin-left: 1em;
+}
+.description p, .sourcecode p {
+  margin-bottom: 0.5em;
+}
+.method .sourcecode p.source-link {
+  text-indent: 0em;
+  margin-top: 0.5em;
+}
+.method .aka {
+  margin-top: 0.3em;
+  margin-left: 1em;
+  font-style: italic;
+  text-indent: 2em;
+}
+h1 {
+  padding: 1em;
+  margin-left: -1.5em;
+  font-size: x-large;
+  font-weight: bold;
+  color: #FFF;
+  background: #007;
+}
+h2 {
+  padding: 0.5em 1em 0.5em 1em;
+  margin-left: -1.5em;
+  font-size: large;
+  font-weight: bold;
+  color: #FFF;
+  background: #009;
+}
+h3, h4, h5, h6 {
+  color: #220088;
+  border-bottom: #5522bb solid 1px;
+}
+.sourcecode > pre {
+  padding: 0.5em;
+  border: 1px dotted black;
+  background: #FFE;
+}
+dt {
+  font-weight: bold
+}
+dd {
+  margin-bottom: 0.7em;
+}

data/ext/apache2/Configuration.hpp CHANGED

@@ -289,7 +289,7 @@ struct DirConfig {
 		if (minInstancesSpecified) {
 			return minInstances;
 		} else {
-			return 0;
+			return 1;
 		}
 	}

data/ext/apache2/Hooks.cpp CHANGED

@@ -66,6 +66,7 @@
  * http://groups.google.com/group/phusion-passenger/browse_thread/thread/7e162f60df212e9c
  */
 #include <ap_config.h>
+#include <ap_release.h>
 #include <httpd.h>
 #include <http_config.h>
 #include <http_core.h>
@@ -93,6 +94,17 @@ extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
 #define LARGE_UPLOAD_THRESHOLD 1024 * 8
+#if HTTP_VERSION(AP_SERVER_MAJORVERSION_NUMBER, AP_SERVER_MINORVERSION_NUMBER) > 2002
+	// Apache > 2.2.x
+	#define AP_GET_SERVER_VERSION_DEPRECATED
+#elif HTTP_VERSION(AP_SERVER_MAJORVERSION_NUMBER, AP_SERVER_MINORVERSION_NUMBER) == 2002
+	// Apache == 2.2.x
+	#if AP_SERVER_PATCHLEVEL_NUMBER >= 14
+		#define AP_GET_SERVER_VERSION_DEPRECATED
+	#endif
+#endif
 /**
  * Apache hook functions, wrapped in a class.
  *
@@ -187,7 +199,11 @@ private:
 				// Some standard CGI headers.
 				result->push_back("SERVER_SOFTWARE");
-				result->push_back(ap_get_server_version());
+				#ifdef AP_GET_SERVER_VERSION_DEPRECATED
+					result->push_back(ap_get_server_banner());
+				#else
+					result->push_back(ap_get_server_version());
+				#endif
 				// Subprocess environment variables.
 				env_arr = apr_table_elts(r->subprocess_env);
@@ -1334,7 +1350,13 @@ public:
 		server_rec *server;
 		string configFiles;
-		createFile(generationPath + "/web_server.txt", ap_get_server_description());
+		#ifdef AP_GET_SERVER_VERSION_DEPRECATED
+			createFile(generationPath + "/web_server.txt",
+				ap_get_server_description());
+		#else
+			createFile(generationPath + "/web_server.txt",
+				ap_get_server_version());
+		#endif
 		for (server = s; server != NULL; server = server->next) {
 			if (server->defn_name != NULL) {

data/ext/common/AgentsStarter.hpp CHANGED

@@ -46,6 +46,7 @@
 #include "Utils.h"
 #include "Utils/IOUtils.h"
 #include "Utils/Base64.h"
+#include "Utils/Timer.h"
 #include "Utils/VariantMap.h"
 namespace Passenger {
@@ -117,10 +118,31 @@ private:
 	ServerInstanceDir::GenerationPtr generation;
 	static void
-	killAndWait(pid_t pid) {
-		this_thread::disable_syscall_interruption dsi;
-		syscalls::kill(pid, SIGKILL);
-		syscalls::waitpid(pid, NULL, 0);
+	killAndWait(pid_t pid, unsigned long long timeout = 0) {
+		if (timeout == 0 || timedWaitPid(pid, NULL, timeout) == 0) {
+			this_thread::disable_syscall_interruption dsi;
+			syscalls::kill(pid, SIGKILL);
+			syscalls::waitpid(pid, NULL, 0);
+		}
+	}
+	/**
+	 * Behaves like <tt>waitpid(pid, status, WNOHANG)</tt>, but waits at most
+	 * <em>timeout</em> miliseconds for the process to exit.
+	 */
+	static int timedWaitPid(pid_t pid, int *status, unsigned long long timeout) {
+		Timer timer;
+		int ret;
+		do {
+			ret = syscalls::waitpid(pid, status, WNOHANG);
+			if (ret > 0 || ret == -1) {
+				return ret;
+			} else {
+				syscalls::usleep(10000);
+			}
+		} while (timer.elapsed() < timeout);
+		return 0; // timed out
 	}
 	/**
@@ -420,8 +442,12 @@ public:
 			try {
 				watchdogArgs.writeToChannel(feedbackChannel);
 			} catch (const SystemException &) {
-				/* Did the watchdog crash? */
-				ret = syscalls::waitpid(pid, &status, WNOHANG);
+				/* 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
@@ -437,11 +463,17 @@ public:
 						"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 for a different reason. */
+				} 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)));
 				}
 			}
@@ -459,7 +491,7 @@ public:
 					/* The feedback fd was closed for an unknown reason.
 					 * Did the watchdog crash?
 					 */
-					ret = syscalls::waitpid(pid, &status, WNOHANG);
+					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
@@ -473,14 +505,19 @@ public:
 						throw RuntimeException("Unable to start the Phusion Passenger watchdog: "
 							"it seems to have been killed with signal " +
 							getSignalName(WTERMSIG(status)) + " during startup");
-					} else {
+					} 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)));
 					}
 				}
 			} catch (const SystemException &ex) {
-				killAndWait(pid);
+				killAndWait(pid, 2000);
 				throw SystemException("Unable to start the Phusion Passenger watchdog: "
 					"unable to read its startup information",
 					ex.code());
@@ -488,7 +525,7 @@ public:
 				// Watchdog has already exited, no need to kill it.
 				throw;
 			} catch (...) {
-				killAndWait(pid);
+				killAndWait(pid, 2000);
 				throw;
 			}
@@ -498,7 +535,7 @@ public:
 					serverInstanceDir.reset(new ServerInstanceDir(args[1], false));
 					generation = serverInstanceDir->getGeneration(atoi(args[2]));
 				} else {
-					killAndWait(pid);
+					killAndWait(pid, 2000);
 					throw IOException("Unable to start the Phusion Passenger watchdog: "
 						"it returned an invalid basic startup information message");
 				}
@@ -508,10 +545,10 @@ public:
 					"because it encountered the following error during startup: " +
 					args[1]);
 			} else if (args[0] == "system error") {
-				killAndWait(pid);
+				killAndWait(pid, 2000);
 				throw SystemException(args[1], atoi(args[2]));
 			} else if (args[0] == "exec error") {
-				killAndWait(pid);
+				killAndWait(pid, 2000);
 				throw SystemException("Unable to start the Phusion Passenger watchdog (" +
 					watchdogFilename + ")", atoi(args[1]));
 			}
@@ -537,7 +574,7 @@ public:
 							 * We can't do anything without proper feedback so kill
 							 * the watchdo and throw an exception.
 							 */
-							killAndWait(pid);
+							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)) {
@@ -552,7 +589,7 @@ public:
 						}
 					}
 				} catch (const SystemException &ex) {
-					killAndWait(pid);
+					killAndWait(pid, 2000);
 					throw SystemException("Unable to start the Phusion Passenger watchdog: "
 						"unable to read all agent startup information",
 						ex.code());
@@ -560,7 +597,7 @@ public:
 					// Watchdog has already exited, no need to kill it.
 					throw;
 				} catch (...) {
-					killAndWait(pid);
+					killAndWait(pid, 2000);
 					throw;
 				}
@@ -587,7 +624,7 @@ public:
 						loggingSocketAddress  = args[1];
 						loggingSocketPassword = args[2];
 					} else {
-						killAndWait(pid);
+						killAndWait(pid, 2000);
 						throw IOException("Unable to start the Phusion Passenger watchdog: "
 							"it returned an invalid initialization feedback message");
 					}
@@ -595,7 +632,7 @@ public:
 					allAgentsStarted = true;
 				} else {
 					UPDATE_TRACE_POINT();
-					killAndWait(pid);
+					killAndWait(pid, 2000);
 					throw RuntimeException("One of the Passenger agents sent an unknown feedback message '" + args[0] + "'");
 				}
 			}