passenger 6.1.8 → 6.2.1

data/src/cxx_supportlib/ServerKit/Errors.h

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

data/src/cxx_supportlib/ServerKit/FdSinkChannel.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/FdSourceChannel.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/FileBufferedChannel.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.
@@ -486,6 +486,53 @@ private:
 		FBC_DEBUG("pushBuffer() completed: nbuffers = " << nbuffers << ", bytesBuffered = " << bytesBuffered);
 	}
 
+	/**
+	 * Like `pushBuffer()`, but if `buffer` merely wraps memory owned by the caller
+	 * (i.e. it has no mbuf_block that keeps its memory alive), then the data is first
+	 * copied into mbufs from the pool. Large buffers are split over multiple mbufs.
+	 *
+	 * Must be used for all buffers queued in the in-file mode. There, buffers stay
+	 * queued until the writer has moved them to the file, which may be long after the
+	 * reader has passed them to the underlying channel. Callers (e.g. HttpServer
+	 * writing a response body from the request's memory pool) only guarantee that
+	 * such memory stays valid until the reader has passed it on.
+	 */
+	void pushBufferWithOwnedMemory(const MemoryKit::mbuf &buffer) {
+		if (buffer.mbuf_block != NULL || buffer.empty()) {
+			pushBuffer(buffer);
+			return;
+		}
+
+		size_t chunkSize = MemoryKit::mbuf_pool_data_size(&ctx->mbuf_pool);
+		const char *pos = buffer.start;
+		while (pos < buffer.end) {
+			size_t size = std::min<size_t>(buffer.end - pos, chunkSize);
+			MemoryKit::mbuf copy = MemoryKit::mbuf_get(&ctx->mbuf_pool);
+			memcpy(copy.start, pos, size);
+			pushBuffer(MemoryKit::mbuf(copy, 0, size));
+			pos += size;
+		}
+	}
+
+	/**
+	 * Called when switching to the in-file mode: ensures that buffers that were
+	 * queued during the in-memory mode don't reference caller-owned memory either.
+	 * See `pushBufferWithOwnedMemory()` for why.
+	 */
+	void takeOwnershipOfQueuedBuffers() {
+		deque<MemoryKit::mbuf> buffers;
+		if (nbuffers > 0) {
+			buffers.push_back(firstBuffer);
+			buffers.insert(buffers.end(), moreBuffers.begin(), moreBuffers.end());
+		}
+		clearBuffers(false);
+
+		deque<MemoryKit::mbuf>::const_iterator it, end = buffers.end();
+		for (it = buffers.begin(); it != end; it++) {
+			pushBufferWithOwnedMemory(*it);
+		}
+	}
+
 	void popBuffer() {
 		assert(bytesBuffered >= firstBuffer.size());
 		bytesBuffered -= firstBuffer.size();
@@ -836,6 +883,7 @@ private:
 		P_ASSERT_EQ(inFileMode, 0);
 
 		FBC_DEBUG("Switching to in-file mode");
+		takeOwnershipOfQueuedBuffers();
 		mode = IN_FILE_MODE;
 		inFileMode = boost::make_shared<InFileMode>(ctx->libuv);
 		createBufferFile();
@@ -1423,7 +1471,11 @@ public:
 			FBC_DEBUG("Feeding aborted: EOF or error detected");
 			return;
 		}
-		pushBuffer(buffer);
+		if (mode == IN_FILE_MODE) {
+			pushBufferWithOwnedMemory(buffer);
+		} else {
+			pushBuffer(buffer);
+		}
 		if (mode == IN_MEMORY_MODE && passedThreshold()) {
 			switchToInFileMode();
 		} else if (mode == IN_FILE_MODE

data/src/cxx_supportlib/ServerKit/FileBufferedFdSinkChannel.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/HeaderTable.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/Hooks.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/HttpChunkedBodyParser.h

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

data/src/cxx_supportlib/ServerKit/HttpChunkedBodyParserState.h

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

data/src/cxx_supportlib/ServerKit/HttpClient.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/HttpHeaderParser.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/HttpHeaderParserState.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/HttpRequest.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/HttpRequestRef.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/HttpServer.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/Implementation.cpp

@@ -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/Server.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.
@@ -60,6 +60,7 @@
 #include <ConfigKit/ConfigKit.h>
 #include <Algorithms/MovingAverage.h>
 #include <Utils.h>
+#include <Utils/Socket.h>
 #include <Utils/ScopeGuard.h>
 #include <StrIntTools/StrIntUtils.h>
 #include <IOTools/IOUtils.h>
@@ -749,7 +750,9 @@ public:
 	}
 
 	virtual ~BaseServer() {
-		P_ASSERT_EQ(serverState, FINISHED_SHUTDOWN);
+		if (serverState != FINISHED_SHUTDOWN) {
+			P_CRITICAL("BUG: server state is not FINISHED_SHUTDOWN");
+		}
 	}
 
 
@@ -782,6 +785,7 @@ public:
 		assert(nEndpoints < SERVER_KIT_MAX_SERVER_ENDPOINTS);
 		int flag = 1;
 		setNonBlocking(fd);
+		if (!fdIsUnixDomainSocket(fd)) {
 		if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &flag, sizeof(int)) == -1
 		 && errno != ENOPROTOOPT
 		 && errno != ENOTSUP
@@ -791,6 +795,7 @@ public:
 			SKS_WARN("Cannot disable Nagle's algorithm on a TCP socket: " <<
 				strerror(e) << " (errno=" << e << ")");
 		}
+		}
 		ev_io_init(&endpoints[nEndpoints], _onAcceptable, fd, EV_READ);
 		endpoints[nEndpoints].data = this;
 		ev_io_start(ctx->libev->getLoop(), &endpoints[nEndpoints]);
@@ -952,27 +957,7 @@ public:
 	}
 
 	bool clientOnUnixDomainSocket(Client *client) {
-		union {
-			struct sockaddr genericAddress;
-			struct sockaddr_un unixAddress;
-			struct sockaddr_in inetAddress;
-		} addr;
-		socklen_t len = sizeof(addr);
-		int ret;
-
-		do {
-			ret = getsockname(client->getFd(), &addr.genericAddress, &len);
-		} while (ret == -1 && errno == EINTR);
-		if (ret == -1) {
-			int e = errno;
-			throw SystemException("Unable to autodetect socket type (getsockname() failed)", e);
-		} else {
-			#ifdef AF_UNIX
-				return addr.genericAddress.sa_family == AF_UNIX;
-			#else
-				return addr.genericAddress.sa_family == AF_LOCAL;
-			#endif
-		}
+		return fdIsUnixDomainSocket(client->getFd());
 	}
 
 	/** Increase client reference count. */

data/src/cxx_supportlib/StaticString.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/StrIntTools/DateParsing.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/StrIntTools/StrIntUtils.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/StrIntTools/StrIntUtils.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/StrIntTools/StrIntUtilsNoStrictAliasing.cpp

@@ -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/StrIntTools/StringScanning.h

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

data/src/cxx_supportlib/StrIntTools/Template.h

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

data/src/cxx_supportlib/SystemTools/ContainerHelpers.h

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

data/src/cxx_supportlib/SystemTools/ProcessMetricsCollector.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/SystemTools/SystemMetricsCollector.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/SystemTools/SystemTime.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/SystemTools/SystemTime.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/SystemTools/UserDatabase.cpp

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

data/src/cxx_supportlib/SystemTools/UserDatabase.h

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

data/src/cxx_supportlib/Utils/AnsiColorConstants.h

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

data/src/cxx_supportlib/Utils/AsyncSignalSafeUtils.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/Utils/BlockingQueue.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/Utils/CachedFileStat.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/Utils/CachedFileStat.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/Utils/CachedFileStat.hpp

@@ -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/Utils/ClassUtils.h

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

data/src/cxx_supportlib/Utils/Curl.h

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

data/src/cxx_supportlib/Utils/FastStringStream.h

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

data/src/cxx_supportlib/Utils/FileChangeChecker.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/Utils/HttpConstants.h

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

data/src/cxx_supportlib/Utils/IniFile.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/Utils/MessagePassing.h

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

data/src/cxx_supportlib/Utils/OptionParsing.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/Utils/ReleaseableScopedPointer.h

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

data/src/cxx_supportlib/Utils/ScopeGuard.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/Utils/Socket.cpp

@@ -0,0 +1,67 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2026 Asynchronous B.V.
+ *
+ *  "Passenger", "Phusion Passenger" and "Union Station" are registered
+ *  trademarks of Asynchronous 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_SOCKETUTILS_H_
+#define _PASSENGER_SOCKETUTILS_H_
+
+#include <Utils/Socket.h>
+#include <IOTools/IOUtils.h>
+
+#include <netinet/in.h>
+#include <sys/un.h>
+
+namespace Passenger {
+
+	using namespace std;
+	using namespace oxt;
+
+	bool fdIsUnixDomainSocket(int fd) {
+		union {
+			struct sockaddr genericAddress;
+			struct sockaddr_un unixAddress;
+			struct sockaddr_in inetAddress;
+			struct sockaddr_in6 inetAddress6;
+		} addr;
+		socklen_t len = sizeof(addr);
+		int ret;
+
+		do {
+			ret = getsockname(fd, &addr.genericAddress, &len);
+		} while (ret == -1 && errno == EINTR);
+		if (ret == -1) {
+			int e = errno;
+			throw SystemException("Unable to autodetect socket type (getsockname() failed)", e);
+		} else {
+#ifdef AF_UNIX
+			return addr.genericAddress.sa_family == AF_UNIX;
+#else
+			return addr.genericAddress.sa_family == AF_LOCAL;
+#endif
+		}
+	}
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_SOCKETUTILS_H_ */