passenger 3.0.21 → 3.9.1.beta

data/ext/common/EventedMessageServer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010, 2011 Phusion
+ *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -29,14 +29,12 @@
 #include <ev++.h>
 #include <cstdarg>
 #include <cstdlib>
-#ifdef HAS_ALLOCA_H
-	#include <alloca.h>
-#endif
-#include "EventedServer.h"
-#include "MessageReadersWriters.h"
-#include "AccountsDatabase.h"
-#include "Constants.h"
-#include "Utils.h"
+#include <EventedServer.h>
+#include <MessageReadersWriters.h>
+#include <AccountsDatabase.h>
+#include <Constants.h>
+#include <Utils.h>
+#include <Utils/SmallVector.h>
 
 namespace Passenger {
 
@@ -83,42 +81,27 @@ public:
 	
 	void writeArrayMessage(const char *name, ...) {
 		va_list ap;
-		unsigned int count = 0;
+		SmallVector<StaticString, 10> args;
+		const char *arg;
 		
+		args.push_back(name);
 		va_start(ap, name);
-		while (va_arg(ap, const char *) != NULL) {
-			count++;
+		while ((arg = va_arg(ap, const char *)) != NULL) {
+			args.push_back(arg);
 		}
 		va_end(ap);
 		
-		StaticString *args = (StaticString *)
-			alloca((count + 1) * sizeof(StaticString));
-		unsigned int i = 1;
-		
-		args[0] = name;
-		va_start(ap, name);
-		while (true) {
-			const char *arg = va_arg(ap, const char *);
-			if (arg != NULL) {
-				args[i] = arg;
-				i++;
-			} else {
-				break;
-			}
-		}
-		va_end(ap);
-		
-		writeArrayMessage(args, count + 1);
+		writeArrayMessage(&args[0], args.size());
 	}
 	
 	void writeArrayMessage(StaticString args[], unsigned int count) {
 		char headerBuf[sizeof(uint16_t)];
 		unsigned int outSize = ArrayMessage::outputSize(count);
-		StaticString *out = (StaticString *)
-			alloca(outSize * sizeof(StaticString));
+		SmallVector<StaticString, 10> out;
+		out.reserve(outSize);
 		
-		ArrayMessage::generate(args, count, headerBuf, out, outSize);
-		write(out, outSize);
+		ArrayMessage::generate(args, count, headerBuf, &out[0], outSize);
+		write(&out[0], outSize);
 	}
 };
 

data/ext/common/EventedServer.h

@@ -144,7 +144,7 @@ private:
 		ClientSet::iterator it;
 		ClientSet::iterator end = clients.end();
 		
-		for (it = clients.begin(); it != clients.end(); it++) {
+		for (it = clients.begin(); it != end; it++) {
 			(*it)->unref();
 		}
 		clients.clear();
@@ -221,7 +221,7 @@ private:
 				}
 				done = true;
 			} else {
-				FileDescriptor clientfdGuard = clientfd;
+				FileDescriptor clientfdGuard(clientfd);
 				int optval = 1;
 				
 				setNonBlocking(clientfdGuard);

data/ext/common/Exceptions.h

@@ -27,8 +27,10 @@
 
 #include <oxt/tracable_exception.hpp>
 #include <string>
+#include <map>
 #include <sstream>
 #include <cstring>
+#include <cassert>
 
 /**
  * @defgroup Exceptions Exceptions
@@ -68,7 +70,7 @@ public:
 	SystemException(const string &briefMessage, int errorCode) {
 		stringstream str;
 		
-		str << strerror(errorCode) << " (" << errorCode << ")";
+		str << strerror(errorCode) << " (errno=" << errorCode << ")";
 		systemMessage = str.str();
 		
 		setBriefMessage(briefMessage);
@@ -201,52 +203,102 @@ public:
  * HTML page with details about the error.
  */
 class SpawnException: public oxt::tracable_exception {
+public:
+	enum ErrorKind {
+		UNDEFINED_ERROR,
+		PRELOADER_STARTUP_PROTOCOL_ERROR,
+		PRELOADER_STARTUP_TIMEOUT,
+		PRELOADER_STARTUP_EXPLAINABLE_ERROR,
+		APP_STARTUP_PROTOCOL_ERROR,
+		APP_STARTUP_TIMEOUT,
+		APP_STARTUP_EXPLAINABLE_ERROR
+	};
+	
 private:
+	ErrorKind errorKind;
 	string msg;
 	bool m_hasErrorPage;
 	bool m_isHTML;
 	string m_errorPage;
+	string preloaderCommand;
+	map<string, string> annotations;
+	
 public:
-	SpawnException(const string &message)
-		: msg(message) {
+	SpawnException(const string &message, ErrorKind errorKind = UNDEFINED_ERROR)
+		: msg(message)
+	{
+		this->errorKind = errorKind;
 		m_hasErrorPage = false;
 		m_isHTML = false;
 	}
 	
-	SpawnException(const string &message, const string &errorPage, bool isHTML = true)
+	SpawnException(const string &message, const string &errorPage,
+		bool isHTML = true, ErrorKind errorKind = UNDEFINED_ERROR)
 		: msg(message), m_errorPage(errorPage)
 	{
+		assert(!isHTML
+			|| errorKind == UNDEFINED_ERROR
+			|| errorKind == PRELOADER_STARTUP_EXPLAINABLE_ERROR
+			|| errorKind == APP_STARTUP_EXPLAINABLE_ERROR);
+		this->errorKind = errorKind;
 		m_hasErrorPage = true;
 		m_isHTML = isHTML;
 	}
 	
 	virtual ~SpawnException() throw() {}
-	virtual const char *what() const throw() { return msg.c_str(); }
 	
-	/**
-	 * Check whether an error page is available.
-	 */
+	virtual const char *what() const throw() {
+		return msg.c_str();
+	}
+	
 	bool hasErrorPage() const {
 		return m_hasErrorPage;
 	}
 	
-	/**
-	 * Return the error page content.
-	 *
-	 * @pre hasErrorPage()
-	 */
-	const string getErrorPage() const {
+	const string &getErrorPage() const {
 		return m_errorPage;
 	}
 	
-	/**
-	 * Whether the error page content is HTML.
-	 *
-	 * @pre hasErrorPage()
-	 */
 	bool isHTML() const {
 		return m_isHTML;
 	}
+	
+	ErrorKind getErrorKind() const {
+		return errorKind;
+	}
+	
+	SpawnException &setPreloaderCommand(const string &filename) {
+		preloaderCommand = filename;
+		return *this;
+	}
+	
+	const string &getPreloaderCommand() const {
+		return preloaderCommand;
+	}
+
+	void addAnnotations(const map<string, string> &annotations) {
+		map<string, string>::const_iterator it, end = annotations.end();
+		for (it = annotations.begin(); it != end; it++) {
+			this->annotations[it->first] = it->second;
+		}
+	}
+
+	const map<string, string> &getAnnotations() const {
+		return annotations;
+	}
+
+	string operator[](const string &name) const {
+		return get(name);
+	}
+
+	string get(const string &name) const {
+		map<string, string>::const_iterator it = annotations.find(name);
+		if (it == annotations.end()) {
+			return string();
+		} else {
+			return it->second;
+		}
+	}
 };
 
 /**

data/ext/common/FileDescriptor.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -67,13 +67,15 @@ class FileDescriptor {
 private:
 	struct SharedData {
 		int fd;
+		bool autoClose;
 		
-		SharedData(int fd) {
+		SharedData(int fd, bool autoClose) {
 			this->fd = fd;
+			this->autoClose = autoClose;
 		}
 		
 		~SharedData() {
-			if (fd >= 0) {
+			if (fd >= 0 && autoClose) {
 				this_thread::disable_syscall_interruption dsi;
 				syscalls::close(fd);
 			}
@@ -110,7 +112,7 @@ public:
 	 *
 	 * @post *this == fd
 	 */
-	FileDescriptor(int fd) {
+	explicit FileDescriptor(int fd, bool autoClose = true) {
 		if (fd >= 0) {
 			/* Make sure that the 'new' operator doesn't overwrite
 			 * errno so that we can write code like this:
@@ -121,7 +123,7 @@ public:
 			 *    }
 			 */
 			int e = errno;
-			data = make_shared<SharedData>(fd);
+			data = make_shared<SharedData>(fd, autoClose);
 			errno = e;
 		}
 	}
@@ -191,7 +193,7 @@ public:
 		 */
 		int e = errno;
 		if (fd >= 0) {
-			data = make_shared<SharedData>(fd);
+			data = make_shared<SharedData>(fd, true);
 		} else {
 			data.reset();
 		}

data/ext/common/HttpConstants.h

@@ -0,0 +1,167 @@
+/*
+ *  Phusion Passenger - http://www.modrails.com/
+ *  Copyright (c) 2012 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_HTTP_CONSTANTS_H_
+#define _PASSENGER_HTTP_CONSTANTS_H_
+
+namespace Passenger {
+
+inline const char *
+getStatusCodeAndReasonPhrase(int statusCode) {
+	// http://en.wikipedia.org/wiki/List_of_HTTP_status_codes
+	switch (statusCode) {
+	case 100:
+		return "100 Continue";
+	case 101:
+		return "101 Switching Protocols";
+	case 102:
+		return "102 Processing";
+	case 200:
+		return "200 OK";
+	case 201:
+		return "201 Created";
+	case 202:
+		return "202 Accepted";
+	case 203:
+		return "203 Non-Authoritative Information";
+	case 204:
+		return "204 No Content";
+	case 205:
+		return "205 Reset Content";
+	case 206:
+		return "206 Partial Content";
+	case 207:
+		return "207 Multi-Status";
+	case 208:
+		return "Already Reported";
+	case 226:
+		return "IM Used";
+	case 300:
+		return "300 Multiple Choices";
+	case 301:
+		return "301 Moved Permanently";
+	case 302:
+		return "302 Found";
+	case 303:
+		return "303 See Other";
+	case 304:
+		return "304 Not Modified";
+	case 305:
+		return "305 Use Proxy";
+	case 306:
+		return "306 Switch Proxy";
+	case 307:
+		return "307 Temporary Redirect";
+	case 308:
+		// Google Gears: http://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal
+		return "308 Resume Incomplete";
+	case 400:
+		return "400 Bad Request";
+	case 401:
+		return "401 Unauthorized";
+	case 402:
+		return "402 Payment Required";
+	case 403:
+		return "403 Forbidden";
+	case 404:
+		return "404 Not Found";
+	case 405:
+		return "405 Method Not Allowed";
+	case 406:
+		return "406 Not Acceptable";
+	case 407:
+		return "407 Proxy Authentication Required";
+	case 408:
+		return "408 Request Timeout";
+	case 409:
+		return "409 Conflict";
+	case 410:
+		return "410 Gone";
+	case 411:
+		return "411 Length Required";
+	case 412:
+		return "412 Precondition Failed";
+	case 413:
+		return "413 Request Entity Too Large";
+	case 414:
+		return "414 Request-URI Too Long";
+	case 415:
+		return "415 Unsupported Media Type";
+	case 416:
+		return "416 Requested Range Not Satisfiable";
+	case 417:
+		return "417 Expectation Failed";
+	case 418:
+		return "418 Not A Funny April Fools Joke";
+	case 420:
+		// https://dev.twitter.com/docs/error-codes-responses
+		return "Enhance Your Calm";
+	case 422:
+		return "422 Unprocessable Entity";
+	case 423:
+		return "423 Locked";
+	case 424:
+		return "424 Unordered Collection";
+	case 426:
+		return "426 Upgrade Required";
+	case 428:
+		return "Precondition Required";
+	case 429:
+		return "Too Many Requests";
+	case 431:
+		return "Request Header Fields Too Large";
+	case 449:
+		return "449 Retry With";
+	case 450:
+		return "450 Blocked";
+	case 500:
+		return "500 Internal Server Error";
+	case 501:
+		return "501 Not Implemented";
+	case 502:
+		return "502 Bad Gateway";
+	case 503:
+		return "503 Service Unavailable";
+	case 504:
+		return "504 Gateway Timeout";
+	case 505:
+		return "505 HTTP Version Not Supported";
+	case 506:
+		return "506 Variant Also Negotiates";
+	case 507:
+		return "507 Insufficient Storage";
+	case 509:
+		return "509 Bandwidth Limit Exceeded";
+	case 510:
+		return "510 Not Extended";
+	case 511:
+		return "Network Authentication Required";
+	default:
+		return (const char *) 0;
+	}
+}
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_HTTP_CONSTANTS_H_ */