passenger 6.1.8 → 6.2.1

data/src/cxx_supportlib/Hooks.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/IOTools/BufferedIO.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/IOTools/IOUtils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -29,7 +29,6 @@
 	// https://bugzilla.redhat.com/show_bug.cgi?id=165427
 	// Also needed for SO_PEERCRED.
 	#define _GNU_SOURCE
-#include <exception>
 #endif
 
 #include <oxt/system_calls.hpp>
@@ -37,6 +36,8 @@
 #include <oxt/macros.hpp>
 #include <string>
 #include <vector>
+#include <exception>
+#include <memory>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/un.h>
@@ -66,10 +67,10 @@
 
 #include <Exceptions.h>
 #include <Constants.h>
+#include <Utils/Socket.h>
 #include <Utils/Timer.h>
 #include <IOTools/IOUtils.h>
 #include <StrIntTools/StrIntUtils.h>
-#include <Utils/ScopeGuard.h>
 
 namespace Passenger {
 
@@ -568,14 +569,16 @@ createNonBlockingTcpSocketConnection(const StaticString &hostname, unsigned int
 		throw IOException(message);
 	}
 
+	std::unique_ptr<addrinfo, decltype(&freeaddrinfo)> addrInfoGuard(res, &freeaddrinfo);
+
 
-	int fd = syscalls::socket(PF_INET, SOCK_STREAM, 0);
+	int fd = syscalls::socket(res->ai_family, res->ai_socktype, res->ai_protocol);
 	if (fd == -1) {
 		int e = errno;
 		throw SystemException("Cannot create a TCP socket file descriptor", e);
 	}
 
-	FdGuard guard(fd, nullptr, 0);
+	FdGuard fdGuard(fd, nullptr, 0);
 	P_LOG_FILE_DESCRIPTOR_OPEN4(fd, file, line, "NonBlockingTcpSocketConnection");
 	setNonBlocking(fd);
 
@@ -583,11 +586,10 @@ createNonBlockingTcpSocketConnection(const StaticString &hostname, unsigned int
 	ret = syscalls::connect(fd, res->ai_addr, res->ai_addrlen);
 	if (ret == -1) {
 		if (errno == EINPROGRESS || errno == EWOULDBLOCK) {
-			guard.clear();
+			fdGuard.clear();
 			return make_pair(fd, false);
 		} else if (errno == EISCONN) {
-			freeaddrinfo(res);
-			guard.clear();
+			fdGuard.clear();
 			return make_pair(fd, true);
 		} else {
 			int e = errno;
@@ -599,8 +601,7 @@ createNonBlockingTcpSocketConnection(const StaticString &hostname, unsigned int
 			throw SystemException(message, e);
 		}
 	} else {
-		freeaddrinfo(res);
-		guard.clear();
+		fdGuard.clear();
 		return make_pair(fd, true);
 	}
 }
@@ -1301,29 +1302,13 @@ writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout) {
 
 void
 readPeerCredentials(int sock, uid_t *uid, gid_t *gid) {
-	union {
-		struct sockaddr genericAddress;
-		struct sockaddr_un unixAddress;
-		struct sockaddr_in inetAddress;
-		struct sockaddr_in6 inetAddress6;
-	} addr;
-	socklen_t len = sizeof(addr);
-	int ret;
-
 	/*
 	 * The functions for receiving the peer credentials are not guaranteed to
 	 * fail if the socket is not a Unix domain socket. For example, OS X getpeereid()
 	 * just returns garbage when invoked on a TCP socket. So we check here
 	 * whether 'sock' is a Unix domain socket.
 	 */
-	do {
-		ret = getsockname(sock, &addr.genericAddress, &len);
-	} while (ret == -1 && errno == EINTR);
-	if (ret == -1) {
-		int e = errno;
-		throw SystemException("Unable to autodetect socket type (getsockname() failed)", e);
-	}
-	if (addr.genericAddress.sa_family != AF_LOCAL) {
+	if (!fdIsUnixDomainSocket(sock)) {
 		throw SystemException("Cannot receive process credentials: the connection is not a Unix domain socket",
 			EPROTONOSUPPORT);
 	}

data/src/cxx_supportlib/IOTools/IOUtils.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/IOTools/MessageIO.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2025 Asynchronous B.V.
+ *  Copyright (c) 2011-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/IOTools/MessageSerialization.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/InstanceDirectory.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/Integrations/LibevJsonUtils.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2016-2025 Asynchronous B.V.
+ *  Copyright (c) 2016-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/JsonTools/Autocast.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/JsonTools/CBindings.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/JsonTools/CBindings.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/JsonTools/JsonUtils.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/LoggingKit/Assert.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/LoggingKit/Config.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -55,6 +55,7 @@ using namespace std;
  *   file_descriptor_log_target   any       -   -
  *   level                        string    -   default("notice")
  *   redirect_stderr              boolean   -   default(true)
+ *   redirect_stdout              boolean   -   default(true)
  *   target                       any       -   default({"stderr": true})
  *
  * END

data/src/cxx_supportlib/LoggingKit/Context.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/LoggingKit/Forward.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/LoggingKit/Implementation.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -744,6 +744,7 @@ Schema::Schema() {
 	add("file_descriptor_log_target", ANY_TYPE, OPTIONAL)
 		.setInspectFilter(filterTargetFd);
 	add("redirect_stderr", BOOL_TYPE, OPTIONAL, true);
+	add("redirect_stdout", BOOL_TYPE, OPTIONAL, true);
 	add("app_output_log_level", STRING_TYPE, OPTIONAL, DEFAULT_APP_OUTPUT_LOG_LEVEL_NAME);
 	add("buffer_logs", BOOL_TYPE, OPTIONAL, false);
 	add("disable_log_prefix", BOOL_TYPE, OPTIONAL, false);
@@ -869,6 +870,15 @@ void
 ConfigRealization::apply(const ConfigKit::Store &config, ConfigRealization *oldConfigRlz)
 	BOOST_NOEXCEPT_OR_NOTHROW
 {
+	if (config["redirect_stdout"].asBool()) {
+		int ret = syscalls::dup2(targetFd, STDOUT_FILENO);
+		if (ret == -1) {
+			int e = errno;
+			P_ERROR("Error redirecting logging target to stdout: "
+				<< strerror(e) << " (errno=" << e << ")");
+		}
+	}
+
 	if (config["redirect_stderr"].asBool()) {
 		int ret = syscalls::dup2(targetFd, STDERR_FILENO);
 		if (ret == -1) {

data/src/cxx_supportlib/LoggingKit/Logging.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/LoggingKit/LoggingKit.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/LveLoggingDecorator.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

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-2025 Asynchronous B.V.
+ * Copyright (c) 2014-2026 Asynchronous B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/src/cxx_supportlib/MemoryKit/mbuf.h

@@ -1,7 +1,7 @@
 /*
  * twemproxy - A fast and lightweight proxy for memcached protocol.
  * Copyright (c) 2011 Twitter, Inc.
- * Copyright (c) 2014-2025 Asynchronous B.V.
+ * Copyright (c) 2014-2026 Asynchronous B.V.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

data/src/cxx_supportlib/MemoryKit/palloc.cpp

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) Nginx, Inc.
- * Copyright (c) 2013-2025 Asynchronous B.V.
+ * Copyright (c) 2013-2026 Asynchronous B.V.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

data/src/cxx_supportlib/MemoryKit/palloc.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) Nginx, Inc.
- * Copyright (c) 2013-2025 Asynchronous B.V.
+ * Copyright (c) 2013-2026 Asynchronous B.V.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

data/src/cxx_supportlib/ProcessManagement/Ruby.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2017-2025 Asynchronous B.V.
+ *  Copyright (c) 2017-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ProcessManagement/Ruby.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ProcessManagement/Spawn.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ProcessManagement/Spawn.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ProcessManagement/Utils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ProcessManagement/Utils.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/RandomGenerator.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ResourceLocator.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/SafeLibev.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/SecurityKit/Crypto.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -746,26 +746,18 @@ void Crypto::freeAESEncrypted(AESEncResult &aesEnc) {
 
 bool Crypto::encryptRSA(unsigned char *dataChars, size_t dataLen,
 		string encryptPubKeyPath, unsigned char **encryptedCharsPtr, size_t &encryptedLen) {
-	RSA *rsaPubKey = NULL;
 	EVP_PKEY *rsaPubKeyEVP = NULL;
 	EVP_PKEY_CTX *ctx = NULL;
 	bool result = false;
 
 	do {
 		// 1. Get the RSA public key to encrypt with
-		rsaPubKey = loadPubKey(encryptPubKeyPath.c_str());
-		if (rsaPubKey == NULL) {
+		rsaPubKeyEVP = loadPubKey(encryptPubKeyPath.c_str());
+		if (rsaPubKeyEVP == NULL) {
 			logError("Failed to load public key at " + encryptPubKeyPath);
 			break;
 		}
 
-		rsaPubKeyEVP = EVP_PKEY_new();
-		if (1 != EVP_PKEY_assign_RSA(rsaPubKeyEVP, rsaPubKey)) {
-			logErrorExtended("EVP_PKEY_assign_RSA");
-			freePubKey(rsaPubKey); // since it's not tied to EVP key yet
-			break;
-		}
-
 		// 2. Prepare for encryption
 		ctx = EVP_PKEY_CTX_new(rsaPubKeyEVP, NULL);
 		if (ctx == NULL) {
@@ -806,32 +798,24 @@ bool Crypto::encryptRSA(unsigned char *dataChars, size_t dataLen,
 		EVP_PKEY_CTX_free(ctx);
 	}
 	if (rsaPubKeyEVP != NULL) {
-		EVP_PKEY_free(rsaPubKeyEVP); // also frees the rsaPubKey
+		EVP_PKEY_free(rsaPubKeyEVP);
 	}
 
 	return result;
 }
 
 bool Crypto::verifySignature(string signaturePubKeyPath, char *signatureChars, int signatureLen, string data) {
-	RSA *rsaPubKey = NULL;
 	EVP_PKEY *rsaPubKeyEVP = NULL;
 	EVP_MD_CTX *mdctx = NULL;
 	bool result = false;
 
 	do {
-		rsaPubKey = loadPubKey(signaturePubKeyPath.c_str());
-		if (rsaPubKey == NULL) {
+		rsaPubKeyEVP = loadPubKey(signaturePubKeyPath.c_str());
+		if (rsaPubKeyEVP == NULL) {
 			logError("Failed to load public key at " + signaturePubKeyPath);
 			break;
 		}
 
-		rsaPubKeyEVP = EVP_PKEY_new();
-		if (!EVP_PKEY_assign_RSA(rsaPubKeyEVP, rsaPubKey)) {
-			freePubKey(rsaPubKey);
-			logErrorExtended("EVP_PKEY_assign_RSA");
-			break;
-		}
-
 		if (!(mdctx = EVP_MD_CTX_create())) {
 			logErrorExtended("EVP_MD_CTX_create");
 			break;
@@ -861,7 +845,6 @@ bool Crypto::verifySignature(string signaturePubKeyPath, char *signatureChars, i
 
 	if (rsaPubKeyEVP) {
 		EVP_PKEY_free(rsaPubKeyEVP);
-		// freePubKey not needed, already free by EVP_PKEY_free.
 	}
 
 	return result;
@@ -873,15 +856,14 @@ PUBKEY_TYPE Crypto::loadPubKey(const char *filename) {
 		return NULL;
 	}
 
-	RSA *rsa = RSA_new();
-	rsa = PEM_read_RSA_PUBKEY(fp, &rsa, NULL, NULL);
+	EVP_PKEY *pkey = PEM_read_PUBKEY(fp, NULL, NULL, NULL);
 	fclose(fp);
-	return rsa;
+	return pkey;
 }
 
 void Crypto::freePubKey(PUBKEY_TYPE pubKey) {
 	if (pubKey) {
-		RSA_free(pubKey);
+		EVP_PKEY_free(pubKey);
 	}
 }
 

data/src/cxx_supportlib/SecurityKit/Crypto.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -51,7 +51,7 @@ namespace Passenger {
 #if BOOST_OS_MACOS
 typedef SecKeyRef PUBKEY_TYPE;
 #else
-typedef RSA* PUBKEY_TYPE;
+typedef EVP_PKEY* PUBKEY_TYPE;
 #endif
 
 using namespace std;

data/src/cxx_supportlib/SecurityKit/MemZeroGuard.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2025 Asynchronous B.V.
+ *  Copyright (c) 2010-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ServerKit/AcceptLoadBalancer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.
@@ -46,6 +46,7 @@
 #include <ServerKit/Context.h>
 #include <ServerKit/Errors.h>
 #include <Utils.h>
+#include <Utils/Socket.h>
 #include <IOTools/IOUtils.h>
 
 namespace Passenger {
@@ -287,6 +288,7 @@ public:
 		assert(nEndpoints < SERVER_KIT_MAX_SERVER_ENDPOINTS);
 		setNonBlocking(fd);
 		int flag = 1;
+		if (!fdIsUnixDomainSocket(fd)) {
 		if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int)) == -1
 		 && errno != ENOPROTOOPT
 		 && errno != ENOTSUP
@@ -296,6 +298,7 @@ public:
 			P_WARN("Cannot disable Nagle's algorithm on a TCP socket: " <<
 				strerror(e) << " (errno=" << e << ")");
 		}
+		}
 		endpoints[nEndpoints] = fd;
 		nEndpoints++;
 

data/src/cxx_supportlib/ServerKit/Channel.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ServerKit/Client.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ServerKit/ClientRef.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ServerKit/Config.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ServerKit/Context.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.

data/src/cxx_supportlib/ServerKit/CookieUtils.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2025 Asynchronous B.V.
+ *  Copyright (c) 2014-2026 Asynchronous B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Asynchronous B.V.