passenger 5.3.4 → 6.0.1

data/src/cxx_supportlib/{Utils → DataStructures}/StringMap.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-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_STRING_MAP_H_
-#define _PASSENGER_STRING_MAP_H_
+#ifndef _PASSENGER_DATA_STRUCTURES_STRING_MAP_H_
+#define _PASSENGER_DATA_STRUCTURES_STRING_MAP_H_
 
 #include <string>
 #include <map>
 #include <utility>
 
 #include <StaticString.h>
-#include <Utils/HashMap.h>
+#include <DataStructures/HashMap.h>
 
 namespace Passenger {
 
@@ -54,106 +54,106 @@ private:
 		string key;
 		pair<StaticString, T> thePair;
 	};
-	
+
 	typedef HashMap<StaticString, Entry, StaticString::Hash> InternalMap;
 	typedef typename InternalMap::iterator InternalIterator;
 	typedef typename InternalMap::const_iterator InternalConstIterator;
 	typedef typename InternalMap::value_type ValueType;
 	InternalMap store;
-	
+
 public:
 	class const_iterator {
 	private:
 		InternalConstIterator it;
-		
+
 	public:
 		const_iterator() { }
-		
+
 		const_iterator(const InternalConstIterator &_it)
 			: it(_it)
 			{ }
-		
+
 		const_iterator &operator=(const const_iterator &value) {
 			it = value.it;
 			return *this;
 		}
-		
+
 		const_iterator &operator++() {
 			it++;
 			return *this;
 		}
-		
+
 		const_iterator operator++(int) {
 			const_iterator copy(*this);
 			operator++();
 			return copy;
 		}
-		
+
 		bool operator==(const const_iterator &other) {
 			return it == other.it;
 		}
-		
+
 		bool operator!=(const const_iterator &other) {
 			return it != other.it;
 		}
-		
+
 		const pair<const StaticString, const T> &operator*() {
 			return (pair<const StaticString, const T> &) it->second.thePair;
 		}
-		
+
 		const pair<const StaticString, const T> *operator->() {
 			return &(**this);
 		}
 	};
-	
+
 	class iterator {
 	private:
 		InternalIterator it;
-		
+
 	public:
 		iterator() { }
-		
+
 		iterator(const InternalIterator &_it)
 			: it(_it)
 			{ }
-		
+
 		iterator &operator=(const iterator &value) {
 			it = value.it;
 			return *this;
 		}
-		
+
 		iterator &operator++() {
 			it++;
 			return *this;
 		}
-		
+
 		iterator operator++(int) {
 			iterator copy(*this);
 			operator++();
 			return copy;
 		}
-		
+
 		bool operator==(const iterator &other) {
 			return it == other.it;
 		}
-		
+
 		bool operator!=(const iterator &other) {
 			return it != other.it;
 		}
-		
+
 		pair<StaticString, T> &operator*() {
 			return it->second.thePair;
 		}
-		
+
 		pair<StaticString, T> *operator->() {
 			return &(**this);
 		}
-		
+
 		operator const_iterator() const {
 			return const_iterator(it);
 		}
 	};
-	
+
 	T get(const StaticString &key) const {
 		InternalConstIterator it = store.find(key);
 		if (it == store.end()) {
@@ -175,7 +175,7 @@ public:
 	bool has(const StaticString &key) const {
 		return store.find(key) != store.end();
 	}
-	
+
 	bool set(const StaticString &key, const T &value) {
 		pair<InternalIterator, bool> result = store.insert(make_pair(key, Entry()));
 		if (result.second) {
@@ -196,31 +196,31 @@ public:
 			return false;
 		}
 	}
-	
+
 	bool remove(const StaticString &key) {
 		return store.erase(key) > 0;
 	}
-	
+
 	unsigned int size() const {
 		return store.size();
 	}
-	
+
 	bool empty() const {
 		return store.empty();
 	}
-	
+
 	iterator begin() {
 		return iterator(store.begin());
 	}
-	
+
 	const_iterator begin() const {
 		return const_iterator(store.begin());
 	}
-	
+
 	iterator end() {
 		return iterator(store.end());
 	}
-	
+
 	const_iterator end() const {
 		return const_iterator(store.end());
 	}
@@ -229,4 +229,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_STRING_MAP_H_ */
+#endif /* _PASSENGER_DATA_STRUCTURES_STRING_MAP_H_ */

data/src/cxx_supportlib/FileTools/FileManip.cpp

@@ -44,7 +44,7 @@
 #include <ProcessManagement/Utils.h>
 #include <Utils.h> // parseModeString
 #include <Utils/CachedFileStat.hpp>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 #include <Utils/ScopeGuard.h>
 
 namespace Passenger {

data/src/cxx_supportlib/FileTools/PathManip.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.
@@ -36,7 +36,7 @@
 
 #include <FileTools/PathManip.h>
 #include <Exceptions.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/FileTools/PathSecurityCheck.cpp

@@ -33,7 +33,7 @@
 #include <FileTools/PathManip.h>
 #include <SystemTools/UserDatabase.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Hooks.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.
@@ -46,7 +46,7 @@
 #include <ProcessManagement/Spawn.h>
 #include <ProcessManagement/Utils.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/{Utils → IOTools}/BufferedIO.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_BUFFERED_IO_H_
-#define _PASSENGER_BUFFERED_IO_H_
+#ifndef _PASSENGER_IOTOOLS_BUFFERED_IO_H_
+#define _PASSENGER_IOTOOLS_BUFFERED_IO_H_
 
 #include <string>
 #include <utility>
@@ -38,7 +38,7 @@
 #include <FileDescriptor.h>
 #include <Exceptions.h>
 #include <StaticString.h>
-#include <Utils/IOUtils.h>
+#include <IOTools/IOUtils.h>
 
 namespace Passenger {
 
@@ -249,4 +249,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_BUFFERED_IO_H_ */
+#endif /* _PASSENGER_IOTOOLS_BUFFERED_IO_H_ */

data/src/cxx_supportlib/{Utils → IOTools}/IOUtils.cpp

@@ -68,8 +68,8 @@
 #include <Exceptions.h>
 #include <Constants.h>
 #include <Utils/Timer.h>
-#include <Utils/IOUtils.h>
-#include <Utils/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Utils/ScopeGuard.h>
 
 namespace Passenger {
@@ -1363,7 +1363,8 @@ readAll(int fd, size_t maxSize) {
 
 	while (result.size() < maxSize) {
 		do {
-			ret = read(fd, buf, sizeof(buf));
+			ret = read(fd, buf, std::min<size_t>(sizeof(buf),
+				maxSize - result.size()));
 		} while (ret == -1 && errno == EINTR);
 		if (ret == 0) {
 			eofReached = true;

data/src/cxx_supportlib/{Utils → IOTools}/IOUtils.h

@@ -23,8 +23,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_IO_UTILS_H_
-#define _PASSENGER_IO_UTILS_H_
+#ifndef _PASSENGER_IOTOOLS_IO_UTILS_H_
+#define _PASSENGER_IOTOOLS_IO_UTILS_H_
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -658,4 +658,4 @@ pair<string, bool> readAll(int fd, size_t maxSize);
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_IO_UTILS_H_ */
+#endif /* _PASSENGER_IOTOOLS_IO_UTILS_H_ */

data/src/cxx_supportlib/{Utils → IOTools}/MessageIO.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2017 Phusion Holding B.V.
+ *  Copyright (c) 2011-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_MESSAGE_IO_H_
-#define _PASSENGER_MESSAGE_IO_H_
+#ifndef _PASSENGER_IOTOOLS_MESSAGE_IO_H_
+#define _PASSENGER_IOTOOLS_MESSAGE_IO_H_
 
 /**
  * This file contains functions for reading and writing structured messages over
@@ -90,10 +90,10 @@
 
 #include <StaticString.h>
 #include <Exceptions.h>
-#include <Utils/MemZeroGuard.h>
+#include <SecurityKit/MemZeroGuard.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/IOUtils.h>
-#include <Utils/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 
 namespace Passenger {
@@ -664,4 +664,4 @@ writeFileDescriptorWithNegotiation(int fd, int fdToPass, unsigned long long *tim
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_MESSAGE_IO_H_ */
+#endif /* _PASSENGER_IOTOOLS_MESSAGE_IO_H_ */

data/src/cxx_supportlib/{MessageReadersWriters.h → IOTools/MessageSerialization.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_MESSAGE_READERS_WRITERS_H_
-#define _PASSENGER_MESSAGE_READERS_WRITERS_H_
+#ifndef _PASSENGER_IOTOOLS_MESSAGE_SERIALIZATION_H_
+#define _PASSENGER_IOTOOLS_MESSAGE_SERIALIZATION_H_
 
 #include <boost/cstdint.hpp>
 #include <oxt/macros.hpp>
@@ -36,7 +36,7 @@
 #include <arpa/inet.h>
 #include <StaticString.h>
 #include <Exceptions.h>
-#include <Utils/MemZeroGuard.h>
+#include <SecurityKit/MemZeroGuard.h>
 
 /**
  * This file provides a bunch of classes for reading and writing messages in the
@@ -544,4 +544,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_MESSAGE_READERS_WRITERS_H_ */
+#endif /* _PASSENGER_IOTOOLS_MESSAGE_SERIALIZATION_H_ */

data/src/cxx_supportlib/InstanceDirectory.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,9 +44,9 @@
 #include <RandomGenerator.h>
 #include <FileTools/FileManip.h>
 #include <Utils.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>
 #include <jsoncpp/json.h>
 
 namespace Passenger {

data/src/cxx_supportlib/Integrations/LibevJsonUtils.h

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

data/src/cxx_supportlib/{Utils → JsonTools}/JsonUtils.h

@@ -23,8 +23,8 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_UTILS_JSON_UTILS_H_
-#define _PASSENGER_UTILS_JSON_UTILS_H_
+#ifndef _PASSENGER_JSON_TOOLS_JSON_UTILS_H_
+#define _PASSENGER_JSON_TOOLS_JSON_UTILS_H_
 
 #include <string>
 #include <cstdio>
@@ -33,8 +33,8 @@
 #include <jsoncpp/json.h>
 #include <boost/cstdint.hpp>
 #include <StaticString.h>
-#include <Utils/SystemTime.h>
-#include <Utils/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
 #include <Utils/VariantMap.h>
 
 namespace Passenger {
@@ -467,4 +467,4 @@ byteSizeAndCountToJson(size_t size, unsigned int count) {
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_UTILS_JSON_UTILS_H_ */
+#endif /* _PASSENGER_JSON_TOOLS_JSON_UTILS_H_ */

data/src/cxx_supportlib/LoggingKit/Context.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017 Phusion Holding B.V.
+ *  Copyright (c) 2017-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -37,7 +37,7 @@
 #include <ConfigKit/ConfigKit.h>
 #include <LoggingKit/Forward.h>
 #include <LoggingKit/Config.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 #include <DataStructures/StringKeyTable.h>
 
 namespace Passenger {

data/src/cxx_supportlib/LoggingKit/Implementation.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.
@@ -56,8 +56,8 @@
 #include <ConfigKit/ConfigKit.h>
 #include <FileTools/PathManip.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 namespace LoggingKit {

data/src/cxx_supportlib/MemoryKit/mbuf.cpp

@@ -1,7 +1,7 @@
 /*
  * twemproxy - A fast and lightweight proxy for memcached protocol.
  * Copyright (C) 2011 Twitter, Inc.
- * Copyright (C) 2014-2017 Phusion Holding B.V.
+ * Copyright (C) 2014-2018 Phusion Holding B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 #include <MemoryKit/mbuf.h>
 #include <LoggingKit/LoggingKit.h>
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace MemoryKit {

data/src/cxx_supportlib/ProcessManagement/Ruby.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017 Phusion Holding B.V.
+ *  Copyright (c) 2017-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -42,7 +42,7 @@ using namespace std;
 void
 runInternalRubyTool(const ResourceLocator &resourceLocator,
 	const string &ruby, const vector<string> &args, int *status,
-	string *output)
+	SubprocessOutput *output, size_t maxOutputSize)
 {
 	string locationConfigFileEnv = "PASSENGER_LOCATION_CONFIGURATION_FILE="
 		+ resourceLocator.getInstallSpec();
@@ -95,7 +95,7 @@ runInternalRubyTool(const ResourceLocator &resourceLocator,
 	if (output == NULL) {
 		runCommand(command, info);
 	} else {
-		runCommandAndCaptureOutput(command, info, *output);
+		runCommandAndCaptureOutput(command, info, *output, maxOutputSize);
 	}
 	if (status != NULL) {
 		*status = info.status;

data/src/cxx_supportlib/ProcessManagement/Ruby.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.
@@ -28,6 +28,7 @@
 
 #include <string>
 #include <vector>
+#include <limits>
 #include <cstddef>
 
 namespace Passenger {
@@ -35,6 +36,7 @@ namespace Passenger {
 using namespace std;
 
 class ResourceLocator;
+struct SubprocessOutput;
 
 
 /**
@@ -48,12 +50,15 @@ class ResourceLocator;
  *               When unable to waitpid() the child process because of an ECHILD
  *               or ESRCH, this will be set to -1.
  * @param output The output of the child process will be stored here, if non-NULL.
+ * @param maxOutputSize The maximum number of output bytes to read. Only applicable if
+ *                      `output` is non-NULL.
  * @throws RuntimeException
  * @throws SystemException
  */
 void runInternalRubyTool(const ResourceLocator &resourceLocator,
 	const string &ruby, const vector<string> &args,
-	int *status = NULL, string *output = NULL);
+	int *status = NULL, SubprocessOutput *output = NULL,
+	size_t maxOutputSize = std::numeric_limits<size_t>::max());
 
 
 } // namespace Passenger