passenger 5.3.4 → 6.0.1

data/src/cxx_supportlib/ProcessManagement/Spawn.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -33,13 +33,14 @@
 #include <boost/thread.hpp>
 #include <oxt/system_calls.hpp>
 #include <string>
+#include <algorithm>
 #include <cerrno>
 
 #include <ProcessManagement/Spawn.h>
 #include <ProcessManagement/Utils.h>
 #include <StaticString.h>
 #include <Exceptions.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 
 namespace Passenger {
 
@@ -68,14 +69,14 @@ runCommand(const char **command, SubprocessInfo &info, bool wait, bool killSubpr
 	int e, waitStatus;
 	pid_t waitRet;
 
-	info.pid = asyncFork();
+	info.pid = syscalls::fork();
 	if (info.pid == 0) {
 		resetSignalHandlersAndMask();
 		disableMallocDebugging();
 		if (afterFork) {
 			afterFork();
 		}
-		closeAllFileDescriptors(2, true);
+		closeAllFileDescriptors(2);
 		execvp(command[0], (char * const *) command);
 		if (onExecFail) {
 			onExecFail(command, errno);
@@ -110,7 +111,7 @@ runCommand(const char **command, SubprocessInfo &info, bool wait, bool killSubpr
 
 void
 runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
-	string &output, bool killSubprocessOnInterruption,
+	SubprocessOutput &output, size_t maxSize, bool killSubprocessOnInterruption,
 	const boost::function<void ()> &afterFork,
 	const boost::function<void (const char **command, int errcode)> &onExecFail)
 {
@@ -120,7 +121,7 @@ runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
 
 	p = createPipe(__FILE__, __LINE__);
 
-	info.pid = asyncFork();
+	info.pid = syscalls::fork();
 	if (info.pid == 0) {
 		dup2(p[1], 1);
 		close(p[0]);
@@ -130,7 +131,7 @@ runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
 		if (afterFork) {
 			afterFork();
 		}
-		closeAllFileDescriptors(2, true);
+		closeAllFileDescriptors(2);
 		execvp(command[0], (char * const *) command);
 		if (onExecFail) {
 			onExecFail(command, errno);
@@ -140,15 +141,17 @@ runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
 		e = errno;
 		throw SystemException("Cannot fork() a new process", e);
 	} else {
-		bool done = false;
+		size_t totalRead = 0;
 
+		output.eof = false;
 		p[1].close();
-		while (!done) {
+		while (totalRead < maxSize) {
 			char buf[1024 * 4];
 			ssize_t ret;
 
 			try {
-				ret = syscalls::read(p[0], buf, sizeof(buf));
+				ret = syscalls::read(p[0], buf,
+					std::min<size_t>(sizeof(buf), maxSize - totalRead));
 			} catch (const boost::thread_interrupted &) {
 				if (killSubprocessOnInterruption) {
 					boost::this_thread::disable_syscall_interruption dsi;
@@ -166,9 +169,13 @@ runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
 				}
 				throw SystemException(string("Cannot read output from the '") +
 					command[0] + "' command", e);
+			} else if (ret == 0) {
+				output.eof = true;
+				break;
+			} else {
+				totalRead += ret;
+				output.data.append(buf, ret);
 			}
-			done = ret == 0;
-			output.append(buf, ret);
 		}
 		p[0].close();
 

data/src/cxx_supportlib/ProcessManagement/Spawn.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -67,6 +67,24 @@ struct SubprocessInfo {
 		{ }
 };
 
+struct SubprocessOutput {
+	/**
+	 * The read subprocess output data.
+	 */
+	string data;
+
+	/**
+	 * Whether the entire file has been read. If false, then it
+	 * means there is more data than specified through the `maxSize`
+	 * parameter.
+	 */
+	bool eof;
+
+	SubprocessOutput()
+		: eof(false)
+		{ }
+};
+
 
 // See ProcessManagement/Utils.h for definition
 void printExecError(const char **command, int errcode);
@@ -132,6 +150,7 @@ void runCommand(const char **command, SubprocessInfo &info,
  *
  * @param command The argument array to pass to execvp(). Must be null-terminated.
  * @param info
+ * @param maxSize The maximum number of output bytes to read.
  * @param killSubprocessOnInterruption Whether to automatically kill the subprocess
  *   when this function is interrupted.
  * @param afterFork A function object to be called right after forking.
@@ -140,7 +159,7 @@ void runCommand(const char **command, SubprocessInfo &info,
  * @throws boost::thread_interrupted
  */
 void runCommandAndCaptureOutput(const char **command, SubprocessInfo &info,
-	string &output, bool killSubprocessOnInterruption = true,
+	SubprocessOutput &output, size_t maxSize, bool killSubprocessOnInterruption = true,
 	const boost::function<void ()> &afterFork = boost::function<void ()>(),
 	const boost::function<void (const char **command, int errcode)> &onExecFail = printExecError);
 

data/src/cxx_supportlib/ProcessManagement/Utils.h

@@ -58,6 +58,16 @@ using namespace std;
  * to grab a lock which was already locked. This means that on macOS
  * we pretty much can never use regular fork() at all in a multithreaded
  * environment.
+ *
+ * As of 2018 May 16 with macOS 10.13 High Sierra, it was confirmed that the
+ * use of asyncFork() can lead to the following messages to be printed
+ * if the child process allocates memory:
+ *
+ *   malloc: *** mach_vm_map(size=1048576) failed (error code=268435459)
+ *   malloc: *** error: can't allocate region securely
+ *   malloc: *** set a breakpoint in malloc_error_break to debug
+ *
+ * See https://github.com/phusion/passenger/issues/1193#issuecomment-389503928
  */
 pid_t asyncFork();
 

data/src/cxx_supportlib/RandomGenerator.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -35,7 +35,7 @@
 #include <LoggingKit/LoggingKit.h>
 #include <StaticString.h>
 #include <Exceptions.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 
 namespace Passenger {

data/src/cxx_supportlib/ResourceLocator.h

@@ -170,7 +170,7 @@ public:
 		return buildSystemDir;
 	}
 
-	string findSupportBinary(const string &name) {
+	string findSupportBinary(const string &name) const {
 		string path = getSupportBinariesDir() + "/" + name;
 		bool found;
 		try {

data/src/cxx_supportlib/{Crypto.cpp → SecurityKit/Crypto.cpp}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -24,12 +24,12 @@
  *  THE SOFTWARE.
  */
 
-#include <Crypto.h>
+#include <SecurityKit/Crypto.h>
 #include <modp_b64.h>
 #include <LoggingKit/LoggingKit.h>
 #include <string>
-#include <Utils/SystemTime.h>
-#include <Utils/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
 
 #if BOOST_OS_MACOS
 #else

data/src/cxx_supportlib/{Crypto.h → SecurityKit/Crypto.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,8 +23,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_CRYPTO_H_
-#define _PASSENGER_CRYPTO_H_
+#ifndef _PASSENGER_SECURITY_KIT_CRYPTO_H_
+#define _PASSENGER_SECURITY_KIT_CRYPTO_H_
 
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
@@ -152,4 +152,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_CRYPTO_H_ */
+#endif /* _PASSENGER_SECURITYKIT_CRYPTO_H_ */

data/src/cxx_supportlib/ServerKit/AcceptLoadBalancer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -44,7 +44,7 @@
 #include <Constants.h>
 #include <LoggingKit/LoggingKit.h>
 #include <Utils.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 
 namespace Passenger {
 namespace ServerKit {

data/src/cxx_supportlib/ServerKit/Channel.h

@@ -37,7 +37,7 @@
 #include <ServerKit/Hooks.h>
 #include <MemoryKit/mbuf.h>
 #include <LoggingKit/LoggingKit.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace ServerKit {

data/src/cxx_supportlib/ServerKit/ClientRef.h

@@ -80,9 +80,13 @@ public:
 
 	explicit
 	ClientRef(BOOST_RV_REF(ClientRef) ref)
-		: client(ref.client)
+		: client(ref.client),
+		  file(ref.file),
+		  line(ref.line)
 	{
 		ref.client = NULL;
+		ref.file = NULL;
+		ref.line = 0;
 	}
 
 	~ClientRef() {
@@ -96,7 +100,7 @@ public:
 	}
 
 	ClientRef &operator=(BOOST_COPY_ASSIGN_REF(ClientRef) ref) {
-		if (client == ref.client) {
+		if (this != &ref) {
 			Client *oldClient = client;
 			const char *oldFile = file;
 			unsigned int oldLine = line;
@@ -114,11 +118,17 @@ public:
 	}
 
 	ClientRef &operator=(BOOST_RV_REF(ClientRef) ref) {
-		Client *oldClient = client;
-		client = ref.client;
-		ref.client = NULL;
-		if (oldClient != NULL) {
-			getServer(oldClient)->_unrefClient(oldClient, file, line);
+		if (this != &ref) {
+			Client *oldClient = client;
+			client = ref.client;
+			file = ref.file;
+			line = ref.line;
+			ref.client = NULL;
+			ref.file = NULL;
+			ref.line = 0;
+			if (oldClient != NULL) {
+				getServer(oldClient)->_unrefClient(oldClient, file, line);
+			}
 		}
 		return *this;
 	}

data/src/cxx_supportlib/ServerKit/Context.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -36,7 +36,7 @@
 #include <SafeLibev.h>
 #include <Exceptions.h>
 #include <Utils.h>
-#include <Utils/JsonUtils.h>
+#include <JsonTools/JsonUtils.h>
 
 extern "C" {
 	struct uv_loop_s;

data/src/cxx_supportlib/ServerKit/FileBufferedChannel.h

@@ -46,7 +46,7 @@
 #include <ServerKit/Config.h>
 #include <ServerKit/Errors.h>
 #include <ServerKit/Channel.h>
-#include <Utils/JsonUtils.h>
+#include <JsonTools/JsonUtils.h>
 
 namespace Passenger {
 namespace ServerKit {

data/src/cxx_supportlib/ServerKit/HttpHeaderParser.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -38,8 +38,8 @@
 #include <DataStructures/LString.h>
 #include <DataStructures/HashedStaticString.h>
 #include <LoggingKit/LoggingKit.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/Hasher.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <Algorithms/Hasher.h>
 
 namespace Passenger {
 namespace ServerKit {

data/src/cxx_supportlib/ServerKit/HttpHeaderParserState.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -27,7 +27,7 @@
 #define _PASSENGER_SERVER_KIT_HTTP_HEADER_PARSER_STATE_H_
 
 #include <DataStructures/LString.h>
-#include <Utils/Hasher.h>
+#include <Algorithms/Hasher.h>
 
 namespace Passenger {
 namespace ServerKit {

data/src/cxx_supportlib/ServerKit/HttpRequestRef.h

@@ -80,9 +80,13 @@ public:
 
 	explicit
 	HttpRequestRef(BOOST_RV_REF(HttpRequestRef) ref)
-		: request(ref.request)
+		: request(ref.request),
+		  file(ref.file),
+		  line(ref.line)
 	{
 		ref.request = NULL;
+		ref.file = NULL;
+		ref.line = 0;
 	}
 
 	~HttpRequestRef() {
@@ -96,7 +100,7 @@ public:
 	}
 
 	HttpRequestRef &operator=(BOOST_COPY_ASSIGN_REF(HttpRequestRef) ref) {
-		if (request == ref.request) {
+		if (this != &ref) {
 			Request *oldRequest = request;
 			const char *oldFile = file;
 			unsigned int oldLine = line;
@@ -114,11 +118,17 @@ public:
 	}
 
 	HttpRequestRef &operator=(BOOST_RV_REF(HttpRequestRef) ref) {
-		Request *oldRequest = request;
-		request = ref.request;
-		ref.request = NULL;
-		if (oldRequest != NULL) {
-			getServer(oldRequest)->_unrefRequest(oldRequest, file, line);
+		if (this != &ref) {
+			Request *oldRequest = request;
+			request = ref.request;
+			file = ref.file;
+			line = ref.line;
+			ref.request = NULL;
+			ref.file = NULL;
+			ref.line = 0;
+			if (oldRequest != NULL) {
+				getServer(oldRequest)->_unrefRequest(oldRequest, file, line);
+			}
 		}
 		return *this;
 	}

data/src/cxx_supportlib/ServerKit/HttpServer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -44,11 +44,11 @@
 #include <ServerKit/HttpChunkedBodyParser.h>
 #include <Algorithms/MovingAverage.h>
 #include <Integrations/LibevJsonUtils.h>
-#include <Utils/SystemTime.h>
-#include <Utils/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Utils/HttpConstants.h>
-#include <Utils/Hasher.h>
-#include <Utils/SystemTime.h>
+#include <Algorithms/Hasher.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 namespace ServerKit {
@@ -329,10 +329,8 @@ private:
 			SKC_TRACE(client, 3, "Parsing " << buffer.size() <<
 				" bytes of HTTP header: \"" << cEscapeString(StaticString(
 					buffer.start, buffer.size())) << "\"");
-			{
-				ret = createRequestHeaderParser(this->getContext(), req).
-					feed(buffer);
-			}
+			ret = createRequestHeaderParser(this->getContext(), req).
+				feed(buffer);
 			if (req->httpState == Request::PARSING_HEADERS) {
 				// Not yet done parsing.
 				return Channel::Result(buffer.size(), false);
@@ -417,6 +415,9 @@ private:
 			assert(maxRemaining > 0);
 			remaining = std::min<boost::uint64_t>(buffer.size(), maxRemaining);
 			req->bodyAlreadyRead += remaining;
+			SKC_TRACE(client, 3, "Event comes with " << buffer.size() <<
+				" bytes of fixed-length HTTP request body: \"" << cEscapeString(StaticString(
+					buffer.start, buffer.size())) << "\"");
 			SKC_TRACE(client, 3, "Request body: " <<
 				req->bodyAlreadyRead << " of " <<
 				req->aux.bodyInfo.contentLength << " bytes already read");
@@ -474,6 +475,9 @@ private:
 				}
 			}
 
+			SKC_TRACE(client, 3, "Event comes with " << buffer.size() <<
+				" bytes of chunked HTTP request body: \"" << cEscapeString(StaticString(
+					buffer.start, buffer.size())) << "\"");
 			HttpChunkedEvent event(createChunkedBodyParser(req).feed(buffer));
 			req->bodyAlreadyRead += event.consumed;
 
@@ -512,7 +516,6 @@ private:
 				return Channel::Result(event.consumed, false);
 			case HttpChunkedEvent::ERROR:
 				assert(event.end);
-				P_ASSERT_EQ(event.consumed, 0);
 				client->input.stop();
 				req->wantKeepAlive = false;
 				req->bodyChannel.feedError(event.errcode);
@@ -553,6 +556,9 @@ private:
 				}
 			}
 
+			SKC_TRACE(client, 3, "Event comes with " << buffer.size() <<
+				" bytes of upgraded HTTP request body: \"" << cEscapeString(StaticString(
+					buffer.start, buffer.size())) << "\"");
 			req->bodyAlreadyRead += buffer.size();
 			req->bodyChannel.feed(buffer);
 			if (!req->ended()) {

data/src/cxx_supportlib/ServerKit/Server.h

@@ -54,7 +54,6 @@
 #include <pthread.h>
 #include <cstdio>
 #include <jsoncpp/json.h>
-#include <SmallVector.h>
 
 #include <LoggingKit/LoggingKit.h>
 #include <SafeLibev.h>
@@ -68,9 +67,9 @@
 #include <Algorithms/MovingAverage.h>
 #include <Utils.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 namespace ServerKit {

data/src/cxx_supportlib/{Utils → StrIntTools}/DateParsing.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,15 +23,15 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_UTILS_DATE_PARSING_H_
-#define _PASSENGER_UTILS_DATE_PARSING_H_
+#ifndef _PASSENGER_STRINTTOOLS_DATE_PARSING_H_
+#define _PASSENGER_STRINTTOOLS_DATE_PARSING_H_
 
 #include <algorithm>
 #include <time.h>
 #include <cassert>
 #include <cstring>
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 
@@ -404,4 +404,4 @@ parseImfFixdate_zone(const char **pos, const char *end, int &zone) {
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_UTILS_DATE_PARSING_H_ */
+#endif /* _PASSENGER_STRINTTOOLS_DATE_PARSING_H_ */

data/src/cxx_supportlib/{Utils → StrIntTools}/StrIntUtils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -33,8 +33,8 @@
 #include <utf8.h>
 #include <algorithm>
 #include <Exceptions.h>
-#include <Utils/SystemTime.h>
-#include <Utils/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/{Utils → StrIntTools}/StrIntUtilsNoStrictAliasing.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -27,7 +27,7 @@
 #include <boost/cstdint.hpp>
 #include <cstddef>
 #include <oxt/macros.hpp>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 
@@ -135,13 +135,13 @@ convertLowerCase(const unsigned char * restrict data,
 		i = imax * 8;
 		output = (unsigned char *) d;
 		switch (leftover) {
-		case 7: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 6: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 5: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 4: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]];
+		case 7: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 6: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 5: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 4: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]]; /* Falls through. */
 		case 0: break;
 		}
 	#elif defined(__x86__)
@@ -167,9 +167,9 @@ convertLowerCase(const unsigned char * restrict data,
 		i = imax * 4;
 		output = (unsigned char *) d;
 		switch (leftover) {
-		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]];
-		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]];
+		case 3: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 2: *output++ = (unsigned char) gsToLowerMap[ustr[i++]]; /* Falls through. */
+		case 1: *output++ = (unsigned char) gsToLowerMap[ustr[i]]; /* Falls through. */
 		case 0: break;
 		}
 	#else

data/src/cxx_supportlib/{Utils → StrIntTools}/StringScanning.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013-2017 Phusion Holding B.V.
+ *  Copyright (c) 2013-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -23,14 +23,14 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_STRING_SCANNING_H_
-#define _PASSENGER_STRING_SCANNING_H_
+#ifndef _PASSENGER_STR_INT_TOOLS_STRING_SCANNING_H_
+#define _PASSENGER_STR_INT_TOOLS_STRING_SCANNING_H_
 
 #include <cstring>
 #include <cstdlib>
 #include <string>
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 
 /**
@@ -269,4 +269,4 @@ readNextSentence(const char **data, char terminator) {
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_STRING_SCANNING_H_ */
+#endif /* _PASSENGER_STR_INT_TOOLS_TEMPLATE_H_ */