passenger 6.0.8 → 6.0.12

data/src/ruby_supportlib/phusion_passenger/platform_info/operating_system.rb

@@ -23,11 +23,18 @@
 #  THE SOFTWARE.
 
 require 'rbconfig'
+require 'rubygems'
 PhusionPassenger.require_passenger_lib 'platform_info'
 
 module PhusionPassenger
 
   module PlatformInfo
+    class VersionComparer < String
+      def <=>(other)
+        Gem::Version.new(self) <=> Gem::Version.new(other.to_s)
+      end
+    end
+
     # Returns the operating system's name in as simple a form as possible. For example,
     # Linux is always identified as "linux". OS X is always identified as "macosx" (despite
     # the actual os name being something like "darwin"). This is useful as a stable indicator
@@ -67,25 +74,26 @@ module PhusionPassenger
     def self.os_version
       case os_name_simple
       when 'macosx'
-        `/usr/bin/sw_vers -productVersion`.strip.split.last
+        VersionComparer.new(`/usr/bin/sw_vers -productVersion`.strip.split.last)
 
       when 'linux'
         # Parse LSB (applicable to e.g. Ubuntu)
         if read_file('/etc/lsb-release') =~ /DISTRIB_RELEASE=(.+)/
-          version = $1.gsub(/["']/, '')
-          return version if !version.empty?
+          version = $1.delete(%q['"])
+          return VersionComparer.new(version) if !version.empty?
         end
 
         # Parse CentOS/RedHat
         data = read_file('/etc/centos-release')
         data = read_file('/etc/redhat-release') if data.empty?
         if !data.empty?
-          data =~ /^(.+?) (Linux )?(release |version )?(.+?)( |$)/i
-          return $4 if $4
+          data =~ /^(.+?) (Linux |Stream )?(release |version )?(.+?)( |$)/i
+          return VersionComparer.new($4) if $4
         end
 
+        # Parse Debian
         if File.exist?('/etc/debian_version')
-          return read_file('/etc/debian_version').strip
+          return VersionComparer.new(read_file('/etc/debian_version').strip)
         end
 
         nil
@@ -142,34 +150,37 @@ module PhusionPassenger
     # system are thus be x86_64. It is guaranteed that the OS can run x86_64
     # executables, but not x86 executables per se.
     #
-    # Another example: on MacOS X this function can return either
-    # ["x86_64", "x86"] or ["x86", "x86_64"]. The former result indicates
-    # OS X 10.6 (Snow Leopard) and beyond because starting from that version
-    # everything is 64-bit by default. The latter result indicates an OS X
-    # version older than 10.6.
+    # Another example: on MacOS X this function will return some subset of
+    # "x86_64", "x86", and "arm".
     def self.cpu_architectures
-      uname = uname_command
-      raise "The 'uname' command cannot be found" if !uname
       if os_name_simple == "macosx"
-        arch = `#{uname} -p`.strip
-        if arch == "i386"
-          # Macs have been x86 since around 2007. I think all of them come with
-          # a recent enough Intel CPU that supports both x86 and x86_64, and I
-          # think every OS X version has both the x86 and x86_64 runtime installed.
-          major, minor, *rest = `sw_vers -productVersion`.strip.split(".")
-          major = major.to_i
-          minor = minor.to_i
-          if major >= 10 || (major == 10 && minor >= 6)
-            # Since Snow Leopard x86_64 is the default.
-            ["x86_64", "x86"]
+        # Macs were intel from around 2006 until 2022.
+        # All but the first 3 Intel Macs' CPUs supported both x86_64 and x86,
+        # and every OS X version from 10.4 to 10.14 had both x86 and x86_64 runtimes installed,
+        # from 10.15 on x86 was dropped, and from (11/10.16) on arm (aarch64) was added.
+        major, minor, *rest = os_version.split(".").map(&:to_i)
+        if major >= 11 || (major == 10 && minor >= 16)
+          # Since Big Sur aarch64 is supported, and default on m1 macs.
+          if `uname -m` =~ /arm64/
+            ["arm", "x86_64"]
+          elsif `sysctl -in sysctl.proc_translated` == "1"
+            ["arm", "x86_64"]
           else
-            # Before Snow Leopard x86 was the default.
-            ["x86", "x86_64"]
+            ["x86_64", "arm"]
           end
+        elsif minor == 15
+          # Since Catalina x86 is gone.
+          ["x86_64"]
+        elsif minor >= 6
+          # Since Snow Leopard x86_64 is the default on intel macs.
+          ["x86_64", "x86"]
         else
-          arch
+          # Before Snow Leopard x86 was the default.
+          ["x86", "x86_64"]
         end
       else
+        uname = uname_command
+        raise "The 'uname' command cannot be found" if !uname
         arch = `#{uname} -p`.strip
         # On some systems 'uname -p' returns something like
         # 'Intel(R) Pentium(R) M processor 1400MHz' or
@@ -239,6 +250,14 @@ module PhusionPassenger
       return File.exists?("/proc/xen/capabilities") && cpu_architectures[0] == "x86"
     end
     memoize :requires_no_tls_direct_seg_refs?, true
+
+    # Returns true if the current os is running in Windows Subsystem for Linux
+    def self.windows_subsystem?
+      uname = uname_command
+      raise "The 'uname' command cannot be found" if !uname
+      `#{uname} -r`.include?("Microsoft")
+    end
+    memoize :windows_subsystem?, true
   end
 
 end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/platform_info/pcre.rb

@@ -0,0 +1,65 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2021 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.
+
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
+
+module PhusionPassenger
+
+  module PlatformInfo
+    def self.pcre_extra_cflags
+      if PlatformInfo.os_name_simple == "macosx"
+        if File.exist?("/usr/local/opt/pcre/include")
+          # Use the one from Homebrew.
+          "-I/usr/local/opt/pcre/include"
+        elsif File.exist?("/opt/homebrew/opt/pcre/include")
+          # Use the one from Homebrew on Apple Silicon
+          "-I/opt/homebrew/opt/pcre/include"
+        else
+          # Use the one from Macports.
+          "-I/opt/local/include"
+        end
+      else
+        ""
+      end
+    end
+    memoize :pcre_extra_cflags
+
+    def self.pcre_extra_ldflags
+      if PlatformInfo.os_name_simple == "macosx"
+        if File.exist?("/usr/local/opt/pcre/include")
+          "-L/usr/local/opt/pcre/lib"
+        elsif File.exist?("/opt/homebrew/opt/pcre/include")
+          "-L/opt/homebrew/opt/pcre/include"
+        else
+          "-L/opt/local/lib"
+        end
+      else
+        ""
+      end
+    end
+    memoize :pcre_extra_ldflags
+  end
+
+end # module PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/request_handler.rb

@@ -279,7 +279,10 @@ module PhusionPassenger
       # is still bugged as of version 1.7.0. They can
       # cause unexplicable freezes when used in combination
       # with threading.
-      return !@force_http_session && ruby_engine != "jruby"
+      # It's also bugged in Windows Subsystem for Linux
+      # as of Windows 10, version 1803 (Fall Creators Update)
+      # You will get "Address In Use" errors even if the port is unused.
+      return !@force_http_session && ruby_engine != "jruby" && !PlatformInfo.windows_subsystem?
     end
 
     def create_unix_socket_on_filesystem(options)

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,20 +31,20 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '6.0.8'
+  VERSION_STRING = '6.0.12'
 
   # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
-  PREFERRED_NGINX_VERSION = '1.18.0'
-  NGINX_SHA256_CHECKSUM = '4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99'
+  PREFERRED_NGINX_VERSION = '1.20.1'
+  NGINX_SHA256_CHECKSUM = 'e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49'
 
   # 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.18.0'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '4c373e7ab5bf91d34a4f11a0c9496561061ba5eee6020db272a17a7228d35f99'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.20.1'
+  PACKAGING_NGINX_SHA256_CHECKSUM = 'e462e11533d5c30baa05df7652160ff5979591d291736cfa5edb9fd2edb48c49'
 
   # sha256sum of the .tar.gz
-  PREFERRED_PCRE_VERSION  = '8.44'
-  PCRE_SHA256_CHECKSUM = 'aecafd4af3bd0f3935721af77b889d9024b2e01d96b58471bd91a3063fb47728'
+  PREFERRED_PCRE_VERSION  = '8.45'
+  PCRE_SHA256_CHECKSUM = '4e6ce03e0336e8b4a3d6c2b70b1c5e18590a5673a98186da90d4f33c23defc09'
 
   STANDALONE_INTERFACE_VERSION  = 1