passenger 6.1.7 → 6.2.0

data/src/cxx_supportlib/ServerKit/Server.h

@@ -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>
@@ -782,6 +783,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 +793,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 +955,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/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_ */

data/src/cxx_supportlib/Utils/Socket.h

@@ -0,0 +1,35 @@
+/*
+ *  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_
+
+namespace Passenger {
+
+	bool fdIsUnixDomainSocket(int fd);
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_SOCKETUTILS_H_ */

data/src/helper-scripts/meteor-loader.rb

@@ -30,7 +30,9 @@ require 'thread'
 require 'logger'
 
 module PhusionPassenger
+
   module App
+
     def self.options
       @@options ||= {}
       @@options
@@ -254,4 +256,5 @@ module PhusionPassenger
     end
 
   end # module App
+
 end # module PhusionPassenger

data/src/helper-scripts/rack-loader.rb

@@ -26,7 +26,9 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
+
   module App
+
     def self.options
       @@options
     end
@@ -137,4 +139,5 @@ module PhusionPassenger
     LoaderSharedHelpers.after_handling_requests
 
   end # module App
+
 end # module PhusionPassenger

data/src/helper-scripts/rack-preloader.rb

@@ -28,7 +28,9 @@
 GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
 
 module PhusionPassenger
+
   module App
+
     def self.options
       @@options
     end
@@ -216,4 +218,5 @@ module PhusionPassenger
     end
 
   end # module App
+
 end # module PhusionPassenger

data/src/nginx_module/ContentHandler.c

@@ -1304,6 +1304,7 @@ parse_status_line(ngx_http_request_t *r, passenger_context_t *context)
                 return NGX_HTTP_SCGI_PARSE_NO_HEADER;
             }
 
+            r->http_major = ch - '0';
             state = sw_major_digit;
             break;
 
@@ -1318,6 +1319,11 @@ parse_status_line(ngx_http_request_t *r, passenger_context_t *context)
                 return NGX_HTTP_SCGI_PARSE_NO_HEADER;
             }
 
+            if (r->http_major > 99) {
+                return NGX_HTTP_SCGI_PARSE_NO_HEADER;
+            }
+
+            r->http_major = r->http_major * 10 + (ch - '0');
             break;
 
         /* the first digit of minor HTTP version */
@@ -1326,6 +1332,7 @@ parse_status_line(ngx_http_request_t *r, passenger_context_t *context)
                 return NGX_HTTP_SCGI_PARSE_NO_HEADER;
             }
 
+            r->http_minor = ch - '0';
             state = sw_minor_digit;
             break;
 
@@ -1340,6 +1347,11 @@ parse_status_line(ngx_http_request_t *r, passenger_context_t *context)
                 return NGX_HTTP_SCGI_PARSE_NO_HEADER;
             }
 
+            if (r->http_minor > 99) {
+                return NGX_HTTP_SCGI_PARSE_NO_HEADER;
+            }
+
+            r->http_minor = r->http_minor * 10 + (ch - '0');
             break;
 
         /* HTTP status code */
@@ -1352,7 +1364,7 @@ parse_status_line(ngx_http_request_t *r, passenger_context_t *context)
                 return NGX_HTTP_SCGI_PARSE_NO_HEADER;
             }
 
-            context->status = context->status * 10 + ch - '0';
+            context->status = context->status * 10 + (ch - '0');
 
             if (++context->status_count == 3) {
                 state = sw_space_after_status;

data/src/ruby_supportlib/phusion_passenger/admin_tools/instance.rb

@@ -30,6 +30,7 @@ PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
+
   module AdminTools
 
     class Instance
@@ -240,4 +241,5 @@ module PhusionPassenger
     end
 
   end # module AdminTools
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/admin_tools/instance_registry.rb

@@ -28,6 +28,7 @@ require 'fileutils'
 PhusionPassenger.require_passenger_lib 'admin_tools/instance'
 
 module PhusionPassenger
+
   module AdminTools
 
     class InstanceRegistry
@@ -130,4 +131,5 @@ module PhusionPassenger
     end
 
   end # module AdminTools
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/admin_tools/memory_stats.rb

@@ -28,6 +28,7 @@ PhusionPassenger.require_passenger_lib 'platform_info/apache'
 PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 
 module PhusionPassenger
+
   module AdminTools
 
     class MemoryStats
@@ -310,4 +311,5 @@ module PhusionPassenger
     end
 
   end # module AdminTools
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/admin_tools.rb

@@ -25,6 +25,7 @@
 module PhusionPassenger
 
   module AdminTools
+
     def self.tmpdir
       [ "PASSENGER_INSTANCE_REGISTRY_DIR", "TMPDIR" ].each do |name|
         if ENV.has_key?(name) && !ENV[name].empty?
@@ -44,6 +45,7 @@ module PhusionPassenger
         true
       end
     end
+
   end # module AdminTools
 
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/apache2/config_utils.rb

@@ -23,8 +23,11 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
+
   module Apache2
+
     module ConfigUtils
+
       class << self
         def initialize!(options)
           sort(options)
@@ -47,6 +50,9 @@ module PhusionPassenger
           end
         end
       end
+
     end
+
   end
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -295,6 +295,9 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'Utils/SystemTime.o',
     source: 'SystemTools/SystemTime.cpp',
     category: :base
+  define_component 'Utils/Socket.o',
+    source: 'Utils/Socket.cpp',
+    category: :base
   define_component 'StrIntTools/StrIntUtils.o',
     source: 'StrIntTools/StrIntUtils.cpp',
     category: :base,

data/src/ruby_supportlib/phusion_passenger/config/about_command.rb

@@ -26,6 +26,7 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'config/command'
 
 module PhusionPassenger
+
   module Config
 
     class AboutCommand < Command
@@ -228,4 +229,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/agent_compiler.rb

@@ -35,6 +35,7 @@ PhusionPassenger.require_passenger_lib 'utils/progress_bar'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
+
   module Config
 
     class AgentCompiler < AbstractInstaller
@@ -169,4 +170,5 @@ module PhusionPassenger
     end
 
   end # module Standalone
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/api_call_command.rb

@@ -32,6 +32,7 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
+
   module Config
 
     class ApiCallCommand < Command
@@ -216,4 +217,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/build_native_support_command.rb

@@ -27,6 +27,7 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'config/command'
 
 module PhusionPassenger
+
   module Config
 
     class BuildNativeSupportCommand < Command
@@ -76,4 +77,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/command.rb

@@ -23,6 +23,7 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
+
   module Config
 
     class Command
@@ -61,4 +62,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/compile_agent_command.rb

@@ -29,6 +29,7 @@ PhusionPassenger.require_passenger_lib 'config/agent_compiler'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 module PhusionPassenger
+
   module Config
 
     class CompileAgentCommand < Command
@@ -100,4 +101,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/compile_nginx_engine_command.rb

@@ -29,6 +29,7 @@ PhusionPassenger.require_passenger_lib 'config/nginx_engine_compiler'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 module PhusionPassenger
+
   module Config
 
     class CompileNginxEngineCommand < Command
@@ -129,4 +130,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/detach_process_command.rb

@@ -32,6 +32,7 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
+
   module Config
 
     class DetachProcessCommand < Command
@@ -115,4 +116,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/download_agent_command.rb

@@ -35,6 +35,7 @@ PhusionPassenger.require_passenger_lib 'utils/shellwords'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
+
   module Config
 
     class DownloadAgentCommand < Command
@@ -304,4 +305,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/download_nginx_engine_command.rb

@@ -35,6 +35,7 @@ PhusionPassenger.require_passenger_lib 'utils/shellwords'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
+
   module Config
 
     class DownloadNginxEngineCommand < Command
@@ -302,4 +303,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/install_agent_command.rb

@@ -31,6 +31,7 @@ PhusionPassenger.require_passenger_lib 'config/compile_agent_command'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 module PhusionPassenger
+
   module Config
 
     class InstallAgentCommand < Command
@@ -186,4 +187,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/install_standalone_runtime_command.rb

@@ -34,6 +34,7 @@ PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
+
   module Config
 
     class InstallStandaloneRuntimeCommand < Command
@@ -288,4 +289,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/installation_utils.rb

@@ -37,9 +37,11 @@ PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
+
   module Config
 
     module InstallationUtils
+
       extend self    # Make methods available as class methods.
 
       def self.included(klass)
@@ -256,7 +258,9 @@ module PhusionPassenger
         end
         puts ConsoleTextTemplate.new({ file: name }, options).result
       end
+
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/list_instances_command.rb

@@ -30,6 +30,7 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
+
   module Config
 
     class ListInstancesCommand < Command
@@ -100,4 +101,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/main.rb

@@ -28,6 +28,7 @@ module PhusionPassenger
 
   # Core of the `passenger-config` command. Dispatches a subcommand to a specific class.
   module Config
+
     KNOWN_COMMANDS = [
       [ "detach-process", "DetachProcessCommand" ],
       [ "restart-app", "RestartAppCommand" ],
@@ -179,6 +180,7 @@ module PhusionPassenger
       PhusionPassenger.require_passenger_lib("config/#{base_name}")
       PhusionPassenger::Config.const_get(class_name)
     end
+
   end
 
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb

@@ -40,6 +40,7 @@ PhusionPassenger.require_passenger_lib 'utils/progress_bar'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
+
   module Config
 
     class NginxEngineCompiler < AbstractInstaller
@@ -408,4 +409,5 @@ module PhusionPassenger
     end
 
   end # module Standalone
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/reopen_logs_command.rb

@@ -32,6 +32,7 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
+
   module Config
 
     class ReopenLogsCommand < Command
@@ -142,4 +143,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/restart_app_command.rb

@@ -35,6 +35,7 @@ PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
 
 module PhusionPassenger
+
   module Config
 
     class RestartAppCommand < Command
@@ -278,4 +279,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/system_metrics_command.rb

@@ -26,6 +26,7 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'config/command'
 
 module PhusionPassenger
+
   module Config
 
     class SystemMetricsCommand < Command
@@ -41,4 +42,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/system_properties_command.rb

@@ -33,6 +33,7 @@ PhusionPassenger.require_passenger_lib 'platform_info/networking'
 PhusionPassenger.require_passenger_lib 'platform_info/linux'
 
 module PhusionPassenger
+
   module Config
 
     class SystemPropertiesCommand < Command
@@ -102,4 +103,5 @@ module PhusionPassenger
     end
 
   end # module Config
+
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/config/utils.rb

@@ -25,9 +25,11 @@
 PhusionPassenger.require_passenger_lib 'constants'
 
 module PhusionPassenger
+
   module Config
 
     module Utils
+
       extend self    # Make methods available as class methods.
 
       def self.included(klass)
@@ -157,7 +159,9 @@ module PhusionPassenger
       def is_enterprise?
         defined?(PhusionPassenger::PASSENGER_IS_ENTERPRISE) && PhusionPassenger::PASSENGER_IS_ENTERPRISE
       end
+
     end
 
   end # module Config
+
 end # module PhusionPassenger