passenger 3.0.9 → 3.0.10

data/ext/common/Utils/StreamBoyerMooreHorspool.h

@@ -67,7 +67,7 @@
  *    information. The section 'Reuse' explains why this is important.
  *
  * 2. Allocate a StreamBMH_Occ structure somewhere.
- *    This structure contains the Boyer-Moore-Horspool occurrance table. The secion
+ *    This structure contains the Boyer-Moore-Horspool occurrance table. The section
  *    'Reuse' explains why this is important.
  *
  * 3. Initialize both structures with sbmh_init(). The structures are now usable for
@@ -231,8 +231,10 @@ struct StreamBMH {
 	
 	/***** Internal fields, do not access. *****/
 	sbmh_size_t   lookbehind_size;
-	// Algorithm uses at most needle_len - 1 bytes of space in lookbehind buffer.
-	unsigned char lookbehind[];
+	/* After this field comes a 'lookbehind' field whose size is determined
+	 * by the allocator (e.g. SBMH_ALLOC_AND_INIT).
+	 * Algorithm uses at most needle_len - 1 bytes of space in lookbehind buffer.
+	 */
 };
 
 #define SBMH_SIZE(needle_len) (sizeof(struct StreamBMH) + (needle_len) - 1)
@@ -256,6 +258,9 @@ struct StreamBMH {
 	#define SBMH_DEBUG2(format, arg1, arg2) do { /* nothing */ } while (false)
 #endif
 
+/* Accessor for the lookbehind field. */
+#define _SBMH_LOOKBEHIND(ctx) ((unsigned char *) ctx + sizeof(struct StreamBMH))
+
 
 inline void
 sbmh_reset(struct StreamBMH *restrict ctx) {
@@ -300,7 +305,7 @@ sbmh_lookup_char(const struct StreamBMH *restrict ctx,
 	const unsigned char *restrict data, ssize_t pos)
 {
 	if (pos < 0) {
-		return ctx->lookbehind[ctx->lookbehind_size + pos];
+		return _SBMH_LOOKBEHIND(ctx)[ctx->lookbehind_size + pos];
 	} else {
 		return data[pos];
 	}
@@ -346,10 +351,11 @@ sbmh_feed(struct StreamBMH *restrict ctx, const struct StreamBMH_Occ *restrict o
 	ssize_t pos = -ctx->lookbehind_size;
 	unsigned char last_needle_char = needle[needle_len - 1];
 	const sbmh_size_t *occ = occtable->occ;
+	unsigned char *lookbehind = _SBMH_LOOKBEHIND(ctx);
 	
 	if (pos < 0) {
 		SBMH_DEBUG2("[sbmh] considering lookbehind: (%s)(%s)\n",
-			std::string((const char *) ctx->lookbehind, ctx->lookbehind_size).c_str(),
+			std::string((const char *) lookbehind, ctx->lookbehind_size).c_str(),
 			std::string((const char *) data, len).c_str());
 		
 		/* Lookbehind buffer is not empty. Perform Boyer-Moore-Horspool
@@ -374,7 +380,7 @@ sbmh_feed(struct StreamBMH *restrict ctx, const struct StreamBMH_Occ *restrict o
 				ctx->found = true;
 				ctx->lookbehind_size = 0;
 				if (pos > -ctx->lookbehind_size && ctx->callback != NULL) {
-					ctx->callback(ctx, ctx->lookbehind,
+					ctx->callback(ctx, lookbehind,
 						ctx->lookbehind_size + pos);
 				}
 				SBMH_DEBUG1("[sbmh] found using lookbehind; end = %d\n",
@@ -408,7 +414,7 @@ sbmh_feed(struct StreamBMH *restrict ctx, const struct StreamBMH_Occ *restrict o
 			/* Discard lookbehind buffer. */
 			SBMH_DEBUG("[sbmh] no match; discarding lookbehind\n");
 			if (ctx->callback != NULL) {
-				ctx->callback(ctx, ctx->lookbehind, ctx->lookbehind_size);
+				ctx->callback(ctx, lookbehind, ctx->lookbehind_size);
 			}
 			ctx->lookbehind_size = 0;
 		} else {
@@ -420,21 +426,21 @@ sbmh_feed(struct StreamBMH *restrict ctx, const struct StreamBMH_Occ *restrict o
 			
 			if (bytesToCutOff > 0 && ctx->callback != NULL) {
 				// The cut off data is guaranteed not to contain the needle.
-				ctx->callback(ctx, ctx->lookbehind, bytesToCutOff);
+				ctx->callback(ctx, lookbehind, bytesToCutOff);
 			}
 			
-			memmove(ctx->lookbehind,
-				ctx->lookbehind + bytesToCutOff,
+			memmove(lookbehind,
+				lookbehind + bytesToCutOff,
 				ctx->lookbehind_size - bytesToCutOff);
 			ctx->lookbehind_size -= bytesToCutOff;
 			
 			assert(ssize_t(ctx->lookbehind_size + len) < ssize_t(needle_len));
-			memcpy(ctx->lookbehind + ctx->lookbehind_size,
+			memcpy(lookbehind + ctx->lookbehind_size,
 				data, len);
 			ctx->lookbehind_size += len;
 			
 			SBMH_DEBUG1("[sbmh] update lookbehind -> (%s)\n",
-				std::string((const char *) ctx->lookbehind, ctx->lookbehind_size).c_str());
+				std::string((const char *) lookbehind, ctx->lookbehind_size).c_str());
 			return len;
 		}
 	}
@@ -484,11 +490,11 @@ sbmh_feed(struct StreamBMH *restrict ctx, const struct StreamBMH_Occ *restrict o
 			pos++;
 		}
 		if (size_t(pos) < len) {
-			memcpy(ctx->lookbehind, data + pos, len - pos);
+			memcpy(lookbehind, data + pos, len - pos);
 			ctx->lookbehind_size = len - pos;
 			SBMH_DEBUG2("[sbmh] adding %d trailing bytes to lookbehind -> (%s)\n",
 				int(len - pos),
-				std::string((const char *) ctx->lookbehind,
+				std::string((const char *) lookbehind,
 					ctx->lookbehind_size).c_str());
 		}
 	}

data/ext/common/Utils/VariantMap.h

@@ -30,9 +30,9 @@
 #include <sys/types.h>
 #include <map>
 #include <string>
-#include "MessageChannel.h"
-#include "Exceptions.h"
-#include "Utils/StrIntUtils.h"
+#include <Exceptions.h>
+#include <Utils/StrIntUtils.h>
+#include <Utils/MessageIO.h>
 
 namespace Passenger {
 
@@ -130,30 +130,17 @@ public:
 	}
 	
 	/**
-	 * Populates a VariantMap from the data in <em>fd</em>. MessageChannel
+	 * Populates a VariantMap from the data in <em>fd</em>. MessageIO
 	 * is used to read from the file descriptor.
 	 *
 	 * @throws SystemException
 	 * @throws IOException
-	 * @see <tt>readFrom(MessageChannel &)</tt>
 	 */
 	void readFrom(int fd) {
-		MessageChannel channel(fd);
-		readFrom(channel);
-	}
-	
-	/**
-	 * Populates a VariantMap from the data in <em>channel</em>. The first
-	 * message in the channel must be a message as sent by writeToChannel().
-	 *
-	 * @throws SystemException
-	 * @throws IOException
-	 */
-	void readFrom(MessageChannel &channel) {
 		TRACE_POINT();
 		vector<string> args;
 		
-		if (!channel.read(args)) {
+		if (!readArrayMessage(fd, args)) {
 			throw IOException("Unexpected end-of-file encountered");
 		}
 		if (args.size() == 0) {
@@ -308,19 +295,14 @@ public:
 		return store.size();
 	}
 	
-	void writeToFd(int fd) const {
-		MessageChannel channel(fd);
-		writeToChannel(channel);
-	}
-	
 	/**
 	 * Writes a representation of the contents in this VariantMap to
-	 * the given channel. The data can be unserialized with
-	 * <tt>readFrom(MessageChannel &)</tt>.
+	 * the given file descriptor with MessageIO. The data can be
+	 * unserialized with <tt>readFrom(fd)</tt>.
 	 *
 	 * @throws SystemException
 	 */
-	void writeToChannel(MessageChannel &channel) const {
+	void writeToFd(int fd) const {
 		map<string, string>::const_iterator it;
 		map<string, string>::const_iterator end = store.end();
 		vector<string> args;
@@ -331,7 +313,7 @@ public:
 			args.push_back(it->first);
 			args.push_back(it->second);
 		}
-		channel.write(args);
+		writeArrayMessage(fd, args);
 	}
 	
 	string inspect() const {

data/ext/common/Watchdog.cpp

@@ -38,23 +38,23 @@
 #include <cstring>
 #include <cerrno>
 
-#include "Constants.h"
-#include "AgentBase.h"
-#include "ServerInstanceDir.h"
-#include "FileDescriptor.h"
-#include "MessageChannel.h"
-#include "Constants.h"
-#include "RandomGenerator.h"
-#include "Logging.h"
-#include "Exceptions.h"
-#include "StaticString.h"
-#include "ResourceLocator.h"
-#include "Utils.h"
-#include "Utils/Base64.h"
-#include "Utils/Timer.h"
-#include "Utils/ScopeGuard.h"
-#include "Utils/IOUtils.h"
-#include "Utils/VariantMap.h"
+#include <Constants.h>
+#include <AgentBase.h>
+#include <ServerInstanceDir.h>
+#include <FileDescriptor.h>
+#include <Constants.h>
+#include <RandomGenerator.h>
+#include <Logging.h>
+#include <Exceptions.h>
+#include <StaticString.h>
+#include <ResourceLocator.h>
+#include <Utils.h>
+#include <Utils/Base64.h>
+#include <Utils/Timer.h>
+#include <Utils/ScopeGuard.h>
+#include <Utils/IOUtils.h>
+#include <Utils/MessageIO.h>
+#include <Utils/VariantMap.h>
 
 using namespace std;
 using namespace boost;
@@ -107,9 +107,10 @@ private:
 			int status, e;
 			
 			while (!this_thread::interruption_requested()) {
-				lock.lock();
-				pid = this->pid;
-				lock.unlock();
+				{
+					lock_guard<boost::mutex> l(lock);
+					pid = this->pid;
+				}
 				
 				// Process can be started before the watcher thread is launched.
 				if (pid == 0) {
@@ -132,9 +133,10 @@ private:
 					e = errno;
 				}
 				
-				lock.lock();
-				this->pid = 0;
-				lock.unlock();
+				{
+					lock_guard<boost::mutex> l(lock);
+					this->pid = 0;
+				}
 				
 				this_thread::disable_interruption di;
 				this_thread::disable_syscall_interruption dsi;
@@ -287,12 +289,12 @@ public:
 	}
 	
 	/**
-	 * Send the started agent process's startup information over the given channel,
-	 * to the starter process. May throw arbitrary exceptions.
+	 * Send the started agent process's startup information over the given
+	 * file descriptor, to the starter process. May throw arbitrary exceptions.
 	 *
 	 * @pre start() has been called and succeeded.
 	 */
-	virtual void sendStartupInfo(MessageChannel &channel) = 0;
+	virtual void sendStartupInfo(int fd) = 0;
 	
 	/** Returns the name of the agent that this class is watching. */
 	virtual const char *name() const = 0;
@@ -332,7 +334,8 @@ public:
 				/* Something went wrong, report error through feedback fd. */
 				e = errno;
 				try {
-					MessageChannel(fds[1]).write("system error before exec",
+					writeArrayMessage(fds[1],
+						"system error before exec",
 						"dup2() failed",
 						toString(e).c_str(),
 						NULL);
@@ -362,8 +365,10 @@ public:
 			}
 			e = errno;
 			try {
-				MessageChannel(FEEDBACK_FD).write("exec error",
-					toString(e).c_str(), NULL);
+				writeArrayMessage(FEEDBACK_FD,
+					"exec error",
+					toString(e).c_str(),
+					NULL);
 			} catch (...) {
 				fprintf(stderr, "Passenger Watchdog: could not execute %s: %s (%d)\n",
 					exeFilename.c_str(), strerror(e), e);
@@ -400,7 +405,7 @@ public:
 			
 			// Now read its feedback.
 			try {
-				ret = MessageChannel(feedbackFd).read(args);
+				ret = readArrayMessage(feedbackFd, args);
 			} catch (const SystemException &e) {
 				if (e.code() == ECONNRESET) {
 					ret = false;
@@ -612,8 +617,9 @@ public:
 		messageSocketPassword = randomGenerator->generateByteString(MESSAGE_SERVER_MAX_PASSWORD_SIZE);
 	}
 	
-	virtual void sendStartupInfo(MessageChannel &channel) {
-		channel.write("HelperAgent info",
+	virtual void sendStartupInfo(int fd) {
+		writeArrayMessage(fd,
+			"HelperAgent info",
 			requestSocketFilename.c_str(),
 			Base64::encode(requestSocketPassword).c_str(),
 			messageSocketFilename.c_str(),
@@ -660,8 +666,9 @@ public:
 		agentFilename = resourceLocator.getAgentsDir() + "/PassengerLoggingAgent";
 	}
 	
-	virtual void sendStartupInfo(MessageChannel &channel) {
-		channel.write("LoggingServer info",
+	virtual void sendStartupInfo(int fd) {
+		writeArrayMessage(fd,
+			"LoggingServer info",
 			loggingAgentAddress.c_str(),
 			loggingAgentPassword.c_str(),
 			NULL);
@@ -980,7 +987,6 @@ main(int argc, char *argv[]) {
 		randomGenerator = new RandomGenerator();
 		errorEvent = new EventFd();
 		
-		MessageChannel feedbackChannel(FEEDBACK_FD);
 		serverInstanceDir.reset(new ServerInstanceDir(webServerPid, tempDir));
 		generation = serverInstanceDir->newGeneration(userSwitching, defaultUser,
 			defaultGroup, webServerWorkerUid, webServerWorkerGid);
@@ -1012,8 +1018,10 @@ main(int argc, char *argv[]) {
 			try {
 				(*it)->start();
 			} catch (const std::exception &e) {
-				feedbackChannel.write("Watchdog startup error",
-					e.what(), NULL);
+				writeArrayMessage(FEEDBACK_FD,
+					"Watchdog startup error",
+					e.what(),
+					NULL);
 				forceAllAgentsShutdown(watchers);
 				return 1;
 			}
@@ -1023,24 +1031,27 @@ main(int argc, char *argv[]) {
 			try {
 				(*it)->startWatching();
 			} catch (const std::exception &e) {
-				feedbackChannel.write("Watchdog startup error",
-					e.what(), NULL);
+				writeArrayMessage(FEEDBACK_FD,
+					"Watchdog startup error",
+					e.what(),
+					NULL);
 				forceAllAgentsShutdown(watchers);
 				return 1;
 			}
 			// Allow other exceptions to propagate and crash the watchdog.
 		}
 		
-		feedbackChannel.write("Basic startup info",
+		writeArrayMessage(FEEDBACK_FD,
+			"Basic startup info",
 			serverInstanceDir->getPath().c_str(),
 			toString(generation->getNumber()).c_str(),
 			NULL);
 		
 		for (it = watchers.begin(); it != watchers.end(); it++) {
-			(*it)->sendStartupInfo(feedbackChannel);
+			(*it)->sendStartupInfo(FEEDBACK_FD);
 		}
 		
-		feedbackChannel.write("All agents started", NULL);
+		writeArrayMessage(FEEDBACK_FD, "All agents started", NULL);
 		
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;

data/ext/libev/config.h

@@ -0,0 +1,122 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the `clock_gettime' function. */
+/* #undef HAVE_CLOCK_GETTIME */
+
+/* "use syscall interface for clock_gettime" */
+/* #undef HAVE_CLOCK_SYSCALL */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `epoll_ctl' function. */
+/* #undef HAVE_EPOLL_CTL */
+
+/* Define to 1 if you have the `eventfd' function. */
+/* #undef HAVE_EVENTFD */
+
+/* Define to 1 if you have the `inotify_init' function. */
+/* #undef HAVE_INOTIFY_INIT */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `kqueue' function. */
+#define HAVE_KQUEUE 1
+
+/* Define to 1 if you have the `m' library (-lm). */
+#define HAVE_LIBM 1
+
+/* Define to 1 if you have the `rt' library (-lrt). */
+/* #undef HAVE_LIBRT */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `nanosleep' function. */
+/* #undef HAVE_NANOSLEEP */
+
+/* Define to 1 if you have the `poll' function. */
+#define HAVE_POLL 1
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
+/* Define to 1 if you have the `port_create' function. */
+/* #undef HAVE_PORT_CREATE */
+
+/* Define to 1 if you have the <port.h> header file. */
+/* #undef HAVE_PORT_H */
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the `signalfd' function. */
+/* #undef HAVE_SIGNALFD */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+/* #undef HAVE_SYS_EPOLL_H */
+
+/* Define to 1 if you have the <sys/eventfd.h> header file. */
+/* #undef HAVE_SYS_EVENTFD_H */
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+#define HAVE_SYS_EVENT_H 1
+
+/* Define to 1 if you have the <sys/inotify.h> header file. */
+/* #undef HAVE_SYS_INOTIFY_H */
+
+/* Define to 1 if you have the <sys/queue.h> header file. */
+#define HAVE_SYS_QUEUE_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/signalfd.h> header file. */
+/* #undef HAVE_SYS_SIGNALFD_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Name of package */
+#define PACKAGE "libev"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "3.9"