RubyGems - passenger - Versions diffs - 5.1.2 → 5.1.3 - Mend

passenger 5.1.2 → 5.1.3

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (404) hide show

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

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/config/validate_install_command.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2016 Phusion Holding B.V.
+#  Copyright (c) 2014-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/console_text_template.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/constants.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/debug_logging.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2011-2015 Phusion Holding B.V.
+#  Copyright (c) 2011-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/message_channel.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/message_client.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/native_support.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2016 Phusion Holding B.V.
+#  Copyright (c) 2013-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/packaging.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

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

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/apache.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -725,8 +725,8 @@ module PhusionPassenger
       determine_apu_cxx_info[1]
     end
-    ################ Miscellaneous information ################
+    ################ Miscellaneous information ################
     # Returns whether it is necessary to use information outputted by
     # 'apr-config' and 'apu-config' in order to compile an Apache module.
@@ -742,7 +742,13 @@ module PhusionPassenger
   private
     def self.determine_apr_info(language)
       if apr_config.nil?
-        [nil, nil]
+        if os_name_simple == 'macosx' && apxs2 == '/usr/sbin/apxs'
+          # macOS 10.12 Sierra does not supply apr-config, so
+          # we use hardcoded defaults.
+          ['-I/usr/include/apr-1', '-lapr-1']
+        else
+          [nil, nil]
+        end
       else
         flags = `#{apr_config} --cppflags --includes`.strip
         libs = `#{apr_config} --link-ld`.strip
@@ -777,7 +783,13 @@ module PhusionPassenger
     def self.determine_apu_info(language)
       if apu_config.nil?
-        [nil, nil]
+        if os_name_simple == 'macosx' && apxs2 == '/usr/sbin/apxs'
+          # macOS 10.12 Sierra does not supply apu-config, so
+          # we use hardcoded defaults.
+          ['-I/usr/include/apr-1', '-laprutil-1']
+        else
+          [nil, nil]
+        end
       else
         flags = `#{apu_config} --includes`.strip
         libs = `#{apu_config} --link-ld`.strip

data/src/ruby_supportlib/phusion_passenger/platform_info/apache_detector.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2015 Phusion Holding B.V.
+#  Copyright (c) 2013-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/binary_compatibility.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/crypto.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/curl.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck.rb CHANGED

@@ -109,6 +109,10 @@ module PhusionPassenger
           end
         end
+        def append_install_instructions(value)
+            @install_instructions << "\n#{value}" if value
+        end
         def install_comments(value = nil)
           value ? @install_comments = value : @install_comments
         end
@@ -266,6 +270,10 @@ module PhusionPassenger
           install_instructions("Please install it with <b>brew install #{package_name}</b>")
         end
+        def brew_link(package_name)
+          append_install_instructions("Please link it with <b>brew link --force #{package_name}</b>")
+        end
         def install_osx_command_line_tools
           PhusionPassenger.require_passenger_lib 'platform_info/compiler'
           if PlatformInfo.xcode_select_version.to_s >= "2333"
@@ -302,7 +310,8 @@ module PhusionPassenger
       class ConsoleRunner
         attr_reader :missing_dependencies
-        def initialize
+        def initialize(colors)
+          @colors = colors || Utils::AnsiColors.new(:auto)
           @stdout = STDOUT
           @dep_identifiers = []
         end
@@ -366,7 +375,7 @@ module PhusionPassenger
       private
         def puts(text = nil)
           if text
-            @stdout.puts(Utils::AnsiColors.ansi_colorize(text))
+            @stdout.puts(@colors.ansi_colorize(text))
           else
             @stdout.puts
           end
@@ -380,7 +389,7 @@ module PhusionPassenger
         def puts_detail(text)
           puts "      #{text}"
         end
-      end
+      end # class ConsoleRunner
     end # module Depcheck
   end # module PlatformInfo

data/src/ruby_supportlib/phusion_passenger/platform_info/depcheck_specs/apache2.rb CHANGED

@@ -14,6 +14,13 @@ define 'apache2' do
     end
   end
+  on :ubuntu do
+    if `#{PlatformInfo::uname_command} -a`.include? 'precise'
+      apt_get_install "apache2-mpm-worker"
+    else
+      apt_get_install "apache2"
+    end
+  end
   on :debian do
     apt_get_install "apache2-mpm-worker"
   end
@@ -96,7 +103,13 @@ define 'apr-dev' do
     emerge "apr"
   end
   on :macosx do
-    install_osx_command_line_tools
+    PhusionPassenger.require_passenger_lib 'platform_info/macos'
+    if PlatformInfo.macos_version >= 12
+      brew_install "apr"
+      brew_link "apr"
+    else
+      install_osx_command_line_tools
+    end
   end
 end
@@ -126,6 +139,12 @@ define 'apu-dev' do
     yum_install "apr-util-devel"
   end
   on :macosx do
-    install_osx_command_line_tools
+    PhusionPassenger.require_passenger_lib 'platform_info/macos'
+    if PlatformInfo.macos_version >= 12
+      brew_install "apr-util"
+      brew_link "apr-util"
+    else
+      install_osx_command_line_tools
+    end
   end
 end

data/src/ruby_supportlib/phusion_passenger/platform_info/linux.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/macos.rb ADDED

@@ -0,0 +1,45 @@
+# encoding: binary
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2017 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
+    # Autodetects the current MacOS distribution and return a number of identifier tags.
+    # The first tag identifies the distribution while the other tags indicate which
+    # distributions it is likely compatible with.
+    # Returns nil if the operating system is not MacOS.
+    def self.macos_version
+      if os_name_simple != "macosx"
+        return nil
+      end
+      `sw_vers -productVersion | cut -d '.' -f 2,3`.to_f
+    end
+    memoize :macos_version
+  end
+end # PhusionPassenger

data/src/ruby_supportlib/phusion_passenger/platform_info/openssl.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2015 Phusion Holding B.V.
+#  Copyright (c) 2015-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

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

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/ruby.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/platform_info/zlib.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/plugin.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/preloader_shared_helpers.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2011-2014 Phusion Holding B.V.
+#  Copyright (c) 2011-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/public_api.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/rack/out_of_band_gc.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2012-2014 Phusion Holding B.V.
+#  Copyright (c) 2012-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/rack/thread_handler_extension.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/rack_handler.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2016 Phusion Holding B.V.
+#  Copyright (c) 2016-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/request_handler.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb CHANGED

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/src/ruby_supportlib/phusion_passenger/ruby_core_enhancements.rb CHANGED

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.