passenger 3.9.1.beta → 3.9.2.beta

data/ext/common/ApplicationPool2/SuperGroup.h

@@ -1,5 +1,5 @@
 /*
- *  Phusion Passenger - http://www.modrails.com/
+ *  Phusion Passenger - https://www.phusionpassenger.com/
  *  Copyright (c) 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -189,11 +189,11 @@ private:
 	void verifyInvariants() const {
 		// !a || b: logical equivalent of a IMPLIES b.
 		
-		P_ASSERT(groups.empty() ==
+		assert(groups.empty() ==
 			(state == INITIALIZING || state == DESTROYING || state == DESTROYED));
-		P_ASSERT((defaultGroup == NULL) ==
+		assert((defaultGroup == NULL) ==
 			(state == INITIALIZING || state == DESTROYING || state == DESTROYED));
-		P_ASSERT(!( state == READY || state == RESTARTING || state == DESTROYING || state == DESTROYED ) ||
+		assert(!( state == READY || state == RESTARTING || state == DESTROYING || state == DESTROYED ) ||
 			( getWaitlist.empty() ));
 	}
 	
@@ -324,14 +324,14 @@ private:
 				return;
 			}
 			P_TRACE(2, "Initialization of SuperGroup " << inspect() << " almost done; grabbed lock");
-			P_ASSERT(state == INITIALIZING);
+			assert(state == INITIALIZING);
 			verifyInvariants();
 			
 			if (componentInfos.empty()) {
 				/* Somehow initialization failed. Maybe something has deleted
 				 * the supergroup files while we're working.
 				 */
-				P_ASSERT(exception != NULL);
+				assert(exception != NULL);
 				setState(DESTROYED);
 				
 				actions.reserve(getWaitlist.size());
@@ -384,7 +384,7 @@ private:
 		if (OXT_UNLIKELY(getPool() == NULL || this->generation != generation)) {
 			return;
 		}
-		P_ASSERT(state == RESTARTING);
+		assert(state == RESTARTING);
 		verifyInvariants();
 		
 		vector<GroupPtr> allGroups;
@@ -455,7 +455,7 @@ private:
 		}
 		
 		UPDATE_TRACE_POINT();
-		P_ASSERT(state == DESTROYING);
+		assert(state == DESTROYING);
 		verifyInvariants();
 		state = DESTROYED;
 		verifyInvariants();
@@ -486,7 +486,8 @@ public:
 	/**
 	 * get() requests for this super group that cannot be immediately satisfied
 	 * are put on this wait list, which must be processed as soon as the
-	 * necessary resources have become free.
+	 * necessary resources have become free. Requests must wait when a SuperGroup
+	 * is initializing.
 	 *
 	 * Invariant:
 	 *    if state == READY || state == RESTARTING || state == DESTROYING || state == DESTROYED:
@@ -505,7 +506,7 @@ public:
 	 */
 	SuperGroup(const PoolPtr &pool, const Options &options) {
 		this->pool = pool;
-		this->options = options.copyAndPersist();
+		this->options = options.copyAndPersist().clearLogger();
 		this->name = options.getAppGroupName();
 		secret = generateSecret();
 		state = INITIALIZING;
@@ -636,10 +637,10 @@ public:
 			for (it = groups.begin(); result && it != end; it++) {
 				result = result && (*it)->garbageCollectable(now);
 			}
-			P_ASSERT(!result || getWaitlist.empty());
+			assert(!result || getWaitlist.empty());
 			return result;
 		} else {
-			P_ASSERT(!(state == DESTROYED) || getWaitlist.empty());
+			assert(!(state == DESTROYED) || getWaitlist.empty());
 			return state == DESTROYED;
 		} */
 		return false;
@@ -676,7 +677,7 @@ public:
 					this,
 					// Keep reference to self to prevent destruction.
 					shared_from_this(),
-					newOptions.copyAndPersist(),
+					newOptions.copyAndPersist().clearLogger(),
 					generation),
 				"SuperGroup initializer: " + name,
 				POOL_HELPER_THREAD_STACK_SIZE);
@@ -718,7 +719,7 @@ public:
 					this,
 					// Keep reference to self to prevent destruction.
 					shared_from_this(),
-					options.copyAndPersist(),
+					options.copyAndPersist().clearLogger(),
 					generation),
 				"SuperGroup restarter: " + name,
 				POOL_HELPER_THREAD_STACK_SIZE);
@@ -732,7 +733,7 @@ public:
 		vector<GroupPtr>::const_iterator g_it, g_end = groups.end();
 		for (g_it = groups.begin(); g_it != g_end; g_it++) {
 			const GroupPtr &group = *g_it;
-			result += group->count;
+			result += group->enabledCount + group->disablingCount + group->disabledCount;
 		}
 		return result;
 	}

data/ext/common/BackgroundEventLoop.cpp

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

data/ext/common/BackgroundEventLoop.h

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

data/ext/common/Constants.h

@@ -1,5 +1,5 @@
 /*
- *  Phusion Passenger - http://www.modrails.com/
+ *  Phusion Passenger - https://www.phusionpassenger.com/
  *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.9.1.beta"
+#define PASSENGER_VERSION "3.9.2.beta"
 
 #define FEEDBACK_FD 3
 

data/ext/common/EventedBufferedInput.h

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

data/ext/common/EventedClient.h

@@ -1,5 +1,5 @@
 /*
- *  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/common/EventedMessageServer.h

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

data/ext/common/EventedServer.h

@@ -1,5 +1,5 @@
 /*
- *  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/common/Exceptions.h

@@ -1,5 +1,5 @@
 /*
- *  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/common/FileDescriptor.h

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

data/ext/common/HttpConstants.h

@@ -1,5 +1,5 @@
 /*
- *  Phusion Passenger - http://www.modrails.com/
+ *  Phusion Passenger - https://www.phusionpassenger.com/
  *  Copyright (c) 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -54,9 +54,9 @@ getStatusCodeAndReasonPhrase(int statusCode) {
 	case 207:
 		return "207 Multi-Status";
 	case 208:
-		return "Already Reported";
+		return "208 Already Reported";
 	case 226:
-		return "IM Used";
+		return "226 IM Used";
 	case 300:
 		return "300 Multiple Choices";
 	case 301:
@@ -116,7 +116,7 @@ getStatusCodeAndReasonPhrase(int statusCode) {
 		return "418 Not A Funny April Fools Joke";
 	case 420:
 		// https://dev.twitter.com/docs/error-codes-responses
-		return "Enhance Your Calm";
+		return "420 Enhance Your Calm";
 	case 422:
 		return "422 Unprocessable Entity";
 	case 423:
@@ -126,11 +126,11 @@ getStatusCodeAndReasonPhrase(int statusCode) {
 	case 426:
 		return "426 Upgrade Required";
 	case 428:
-		return "Precondition Required";
+		return "428 Precondition Required";
 	case 429:
-		return "Too Many Requests";
+		return "429 Too Many Requests";
 	case 431:
-		return "Request Header Fields Too Large";
+		return "431 Request Header Fields Too Large";
 	case 449:
 		return "449 Retry With";
 	case 450:
@@ -156,7 +156,7 @@ getStatusCodeAndReasonPhrase(int statusCode) {
 	case 510:
 		return "510 Not Extended";
 	case 511:
-		return "Network Authentication Required";
+		return "511 Network Authentication Required";
 	default:
 		return (const char *) 0;
 	}

data/ext/common/IniFile.h

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

data/ext/common/Logging.cpp

@@ -1,5 +1,5 @@
 /*
- *  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.
@@ -22,14 +22,16 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#include <iostream>
-#include <fstream>
-#include "Logging.h"
+#include <iomanip>
+#include <cstdlib>
+#include <fcntl.h>
+#include <unistd.h>
+#include <Logging.h>
 
 namespace Passenger {
 
 int _logLevel = 0;
-ostream *_logStream = &cerr;
+int _logOutput = STDERR_FILENO;
 
 int
 getLogLevel() {
@@ -41,23 +43,46 @@ setLogLevel(int value) {
 	_logLevel = value;
 }
 
-void
+bool
 setDebugFile(const char *logFile) {
-	#ifdef PASSENGER_DEBUG
-		if (logFile != NULL) {
-			ostream *stream = new ofstream(logFile, ios_base::out | ios_base::app);
-			if (stream->fail()) {
-				delete stream;
-			} else {
-				if (_logStream != NULL && _logStream != &cerr) {
-					delete _logStream;
-				}
-				_logStream = stream;
-			}
-		} else {
-			_logStream = &cerr;
+	int fd = open(logFile, O_WRONLY | O_CREAT | O_APPEND, 0644);
+	if (fd != -1) {
+		_logOutput = fd;
+		return true;
+	} else {
+		return false;
+	}
+}
+
+void
+_prepareLogEntry(std::stringstream &sstream) {
+	time_t the_time;
+	struct tm the_tm;
+	char datetime_buf[60];
+	struct timeval tv;
+	
+	the_time = time(NULL);
+	localtime_r(&the_time, &the_tm);
+	strftime(datetime_buf, sizeof(datetime_buf) - 1, "%F %H:%M:%S", &the_tm);
+	gettimeofday(&tv, NULL);
+	sstream <<
+		"[ pid=" << std::dec << getpid() <<
+		" thr=" << std::hex << pthread_self() << std::dec <<
+		" time=" << datetime_buf << "." << std::setfill('0') << std::setw(4) <<
+			(unsigned long) (tv.tv_usec / 100) <<
+		" file=" << __FILE__ << ":" << (unsigned long) __LINE__ <<
+		" ]: ";
+}
+
+void
+_writeLogEntry(const std::string &str) {
+	size_t written = 0;
+	do {
+		ssize_t ret = write(_logOutput, str.data() + written, str.size() - written);
+		if (ret != -1) {
+			written += ret;
 		}
-	#endif
+	} while (written < str.size());
 }
 
 } // namespace Passenger

data/ext/common/Logging.h

@@ -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.
  *
@@ -39,7 +39,7 @@
 #include <string>
 #include <exception>
 #include <stdexcept>
-#include <iomanip>
+#include <ios>
 #include <ostream>
 #include <sstream>
 #include <cstdio>
@@ -57,49 +57,28 @@ using namespace oxt;
 /********** Debug logging facilities **********/
 
 extern int _logLevel;
-extern ostream *_logStream;
+extern int _logOutput;
 
 int getLogLevel();
 void setLogLevel(int value);
-void setDebugFile(const char *logFile = NULL);
+bool setDebugFile(const char *logFile = NULL);
+void _prepareLogEntry(std::stringstream &sstream);
+void _writeLogEntry(const std::string &str);
+
 
 /**
- * Write the given expression to the given stream.
- *
- * @param expr The expression to write.
- * @param stream A pointer to an object that accepts the '<<' operator.
+ * Write the given expression to the log stream.
  */
-#define P_LOG_TO(level, expr, stream) \
+#define P_LOG(level, expr) \
 	do { \
-		if (stream != 0 && Passenger::_logLevel >= level) { \
-			time_t the_time;			\
-			struct tm the_tm;			\
-			char datetime_buf[60];			\
-			struct timeval tv;			\
-			std::stringstream sstream;              \
-								\
-			the_time = time(NULL);			\
-			localtime_r(&the_time, &the_tm);	\
-			strftime(datetime_buf, sizeof(datetime_buf) - 1, "%F %H:%M:%S", &the_tm); \
-			gettimeofday(&tv, NULL); \
-			sstream << \
-				"[ pid=" << ((unsigned long) getpid()) <<  \
-				" thr=" << pthread_self() << \
-				" file=" << __FILE__ << ":" << (unsigned long) __LINE__ << \
-				" time=" << datetime_buf << "." << std::setfill('0') << std::setw(4) << \
-					(unsigned long) (tv.tv_usec / 100) << \
-				" ]: " << \
-				expr << std::endl;	\
-			*stream << sstream.str();		\
-			stream->flush();			\
+		if (Passenger::_logLevel >= level) { \
+			std::stringstream sstream; \
+			Passenger::_prepareLogEntry(sstream); \
+			sstream << expr << "\n"; \
+			Passenger::_writeLogEntry(sstream.str()); \
 		} \
 	} while (false)
 
-/**
- * Write the given expression to the log stream.
- */
-#define P_LOG(level, expr) P_LOG_TO(level, expr, Passenger::_logStream)
-
 /**
  * Write the given expression, which represents a warning,
  * to the log stream.
@@ -124,38 +103,10 @@ void setDebugFile(const char *logFile = NULL);
  */
 #define P_DEBUG(expr) P_TRACE(1, expr)
 
-/**
- * Aborts the current process. At least on OS X, abort() unfortunately sends SIGABRT
- * to a random thread, causing the original backtrace to be lost when gdb has
- * detected SIGABRT. We fix that by sending SIGABRT to the calling thread.
- */
-#define P_ABORT() \
-	do { \
-		P_ERROR("Aborting!"); \
-		sigset_t set; \
-		sigemptyset(&set); \
-		sigaddset(&set, SIGABRT); \
-		pthread_sigmask(SIG_UNBLOCK, &set, NULL); \
-		pthread_kill(pthread_self(), SIGABRT); \
-		abort(); \
-	} while (false)
-
 #ifdef PASSENGER_DEBUG
-	#define P_TRACE(level, expr) P_LOG_TO(level, expr, Passenger::_logStream)
-	
-	/* A version of assert() that works better. We also print the process ID, time
-	 * and other stuff that the P_* logging functions normally print.
-	 */
-	#define P_ASSERT(expr) \
-		do { \
-			if (OXT_UNLIKELY(!(expr))) { \
-				P_ERROR("Assertion failed: " << #expr); \
-				P_ABORT(); \
-			} \
-		} while (false)
+	#define P_TRACE(level, expr) P_LOG(level, expr)
 #else
 	#define P_TRACE(level, expr) do { /* nothing */ } while (false)
-	#define P_ASSERT(expr) ((void) 0)
 #endif