passenger 5.3.5 → 5.3.6

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/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/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

@@ -68,9 +68,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 {
 

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_ */

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

@@ -1,12 +1,37 @@
-#ifndef _PASSENGER_TEMPLATE_H_
-#define _PASSENGER_TEMPLATE_H_
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2013-2018 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  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_STR_INT_TOOLS_TEMPLATE_H_
+#define _PASSENGER_STR_INT_TOOLS_TEMPLATE_H_
 
 #include <string>
 #include <cstring>
 #include <cstdio>
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/StringMap.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <DataStructures/StringMap.h>
 
 namespace Passenger {
 
@@ -209,4 +234,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_TEMPLATE_H_ */
+#endif /* _PASSENGER_STR_INT_TOOLS_TEMPLATE_H_ */

data/src/cxx_supportlib/SystemTools/ContainerHelpers.h

@@ -0,0 +1,34 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2018 Phusion Holding B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Phusion Holding B.V.
+ *
+ *  See LICENSE file for license information.
+ */
+#ifndef _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_
+#define _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_
+
+#include <boost/predef.h>
+#include <FileTools/FileManip.h>
+
+namespace Passenger {
+
+using namespace std;
+
+
+inline bool
+autoDetectInContainer() {
+	#if BOOST_OS_LINUX
+		// https://github.com/moby/moby/issues/26102#issuecomment-253621560
+		return fileExists("/.dockerenv");
+	#else
+		return false;
+	#endif
+}
+
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_SYSTEM_TOOLS_CONTAINER_HELPERS_H_ */

data/src/cxx_supportlib/{Utils → SystemTools}/ProcessMetricsCollector.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_PROCESS_METRICS_COLLECTOR_H_
-#define _PASSENGER_PROCESS_METRICS_COLLECTOR_H_
+#ifndef _PASSENGER_SYSTEM_TOOLS_PROCESS_METRICS_COLLECTOR_H_
+#define _PASSENGER_SYSTEM_TOOLS_PROCESS_METRICS_COLLECTOR_H_
 
 #include <boost/cstdint.hpp>
 #include <boost/thread.hpp>
@@ -63,8 +63,8 @@
 #include <ProcessManagement/Spawn.h>
 #include <FileTools/FileManip.h>
 #include <Utils/ScopeGuard.h>
-#include <Utils/IOUtils.h>
-#include <Utils/StringScanning.h>
+#include <IOTools/IOUtils.h>
+#include <StrIntTools/StringScanning.h>
 
 namespace Passenger {
 
@@ -505,4 +505,4 @@ public:
 
 } // namespace Passenger
 
-#endif /* _PASSENGER_PROCESS_METRICS_COLLECTOR_H_ */
+#endif /* _PASSENGER_SYSTEM_TOOLS_PROCESS_METRICS_COLLECTOR_H_ */

data/src/cxx_supportlib/{Utils → SystemTools}/SystemMetricsCollector.h

@@ -46,7 +46,7 @@
 	#include <sys/sysinfo.h>
 	#include <Exceptions.h>
 	#include <FileTools/FileManip.h>
-	#include <Utils/StringScanning.h>
+	#include <StrIntTools/StringScanning.h>
 #endif
 #ifdef __APPLE__
 	#include <mach/mach.h>
@@ -65,8 +65,8 @@
 #include <Constants.h>
 #include <StaticString.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/SystemTime.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <SystemTools/SystemTime.h>
 #include <Utils/AnsiColorConstants.h>
 #include <Utils/SpeedMeter.h>
 

data/src/cxx_supportlib/{Utils → SystemTools}/SystemTime.cpp

@@ -24,7 +24,7 @@
  *  THE SOFTWARE.
  */
 
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 	namespace SystemTimeData {

data/src/cxx_supportlib/SystemTools/UserDatabase.h

@@ -50,7 +50,7 @@
 #include <boost/core/noncopyable.hpp>
 
 #include <StaticString.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 
 namespace Passenger {

data/src/cxx_supportlib/Utils.cpp

@@ -57,8 +57,8 @@
 #include <ProcessManagement/Spawn.h>
 #include <ProcessManagement/Utils.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/IOUtils.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/IOUtils.h>
 
 #ifndef HOST_NAME_MAX
 	#if defined(_POSIX_HOST_NAME_MAX)

data/src/cxx_supportlib/Utils/CachedFileStat.hpp

@@ -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.
@@ -39,8 +39,8 @@
 #include <oxt/system_calls.hpp>
 
 #include <StaticString.h>
-#include <Utils/SystemTime.h>
-#include <Utils/StringMap.h>
+#include <SystemTools/SystemTime.h>
+#include <DataStructures/StringMap.h>
 
 namespace Passenger {