passenger 6.0.26 → 6.1.0

data/src/cxx_supportlib/IOTools/IOUtils.h

@@ -35,7 +35,6 @@
 #include <netdb.h>
 #include <string>
 #include <utility>
-#include <vector>
 #include <oxt/macros.hpp>
 #include <StaticString.h>
 #include <FileDescriptor.h>
@@ -44,16 +43,15 @@ namespace Passenger {
 
 using namespace std;
 
+
+/****** Server address types support ******/
+
 enum ServerAddressType {
 	SAT_UNIX,
 	SAT_TCP,
 	SAT_UNKNOWN
 };
 
-typedef ssize_t (*WritevFunction)(int fildes, const struct iovec *iov, int iovcnt);
-
-bool purgeStdio(FILE *f);
-
 /**
  * Accepts a server address in one of the following formats, and returns which one it is:
  *
@@ -96,47 +94,8 @@ void parseTcpSocketAddress(const StaticString & restrict_ref address,
  */
 bool isLocalSocketAddress(const StaticString &address);
 
-/**
- * Sets a socket in blocking mode.
- *
- * @throws SystemException Something went wrong.
- * @ingroup Support
- */
-void setBlocking(int fd);
 
-/**
- * Sets a socket in non-blocking mode.
- *
- * @throws SystemException Something went wrong.
- * @ingroup Support
- */
-void setNonBlocking(int fd);
-
-/**
- * Try to call the Linux accept4() system call. If the system call is
- * not available, then -1 is returned and errno is set to ENOSYS.
- */
-int callAccept4(int sock,
-	struct sockaddr * restrict addr,
-	socklen_t * restrict addr_len,
-	int options);
-
-/**
- * Resolves the given host name and returns a list of IP addresses.
- * `hostname` may also be an IP address, in which case it is
- * returned. You may explicitly specify a `port` as a hint to
- * the DNS resolver; set to 0 if you don't care or can't provide a
- * port number.
- *
- * If `shuffle` is set, and the host name resolves to multiple
- * IP addresses, then these addresses will be shuffled before they are
- * returned in order to improve load balancing.
- *
- * @throws IOException DNS resolution failure.
- */
-vector<string> resolveHostname(const string &hostname,
-	unsigned int port = 0,
-	bool shuffle = true);
+/****** Server socket creation ******/
 
 /**
  * Create a new Unix or TCP server socket, depending on the address type.
@@ -157,7 +116,7 @@ vector<string> resolveHostname(const string &hostname,
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-int createServer(const StaticString &address,
+ int createServer(const StaticString &address,
 	unsigned int backlogSize = 0,
 	bool autoDelete = true,
 	const char *file = __FILE__,
@@ -209,6 +168,9 @@ int createTcpServer(const char *address = "0.0.0.0",
 	const char *file = __FILE__,
 	unsigned int line = __LINE__);
 
+
+/****** Socket connection establishment (blocking) ******/
+
 /**
  * Connect to a server at the given address in a blocking manner.
  *
@@ -224,7 +186,7 @@ int createTcpServer(const char *address = "0.0.0.0",
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-int connectToServer(const StaticString &address, const char *file,
+ int connectToServer(const StaticString &address, const char *file,
 	unsigned int line);
 
 /**
@@ -260,130 +222,120 @@ int connectToUnixServer(const StaticString &filename, const char *file,
 int connectToTcpServer(const StaticString &hostname, unsigned int port,
 	const char *file, unsigned int line);
 
-/** State structure for non-blocking connectToUnixServer(). */
-struct NUnix_State {
-	FileDescriptor fd;
-	string filename;
-};
+
+/****** Socket connection establishment (non-blocking) ******/
 
 /**
- * Setup a Unix domain socket for non-blocking connecting. When done,
- * the file descriptor can be accessed through <tt>state.fd</tt>.
+ * Establish a socket connection in non-blocking mode.
  *
- * @param state A state structure.
- * @param filename The filename of the socket to connect to.
+ * @param address An address as accepted by getSocketAddressType().
  * @param file The name of the source file that called this function,
  *             for file descriptor logging purposes.
  * @param line The line in the source file that called this function.
+ * @return The file descriptor of the connected client socket, plus whether
+ *   it was immediately connected (true) or pending (false). If pending,
+ *   the caller should poll() on the socket until it's writable.
+ * @throws ArgumentException Something went wrong.
+ * @throws IOException Something went wrong.
  * @throws SystemException Something went wrong.
  * @throws boost::thread_interrupted A system call has been interrupted.
- * @ingroup Support
  */
-void setupNonBlockingUnixSocket(NUnix_State & restrict_ref state,
-	const StaticString & restrict_ref filename, const char *file,
-	unsigned int line);
+std::pair<int, bool> createNonBlockingSocketConnection(const StaticString &address, const char *file, unsigned int line);
 
 /**
- * Connect a Unix domain socket in non-blocking mode.
+ * Establish a Unix domain socket connection in non-blocking mode.
  *
- * @param state A state structure.
- * @return True if the socket was successfully connected, false if the socket isn't
- *         ready yet, in which case the caller should select() on the socket until it's writable.
- * @throws RuntimeException Something went wrong.
+ * @param filename The filename of the socket to connect to.
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
+ * @return The file descriptor of the connected client socket, plus whether
+ *   it was immediately connected (true) or pending (false). If pending,
+ *   the caller should poll() on the socket until it's writable.
+ * @throws ArgumentException Something went wrong.
  * @throws SystemException Something went wrong while connecting to the Unix server.
  * @throws boost::thread_interrupted A system call has been interrupted.
- * @ingroup Support
  */
-bool connectToUnixServer(NUnix_State &state);
-
-/** State structure for non-blocking connectToTcpServer(). */
-struct NTCP_State {
-	FileDescriptor fd;
-	struct addrinfo hints, *res;
-	string hostname;
-	int port;
-
-	NTCP_State() {
-		memset(&hints, 0, sizeof(hints));
-		res = NULL;
-		port = 0;
-	}
-
-	~NTCP_State() {
-		if (res != NULL) {
-			freeaddrinfo(res);
-		}
-	}
-};
+std::pair<int, bool> createNonBlockingUnixSocketConnection(const StaticString &filename, const char *file, unsigned int line);
 
 /**
- * Setup a TCP socket for non-blocking connecting. When done,
- * the file descriptor can be accessed through <tt>state.fd</tt>.
+ * Establish a TCP socket connection in non-blocking mode.
  *
- * @param state A state structure.
  * @param hostname The host name of the TCP server.
  * @param port The port number of the TCP server.
  * @param file The name of the source file that called this function,
  *             for file descriptor logging purposes.
  * @param line The line in the source file that called this function.
+ * @return The file descriptor of the connected client socket, plus whether
+ *   it was immediately connected (true) or pending (false). If pending,
+ *   the caller should poll() on the socket until it's writable.
  * @throws IOException Something went wrong.
  * @throws SystemException Something went wrong.
  * @throws boost::thread_interrupted A system call has been interrupted.
- * @ingroup Support
  */
-void setupNonBlockingTcpSocket(NTCP_State & restrict_ref state,
-	const StaticString & restrict_ref hostname,
-	int port, const char *file, unsigned int line);
+std::pair<int, bool> createNonBlockingTcpSocketConnection(const StaticString &hostname, unsigned int port, const char *file, unsigned int line);
 
-/**
- * Connect a TCP socket in non-blocking mode.
- *
- * @param state A state structure.
- * @return True if the socket was successfully connected, false if the socket isn't
- *         ready yet, in which case the caller should select() on the socket until it's writable.
- * @throws SystemException Something went wrong while connecting to the server.
- * @throws boost::thread_interrupted A system call has been interrupted.
- * @ingroup Support
- */
-bool connectToTcpServer(NTCP_State &state);
 
-struct NConnect_State {
-	ServerAddressType type;
-	NUnix_State s_unix;
-	NTCP_State s_tcp;
+/****** Scope guards ******/
+
+/** RAII construct for ensuring that a file descriptor gets closed at scope exit. */
+class FdGuard {
+private:
+	int mFd = -1;
+
+public:
+	FdGuard() { }
+	FdGuard(const FdGuard &other) = delete;
+	FdGuard(FdGuard &&other);
+	FdGuard(int fd, const char *sourceFile, unsigned int sourceLine);
+	/** @throws SystemException File descriptor close error. If exception is already being thrown, then only warns. */
+	~FdGuard() noexcept(false);
+
+	FdGuard &operator=(const FdGuard &other) = delete;
+	FdGuard &operator=(FdGuard &&other);
+
+	/** Don't close file descriptor at object destruction. */
+	void clear() noexcept;
+
+	/**
+	 * Close file descriptor now. Idempotent.
+	 *
+	 * @throws SystemException
+	 */
+	void runNow() noexcept(false);
 };
 
+
+/****** Other ******/
+
+typedef ssize_t (*WritevFunction)(int fildes, const struct iovec *iov, int iovcnt);
+
+bool purgeStdio(FILE *f);
+
 /**
- * Setup a socket for non-blocking connecting to the given address.
+ * Sets a socket in blocking mode.
  *
- * @param A state structure.
- * @param address An address as accepted by getSocketAddressType().
- * @param file The name of the source file that called this function,
- *             for file descriptor logging purposes.
- * @param line The line in the source file that called this function.
- * @throws ArgumentException Unknown address type.
- * @throws RuntimeException Something went wrong.
  * @throws SystemException Something went wrong.
- * @throws IOException Something went wrong.
- * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-void setupNonBlockingSocket(NConnect_State & restrict_ref state,
-	const StaticString & restrict_ref address, const char *file,
-	unsigned int line);
+void setBlocking(int fd);
 
 /**
- * Connect a socket in non-blocking mode.
+ * Sets a socket in non-blocking mode.
  *
- * @param state A state structure.
- * @return True if the socket was successfully connected, false if the socket isn't
- *         ready yet, in which case the caller should select() on the socket until it's writable.
- * @throws RuntimeException Something went wrong.
  * @throws SystemException Something went wrong.
- * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-bool connectToServer(NConnect_State &state);
+void setNonBlocking(int fd);
+
+/**
+ * Try to call the Linux accept4() system call. If the system call is
+ * not available, then -1 is returned and errno is set to ENOSYS.
+ */
+int callAccept4(int sock,
+	struct sockaddr * restrict addr,
+	socklen_t * restrict addr_len,
+	int options);
 
 /**
  * Checks whether the given TCP server is connectable. Because this check
@@ -392,6 +344,7 @@ bool connectToServer(NConnect_State &state);
  * deducted from the `*timeout` value. A timeout of 100000 microseconds is
  * recommended for most use cases.
  *
+ * @throws ArgumentException Something went wrong.
  * @throws IOException Something went wrong.
  * @throws SystemException Something went wrong.
  * @throws boost::thread_interrupted A system call has been interrupted.
@@ -451,9 +404,11 @@ bool waitUntilReadable(int fd, unsigned long long *timeout);
 bool waitUntilWritable(int fd, unsigned long long *timeout);
 
 /**
- * Attempts to read exactly <tt>size</tt> bytes of data from the given file
- * descriptor, and put the result in <tt>buf</tt>. On non-blocking sockets
- * this function will block by poll()ing the socket.
+ * Attempts to read exactly `size` bytes of data, putting the result in `buf`.
+ * This is in contrast to read(), which may read less than `size` bytes even
+ * when EOF is not reached.
+ *
+ * On non-blocking sockets, this function blocks by poll()ing the socket.
  *
  * @param buf The buffer to place the read data in. This buffer must be at least
  *            <tt>size</tt> bytes long.

data/src/cxx_supportlib/ServerKit/AcceptLoadBalancer.h

@@ -43,6 +43,8 @@
 
 #include <Constants.h>
 #include <LoggingKit/LoggingKit.h>
+#include <ServerKit/Context.h>
+#include <ServerKit/Errors.h>
 #include <Utils.h>
 #include <IOTools/IOUtils.h>
 

data/src/cxx_supportlib/ServerKit/Config.h

@@ -26,12 +26,7 @@
 #ifndef _PASSENGER_SERVER_KIT_CONFIG_H_
 #define _PASSENGER_SERVER_KIT_CONFIG_H_
 
-// for std::swap()
-#if __cplusplus >= 201103L
-	#include <utility>
-#else
-	#include <algorithm>
-#endif
+#include <utility>
 #include <string>
 #include <boost/config.hpp>
 #include <boost/scoped_ptr.hpp>

data/src/cxx_supportlib/ServerKit/FileBufferedChannel.h

@@ -933,7 +933,7 @@ private:
 			if (req->result >= 0) {
 				FBC_DEBUG_FROM_CALLBACK(fcContext,
 					"Writer: creation of file " << fcContext->path <<
-					"canceled. Deleting file in the background");
+					" canceled. Deleting file in the background");
 				closeBufferFileInBackground(fcContext);
 				// Will take care of deleting fcContext
 				unlinkBufferFileInBackground(fcContext);

data/src/cxx_supportlib/ServerKit/HttpHeaderParser.h

@@ -133,14 +133,16 @@ private:
 			goto happy_path;
 		case HPE_OK:
 			rc = llhttp_execute(parser, data, len);
-		happy_path:
-			if (rc == HPE_OK) {
-				return len;
-            }
-			// deliberate fall through
-        default:
+			goto happy_path;
+		default:
 			return (llhttp_get_error_pos(parser) - data);
 		}
+
+		happy_path:
+		if (rc == HPE_OK) {
+			return len;
+		}
+		return (llhttp_get_error_pos(parser) - data);
 	}
 
 	static int _onURL(llhttp_t *parser, const char *data, size_t len) {

data/src/cxx_supportlib/StaticString.h

@@ -26,12 +26,7 @@
 #ifndef _PASSENGER_STATIC_STRING_H_
 #define _PASSENGER_STATIC_STRING_H_
 
-// for std::swap()
-#if __cplusplus >= 201103L
-	#include <utility>
-#else
-	#include <algorithm>
-#endif
+#include <utility>
 #include <boost/config.hpp>
 #include <oxt/macros.hpp>
 #include <sys/types.h>

data/src/cxx_supportlib/StrIntTools/StrIntUtils.h

@@ -45,8 +45,8 @@ using namespace std;
 
 
 /**
- * A RAII construct for memory buffers that are dynamically allocated with malloc().
- * Upon destruction of a DynamicBuffer, the memory buffer is freed.
+ * RAII construct for memory buffers that are dynamically allocated with malloc().
+ * Upon destruction, the memory buffer is freed. Does not guarantee null terminator.
  */
 struct DynamicBuffer {
 private:

data/src/cxx_supportlib/SystemTools/SystemMetricsCollector.h

@@ -31,14 +31,12 @@
 #include <boost/typeof/typeof.hpp>
 #include <ostream>
 #include <iomanip>
-#include <algorithm>
 #include <limits>
 #include <vector>
 #include <string>
 #include <cstdio>
 #include <cstdlib>
 #include <climits>
-#include <cmath>
 #include <ctime>
 #include <sys/types.h>
 #include <sys/utsname.h>

data/src/cxx_supportlib/Utils/Curl.h

@@ -47,12 +47,7 @@
  * don't do anything.
  */
 
-// for std::swap()
-#if __cplusplus >= 201103L
-	#include <utility>
-#else
-	#include <algorithm>
-#endif
+#include <utility>
 #include <string>
 #include <cstring>
 #include <curl/curl.h>

data/src/cxx_supportlib/Utils/FastStringStream.h

@@ -27,7 +27,6 @@
 #define _PASSENGER_FAST_STRING_STREAM_H_
 
 #include <ostream>
-#include <sstream>
 #include <string>
 #include <new>
 #include <cstdlib>
@@ -158,6 +157,12 @@ public:
 	}
 };
 
+#ifndef _PASSENGER_FAST_STRING_STREAM_FORWARD_DECLARED_
+	#define _PASSENGER_FAST_STRING_STREAM_FORWARD_DECLARED_
+	template<size_t staticCapacity = 1024>
+	class FastStringStream;
+#endif
+
 /**
  * An std::ostream-compatible output stream. It's similar to std::stringstream,
  * with a few optimizations:
@@ -169,12 +174,7 @@ public:
  *
  * This class is implemented using FastStdStringBuf.
  */
-#ifndef _PASSENGER_FAST_STRING_STREAM_FORWARD_DECLARED_
-	#define _PASSENGER_FAST_STRING_STREAM_FORWARD_DECLARED_
-	template<size_t staticCapacity = 1024>
-#else
-	template<size_t staticCapacity>
-#endif
+template<size_t staticCapacity>
 class FastStringStream: public FastStdStringBuf<staticCapacity>, public ostream {
 public:
 	FastStringStream(unsigned int initialCapacity = 0)

data/src/cxx_supportlib/Utils/IniFile.h

@@ -33,7 +33,6 @@
 #include <iostream>
 #include <cstdio>
 #include <cstring>
-#include <cassert>
 #include <cctype>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
@@ -68,7 +67,7 @@ public:
 			return string();
 		}
 	}
-	
+
 	string operator[](const string &keyName) const {
 		return get(keyName);
 	}
@@ -120,15 +119,15 @@ public:
 				"<T_TEXT>",
 				"<T_EOF>"
 			};
-			
+
 			return KIND_IDENTITY_TABLE[kind];
 		}
 
 		Token(const Kind kind, const string &value, const int line, const int column)
 			: kind(kind), value(value), line(line), column(column) {
-			
+
 		}
-		
+
 		class ExpectanceException : public std::exception {
 		private:
 			char message[255];
@@ -168,7 +167,7 @@ public:
 
 	typedef boost::shared_ptr<IniFileLexer::Token> TokenPtr;
 
-	
+
 
 protected:
 	ifstream iniFileStream;
@@ -184,7 +183,7 @@ protected:
 
 	void expect(char ch) {
 		int upcomingChar = iniFileStream.peek();
-	
+
 		if (ch != upcomingChar) {
 			switch(upcomingChar) {
 				case EOF:
@@ -202,11 +201,11 @@ protected:
 
 	void accept() {
 		if (upcomingChar == EOF) return;
-	
+
 		lastAcceptedChar = (char)iniFileStream.get();
 		upcomingChar     = iniFileStream.peek();
 		currentColumn++;
-	
+
 		if (lastAcceptedChar == '\n') {
 			currentLine++;
 			currentColumn = 1;
@@ -215,10 +214,10 @@ protected:
 
 	void ignore() {
 		if (upcomingChar == EOF) return;
-	
+
 		upcomingChar = iniFileStream.peek();
 		currentColumn++;
-	
+
 		if ((char)iniFileStream.get() == '\n') {
 			currentLine++;
 			currentColumn = 1;
@@ -246,12 +245,12 @@ protected:
 		int line   = currentLine;
 		int column = currentColumn;
 		string result;
-	
+
 		while (isalnum(upcomingChar) || upcomingChar == '_' || upcomingChar == '-') {
 			result.append(1, upcomingChar);
 			accept();
 		}
-			
+
 		return Token(Token::IDENTIFIER, result, line, column);
 	}
 
@@ -266,13 +265,13 @@ protected:
 		int line   = currentLine;
 		int column = currentColumn;
 		string result;
-	
+
 		//while (upcomingChar != ']' && upcomingChar != '[' && upcomingChar != '\n' && upcomingChar != EOF) {
 		while (isalnum(upcomingChar) || upcomingChar == '_' || upcomingChar == '-') {
 			result.append(1, upcomingChar);
 			accept();
 		}
-	
+
 		return Token(Token::SECTION_NAME, result, line, column);
 	}
 
@@ -285,12 +284,12 @@ protected:
 		int line   = currentLine;
 		int column = currentColumn;
 		string result;
-	
+
 		while (upcomingChar != '\n' && upcomingChar != EOF) {
 			result.append(1, upcomingChar);
 			accept();
 		}
-	
+
 		return Token(Token::TEXT, result, line, column);
 	}
 
@@ -306,12 +305,12 @@ protected:
 		int line   = currentLine;
 		int column = currentColumn;
 		string result;
-	
+
 		while (upcomingChar != EOF) {
 			result.append(1, upcomingChar);
 			accept();
 		}
-	
+
 		return Token(Token::UNKNOWN, result, line, column);
 	}
 
@@ -346,7 +345,7 @@ public:
 			upcomingTokenPtr = boost::make_shared<Token>(upcomingToken);
 			upcomingTokenPtrIsStale = false;
 		}
-	
+
 		return upcomingTokenPtr;
 	}
 
@@ -355,7 +354,7 @@ public:
 			upcomingTokenPtrIsStale = true;
 			return *upcomingTokenPtr;
 		}
-	
+
 		while (iniFileStream.good()) {
 			upcomingChar = iniFileStream.peek();
 			switch(upcomingChar) {
@@ -392,7 +391,7 @@ public:
 					}
 			}
 		}
-	
+
 		return Token(Token::END_OF_FILE, "<END_OF_FILE>", currentLine, currentColumn);
 	}
 };
@@ -405,7 +404,7 @@ protected:
 	typedef map<string, IniFileSectionPtr> SectionMap;
 	string name;
 	SectionMap sections;
-	
+
 	class IniFileParser {
 	typedef IniFileLexer::Token Token;
 
@@ -414,7 +413,7 @@ protected:
 		IniFile *iniFile;
 
 		// The Start Symbol.
-		void parseSections() {		
+		void parseSections() {
 			while ((lexer.peekToken())->kind == Token::SECTION_NAME) {
 				parseSection();
 			}
@@ -476,7 +475,7 @@ protected:
 			parseSections();
 		}
 	};
-	
+
 public:
 	IniFile(const string &iniFileName)
 		: name(iniFileName)