passenger 5.1.7 → 5.1.8

data/src/cxx_supportlib/ServerKit/Server.h

@@ -29,6 +29,8 @@
 #include <psg_sysqueue.h>
 
 #include <boost/cstdint.hpp>
+#include <boost/config.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <oxt/system_calls.hpp>
 #include <oxt/backtrace.hpp>
 #include <oxt/macros.hpp>
@@ -36,6 +38,12 @@
 #include <new>
 #include <ev++.h>
 
+// for std::swap()
+#if __cplusplus >= 201103L
+	#include <utility>
+#else
+	#include <algorithm>
+#endif
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <netinet/in.h>
@@ -48,7 +56,7 @@
 #include <jsoncpp/json.h>
 #include <SmallVector.h>
 
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 #include <SafeLibev.h>
 #include <Constants.h>
 #include <ServerKit/Context.h>
@@ -73,7 +81,7 @@ using namespace oxt;
 
 
 // We use 'this' so that the macros work in derived template classes like HttpServer<>.
-#define SKS_LOG(level, file, line, expr)  P_LOG(level, file, line, "[" << this->getServerName() << "] " << expr)
+#define SKS_LOG(level, file, line, expr)  P_LOG(Passenger::LoggingKit::context, level, file, line, "[" << this->getServerName() << "] " << expr)
 #define SKS_ERROR(expr)  P_ERROR("[" << this->getServerName() << "] " << expr)
 #define SKS_WARN(expr)   P_WARN("[" << this->getServerName() << "] " << expr)
 #define SKS_INFO(expr)   P_INFO("[" << this->getServerName() << "] " << expr)
@@ -97,26 +105,26 @@ using namespace oxt;
 
 #define SKC_LOG_FROM_STATIC(server, client, level, expr) \
 	do { \
-		if (Passenger::getLogLevel() >= level) { \
+		if (Passenger::LoggingKit::getLevel() >= level) { \
 			char _clientName[16]; \
 			int _clientNameSize = server->getClientName((client), _clientName, sizeof(_clientName)); \
-			P_LOG(level, __FILE__, __LINE__, \
+			P_LOG(LoggingKit::context, level, __FILE__, __LINE__, \
 				"[Client " << StaticString(_clientName, _clientNameSize) << "] " << expr); \
 		} \
 	} while (0)
 #define SKC_ERROR_FROM_STATIC(server, client, expr) \
-	SKC_LOG_FROM_STATIC(server, client, LVL_ERROR, expr)
+	SKC_LOG_FROM_STATIC(server, client, Passenger::LoggingKit::ERROR, expr)
 #define SKC_WARN_FROM_STATIC(server, client, expr) \
-	SKC_LOG_FROM_STATIC(server, client, LVL_WARN, expr)
+	SKC_LOG_FROM_STATIC(server, client, Passenger::LoggingKit::WARN, expr)
 #define SKC_NOTICE_FROM_STATIC(server, client, expr) \
-	SKC_LOG_FROM_STATIC(server, client, LVL_NOTICE, expr)
+	SKC_LOG_FROM_STATIC(server, client, Passenger::LoggingKit::NOTICE, expr)
 #define SKC_INFO_FROM_STATIC(server, client, expr) \
-	SKC_LOG_FROM_STATIC(server, client, LVL_INFO, expr)
+	SKC_LOG_FROM_STATIC(server, client, Passenger::LoggingKit::INFO, expr)
 #define SKC_DEBUG_FROM_STATIC(server, client, expr) \
-	SKC_LOG_FROM_STATIC(server, client, LVL_DEBUG, expr)
+	SKC_LOG_FROM_STATIC(server, client, Passenger::LoggingKit::DEBUG, expr)
 #define SKC_DEBUG_FROM_STATIC_WITH_POS(server, client, file, line, expr) \
 	do { \
-		if (OXT_UNLIKELY(Passenger::getLogLevel() >= LVL_DEBUG)) { \
+		if (OXT_UNLIKELY(Passenger::LoggingKit::getLevel() >= Passenger::LoggingKit::DEBUG)) { \
 			char _clientName[16]; \
 			int _clientNameSize = server->getClientName((client), _clientName, sizeof(_clientName)); \
 			P_DEBUG_WITH_POS(file, line, \
@@ -127,7 +135,7 @@ using namespace oxt;
 	SKC_TRACE_FROM_STATIC_WITH_POS(server, client, level, __FILE__, __LINE__, expr)
 #define SKC_TRACE_FROM_STATIC_WITH_POS(server, client, level, file, line, expr) \
 	do { \
-		if (OXT_UNLIKELY(Passenger::getLogLevel() >= level)) { \
+		if (OXT_UNLIKELY(Passenger::LoggingKit::getLevel() >= Passenger::LoggingKit::INFO + level)) { \
 			char _clientName[16]; \
 			int _clientNameSize = server->getClientName((client), _clientName, sizeof(_clientName)); \
 			P_TRACE_WITH_POS(level, file, line, \
@@ -163,6 +171,41 @@ public:
 	}
 };
 
+struct BaseServerConfigRealization {
+	unsigned int acceptBurstCount: 7;
+	bool startReadingAfterAccept: 1;
+	unsigned int minSpareClients: 12;
+	unsigned int clientFreelistLimit: 12;
+
+	BaseServerConfigRealization(const ConfigKit::Store &config)
+		: acceptBurstCount(config["accept_burst_count"].asUInt()),
+		  startReadingAfterAccept(config["start_reading_after_accept"].asBool()),
+		  minSpareClients(config["min_spare_clients"].asUInt()),
+		  clientFreelistLimit(config["client_freelist_limit"].asUInt())
+		{ }
+
+	void swap(BaseServerConfigRealization &other) BOOST_NOEXCEPT_OR_NOTHROW {
+		#define SWAP_BITFIELD(Type, name) \
+			do { \
+				Type tmp = name; \
+				name = other.name; \
+				other.name = tmp; \
+			} while (false)
+
+		SWAP_BITFIELD(unsigned int, acceptBurstCount);
+		SWAP_BITFIELD(bool, startReadingAfterAccept);
+		SWAP_BITFIELD(unsigned int, minSpareClients);
+		SWAP_BITFIELD(unsigned int, clientFreelistLimit);
+
+		#undef SWAP_BITFIELD
+	}
+};
+
+struct BaseServerConfigChangeRequest {
+	boost::scoped_ptr<ConfigKit::Store> config;
+	boost::scoped_ptr<BaseServerConfigRealization> configRlz;
+};
+
 
 /**
  * A highly optimized generic base class for evented socket servers, implementing basic,
@@ -226,13 +269,11 @@ public:
 	static const unsigned int MAX_ACCEPT_BURST_COUNT = 127;
 
 	typedef void (*Callback)(DerivedServer *server);
+	typedef BaseServerConfigChangeRequest ConfigChangeRequest;
 
 	/***** Configuration *****/
 	ConfigKit::Store config;
-	unsigned int acceptBurstCount: 7;
-	bool startReadingAfterAccept: 1;
-	unsigned int minSpareClients: 12;
-	unsigned int clientFreelistLimit: 12;
+	BaseServerConfigRealization configRlz;
 	Callback shutdownFinishCallback;
 
 	/***** Working state and statistics (do not modify) *****/
@@ -273,7 +314,7 @@ private:
 		P_ASSERT_EQ(serverState, ACTIVE);
 		SKS_DEBUG("New clients can be accepted on a server socket");
 
-		for (unsigned int i = 0; i < acceptBurstCount; i++) {
+		for (unsigned int i = 0; i < configRlz.acceptBurstCount; i++) {
 			fd = acceptNonBlockingSocket(io->fd);
 			if (fd == -1) {
 				error = true;
@@ -441,7 +482,7 @@ private:
 	}
 
 	bool addClientToFreelist(Client *client) {
-		if (freeClientCount < clientFreelistLimit) {
+		if (freeClientCount < configRlz.clientFreelistLimit) {
 			STAILQ_INSERT_HEAD(&freeClients, client, nextClient.freeClient);
 			freeClientCount++;
 			client->refcount.store(2, boost::memory_order_relaxed);
@@ -482,7 +523,7 @@ private:
 
 	void finishShutdown() {
 		TRACE_POINT();
-		compact(LVL_INFO);
+		compact(LoggingKit::INFO);
 
 		acceptResumptionWatcher.stop();
 		statisticsUpdateWatcher.stop();
@@ -565,7 +606,7 @@ protected:
 
 			onClientAccepted(client);
 			if (client->connected()) {
-				if (startReadingAfterAccept) {
+				if (configRlz.startReadingAfterAccept) {
 					client->input.startReading();
 				} else {
 					client->input.startReadingInNextTick();
@@ -613,10 +654,10 @@ protected:
 			getClientOutputErrorDisconnectionLogLevel(client, errcode));
 	}
 
-	virtual PassengerLogLevel getClientOutputErrorDisconnectionLogLevel(
+	virtual LoggingKit::Level getClientOutputErrorDisconnectionLogLevel(
 		Client *client, int errcode) const
 	{
-		return LVL_WARN;
+		return LoggingKit::WARN;
 	}
 
 	virtual void onUpdateStatistics() {
@@ -658,23 +699,13 @@ protected:
 		// Do nothing.
 	}
 
-	virtual void onConfigChange(const ConfigKit::Store *oldConfig) {
-		acceptBurstCount = config["accept_burst_count"].asUInt();
-		startReadingAfterAccept = config["start_reading_after_accept"].asBool();
-		minSpareClients = config["min_spare_clients"].asUInt();
-		clientFreelistLimit = config["client_freelist_limit"].asUInt();
-	}
-
 public:
 	/***** Public methods *****/
 
 	BaseServer(Context *context, const BaseServerSchema &schema,
 		const Json::Value &initialConfig = Json::Value())
-		: config(schema),
-		  acceptBurstCount(0),
-		  startReadingAfterAccept(true),
-		  minSpareClients(0),
-		  clientFreelistLimit(0),
+		: config(schema, initialConfig),
+		  configRlz(config),
 		  shutdownFinishCallback(NULL),
 		  serverState(ACTIVE),
 		  freeClientCount(0),
@@ -692,12 +723,6 @@ public:
 		  nEndpoints(0),
 		  accept4Available(true)
 	{
-		vector<ConfigKit::Error> errors;
-		if (!config.update(initialConfig, errors)) {
-			throw ArgumentException("Invalid initial configuration: " +
-				toString(errors));
-		}
-
 		STAILQ_INIT(&freeClients);
 		TAILQ_INIT(&activeClients);
 		TAILQ_INIT(&disconnectedClients);
@@ -721,7 +746,6 @@ public:
 	/***** Initialization, listening and shutdown *****/
 
 	virtual void initialize() {
-		onConfigChange(NULL);
 		statisticsUpdateWatcher.set(5, 5);
 		statisticsUpdateWatcher.start();
 	}
@@ -729,7 +753,7 @@ public:
 	// Pre-create multiple client objects so that they get allocated
 	// near each other in memory. Hopefully increases CPU cache locality.
 	void createSpareClients() {
-		for (unsigned int i = 0; i < minSpareClients; i++) {
+		for (unsigned int i = 0; i < configRlz.minSpareClients; i++) {
 			Client *client = createNewClientObject();
 			client->setConnState(Client::IN_FREELIST);
 			STAILQ_INSERT_HEAD(&freeClients, client, nextClient.freeClient);
@@ -845,7 +869,7 @@ public:
 
 	/***** Server management *****/
 
-	virtual void compact(int logLevel = LVL_NOTICE) {
+	virtual void compact(LoggingKit::Level logLevel = LoggingKit::NOTICE) {
 		unsigned int count = freeClientCount;
 
 		while (!STAILQ_EMPTY(&freeClients)) {
@@ -1034,7 +1058,7 @@ public:
 	}
 
 	void disconnectWithError(Client **client, const StaticString &message,
-		PassengerLogLevel logLevel = LVL_WARN)
+		LoggingKit::Level logLevel = LoggingKit::WARN)
 	{
 		SKC_LOG(*client, logLevel, "Disconnecting client with error: " << message);
 		disconnect(client);
@@ -1062,20 +1086,23 @@ public:
 		return P_STATIC_STRING("Server");
 	}
 
-	virtual Json::Value previewConfigUpdate(const Json::Value &updates,
-		vector<ConfigKit::Error> &errors)
+	bool prepareConfigChange(const Json::Value &updates,
+		vector<ConfigKit::Error> &errors, BaseServerConfigChangeRequest &req)
 	{
-		return config.previewUpdate(updates, errors);
-	}
-
-	virtual bool configure(const Json::Value &updates, vector<ConfigKit::Error> &errors) {
-		ConfigKit::Store oldConfig = config;
-		if (config.update(updates, errors)) {
-			onConfigChange(&oldConfig);
+		req.config.reset(new ConfigKit::Store(config, updates, errors));
+		if (errors.empty()) {
+			req.configRlz.reset(new BaseServerConfigRealization(*req.config));
 		}
 		return errors.empty();
 	}
 
+	void commitConfigChange(BaseServerConfigChangeRequest &req)
+		BOOST_NOEXCEPT_OR_NOTHROW
+	{
+		config.swap(*req.config);
+		configRlz.swap(*req.configRlz);
+	}
+
 	virtual Json::Value inspectConfig() const {
 		return config.inspect();
 	}

data/src/cxx_supportlib/StaticString.h

@@ -26,6 +26,13 @@
 #ifndef _PASSENGER_STATIC_STRING_H_
 #define _PASSENGER_STATIC_STRING_H_
 
+// for std::swap()
+#if __cplusplus >= 201103L
+	#include <utility>
+#else
+	#include <algorithm>
+#endif
+#include <boost/config.hpp>
 #include <oxt/macros.hpp>
 #include <sys/types.h>
 #include <string>
@@ -248,6 +255,11 @@ public:
 		}
 	}
 
+	void swap(StaticString &other) BOOST_NOEXCEPT_OR_NOTHROW {
+		std::swap(content, other.content);
+		std::swap(len, other.len);
+	}
+
 	bool operator==(const StaticString &other) const {
 		return len == other.len && memcmp(content, other.content, len) == 0;
 	}

data/src/cxx_supportlib/Utils/Curl.h

@@ -47,9 +47,16 @@
  * don't do anything.
  */
 
+// for std::swap()
+#if __cplusplus >= 201103L
+	#include <utility>
+#else
+	#include <algorithm>
+#endif
 #include <string>
 #include <cstring>
 #include <curl/curl.h>
+#include <boost/config.hpp>
 #include <boost/foreach.hpp>
 #include <Exceptions.h>
 #include <Utils.h>
@@ -78,6 +85,15 @@ struct CurlProxyInfo {
 		  httpTunnel(false),
 		  valid(valid)
 		{ }
+
+	void swap(CurlProxyInfo &other) BOOST_NOEXCEPT_OR_NOTHROW {
+		hostAndPort.swap(other.hostAndPort);
+		credentials.swap(other.credentials);
+		std::swap(type, other.type);
+		std::swap(none, other.none);
+		std::swap(httpTunnel, other.httpTunnel);
+		std::swap(valid, other.valid);
+	}
 };
 
 inline const CurlProxyInfo

data/src/cxx_supportlib/Utils/FastStringStream.h

@@ -169,7 +169,12 @@ public:
  *
  * This class is implemented using FastStdStringBuf.
  */
-template<size_t staticCapacity = 1024>
+#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
 class FastStringStream: public FastStdStringBuf<staticCapacity>, public ostream {
 public:
 	FastStringStream(unsigned int initialCapacity = 0)

data/src/cxx_supportlib/Utils/ScopeGuard.h

@@ -31,7 +31,7 @@
 #include <boost/thread.hpp>
 #include <oxt/system_calls.hpp>
 #include <cstdio>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/StrIntUtils.cpp

@@ -24,6 +24,7 @@
  *  THE SOFTWARE.
  */
 
+#include <boost/cstdint.hpp>
 #include <cstdio>
 #include <cstdlib>
 #include <cctype>
@@ -207,25 +208,7 @@ toString(const vector<StaticString> &vec) {
 
 string
 pointerToIntString(void *pointer) {
-	// Use wierd union construction to avoid compiler warnings.
-	if (sizeof(void *) == sizeof(unsigned int)) {
-		union {
-			void *pointer;
-			unsigned int value;
-		} u;
-		u.pointer = pointer;
-		return toString(u.value);
-	} else if (sizeof(void *) == sizeof(unsigned long long)) {
-		union {
-			void *pointer;
-			unsigned long long value;
-		} u;
-		u.pointer = pointer;
-		return toString(u.value);
-	} else {
-		fprintf(stderr, "Pointer size unsupported...\n");
-		abort();
-	}
+	return toString((boost::uintptr_t) pointer);
 }
 
 template<typename Numeric>

data/src/cxx_supportlib/WatchdogLauncher.h

@@ -104,7 +104,8 @@ void        psg_watchdog_launcher_free(PsgWatchdogLauncher *launcher);
 #include <MessageClient.h>
 #include <Exceptions.h>
 #include <ResourceLocator.h>
-#include <Logging.h>
+#include <LoggingKit/LoggingKit.h>
+#include <LoggingKit/Context.h>
 #include <Utils.h>
 #include <Utils/IOUtils.h>
 #include <Utils/MessageIO.h>
@@ -364,7 +365,7 @@ public:
 			.set    ("web_server_passenger_version", PASSENGER_VERSION)
 			.set    ("integration_mode", getIntegrationModeString())
 			.set    ("passenger_root",  passengerRoot)
-			.setInt ("log_level",       getLogLevel());
+			.setInt ("log_level",       (int) LoggingKit::getLevel());
 		extraParams.addTo(params);
 
 		if (!params.getBool("user_switching", false, true)

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,15 +31,15 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.1.7'
+  VERSION_STRING = '5.1.8'
 
   PREFERRED_NGINX_VERSION = '1.12.1'
   NGINX_SHA256_CHECKSUM = '8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb'
 
   # Packaging may be locked to an older version due to the specific module configuration being
   # incompatible with the version we prefer (latest stable).
-  PACKAGING_PREFERRED_NGINX_VERSION = '1.10.3'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '75020f1364cac459cb733c4e1caed2d00376e40ea05588fb8793076a4c69dd90'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.12.1'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '8793bf426485a30f91021b6b945a9fd8a84d87d17b566562c3797aba8fac76fb'
 
   PREFERRED_PCRE_VERSION  = '8.39'
   PCRE_SHA256_CHECKSUM = 'ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7'

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -267,10 +267,10 @@ end
 
 
 COMMON_LIBRARY = CommonLibraryBuilder.new do
-  define_component 'Logging.o',
-    :source   => 'Logging.cpp',
+  define_component 'LoggingKit.o',
+    :source   => 'LoggingKit/Implementation.cpp',
     :category => :base,
-    :optimize => :light
+    :optimize => :very_heavy
   define_component 'Exceptions.o',
     :source   => 'Exceptions.cpp',
     :category => :base
@@ -291,9 +291,18 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
     :source   => 'Utils/IOUtils.cpp',
     :optimize => :light,
     :category => :base
+  define_component 'Utils/Hasher.o',
+    :source   => 'Utils/Hasher.cpp',
+    :category => :base,
+    :optimize => :very_heavy
   define_component 'Utils.o',
     :source   => 'Utils.cpp',
     :category => :base
+  define_component 'jsoncpp.o',
+    :source   => 'vendor-modified/jsoncpp/jsoncpp.cpp',
+    :category => :base,
+    :optimize => true
+
   define_component 'Crypto.o',
     :source   => 'Crypto.cpp',
     :category => :other,
@@ -326,19 +335,10 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'DataStructures/LString.o',
     :source   => 'DataStructures/LString.cpp',
     :category => :other
-
-  define_component 'Utils/Hasher.o',
-    :source   => 'Utils/Hasher.cpp',
-    :category => :other,
-    :optimize => :very_heavy
   define_component 'AppTypes.o',
     :source   => 'AppTypes.cpp',
     :category => :other
 
-  define_component 'jsoncpp.o',
-    :source   => 'vendor-modified/jsoncpp/jsoncpp.cpp',
-    :category => :json,
-    :optimize => true
   define_component 'vendor-modified/modp_b64.o',
     :source   => 'vendor-modified/modp_b64.cpp',
     :category => :bas64,