passenger 5.3.5 → 5.3.6

data/src/cxx_supportlib/Utils/Curl.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013-2017 Phusion Holding B.V.
+ *  Copyright (c) 2013-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -61,7 +61,7 @@
 #include <Exceptions.h>
 #include <FileTools/FileManip.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/FileChangeChecker.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -30,7 +30,7 @@
 #include <cerrno>
 
 #include <Utils/CachedFileStat.hpp>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/MessagePassing.h

@@ -36,7 +36,7 @@
 #include <oxt/macros.hpp>
 #include <jsoncpp/json.h>
 #include <Exceptions.h>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 #include <list>
 

data/src/cxx_supportlib/Utils/SpeedMeter.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2017 Phusion Holding B.V.
+ *  Copyright (c) 2014-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -30,7 +30,7 @@
 #include <cstdlib>
 #include <cassert>
 #include <limits>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/Timer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -28,7 +28,7 @@
 
 #include <boost/thread.hpp>
 #include <oxt/system_calls.hpp>
-#include <Utils/SystemTime.h>
+#include <SystemTools/SystemTime.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/Utils/VariantMap.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
+ *  Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -36,8 +36,8 @@
 #include <jsoncpp/json.h>
 #include <modp_b64.h>
 #include <Exceptions.h>
-#include <Utils/StrIntUtils.h>
-#include <Utils/MessageIO.h>
+#include <StrIntTools/StrIntUtils.h>
+#include <IOTools/MessageIO.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/WatchdogLauncher.h

@@ -86,8 +86,8 @@ void        psg_watchdog_launcher_free(PsgWatchdogLauncher *launcher);
 #include <LoggingKit/Context.h>
 #include <ProcessManagement/Utils.h>
 #include <Utils.h>
-#include <Utils/IOUtils.h>
-#include <Utils/MessageIO.h>
+#include <IOTools/IOUtils.h>
+#include <IOTools/MessageIO.h>
 #include <Utils/Timer.h>
 #include <Utils/ScopeGuard.h>
 #include <Utils/ClassUtils.h>
@@ -370,7 +370,7 @@ public:
 				afterFork();
 			}
 
-			closeAllFileDescriptors(FEEDBACK_FD, true);
+			closeAllFileDescriptors(FEEDBACK_FD);
 
 			execl(agentFilename.c_str(), AGENT_EXE, "watchdog",
 				// Some extra space to allow the child process to change its process title.

data/src/cxx_supportlib/WebSocketCommandReverseServer.h

@@ -49,7 +49,7 @@
 #include <FileTools/PathManip.h>
 #include <FileTools/FileManip.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 

data/src/cxx_supportlib/WrapperRegistry/Registry.h

@@ -37,7 +37,7 @@
 #include <DataStructures/StringKeyTable.h>
 #include <Constants.h>
 #include <Utils.h>
-#include <Utils/StrIntUtils.h>
+#include <StrIntTools/StrIntUtils.h>
 
 namespace Passenger {
 namespace WrapperRegistry {

data/src/cxx_supportlib/vendor-modified/psg_sysqueue.h

@@ -129,6 +129,9 @@
 #undef LIST_ENTRY
 #undef LIST_REMOVE
 #undef LIST_SWAP
+#undef LIST_INSERT_BEFORE
+#undef LIST_INSERT_AFTER
+#undef LIST_INSERT_HEAD
 #undef TAILQ_HEAD
 #undef TAILQ_ENTRY
 #undef TAILQ_INSERT_AFTER

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '5.3.5'
+  VERSION_STRING = '5.3.6'
 
   PREFERRED_NGINX_VERSION = '1.14.0'
   NGINX_SHA256_CHECKSUM = '5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5'

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -293,24 +293,24 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
     :source   => 'SystemTools/UserDatabase.cpp',
     :category => :base
   define_component 'Utils/SystemTime.o',
-    :source   => 'Utils/SystemTime.cpp',
+    :source   => 'SystemTools/SystemTime.cpp',
     :category => :base
-  define_component 'Utils/StrIntUtils.o',
-    :source   => 'Utils/StrIntUtils.cpp',
+  define_component 'StrIntTools/StrIntUtils.o',
+    :source   => 'StrIntTools/StrIntUtils.cpp',
     :category => :base,
     :optimize => :very_heavy
-  define_component 'Utils/StrIntUtilsNoStrictAliasing.o',
-    :source   => 'Utils/StrIntUtilsNoStrictAliasing.cpp',
+  define_component 'StrIntTools/StrIntUtilsNoStrictAliasing.o',
+    :source   => 'StrIntTools/StrIntUtilsNoStrictAliasing.cpp',
     :category => :base,
     # Compiling with -O3 causes segfaults on RHEL 6
     :optimize => :heavy,
     :strict_aliasing => false
-  define_component 'Utils/IOUtils.o',
-    :source   => 'Utils/IOUtils.cpp',
+  define_component 'IOTools/IOUtils.o',
+    :source   => 'IOTools/IOUtils.cpp',
     :optimize => :light,
     :category => :base
-  define_component 'Utils/Hasher.o',
-    :source   => 'Utils/Hasher.cpp',
+  define_component 'Algorithms/Hasher.o',
+    :source   => 'Algorithms/Hasher.cpp',
     :category => :base,
     :optimize => :very_heavy
   define_component 'Utils.o',
@@ -321,8 +321,8 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
     :category => :base,
     :optimize => true
 
-  define_component 'Crypto.o',
-    :source   => 'Crypto.cpp',
+  define_component 'SecurityKit/Crypto.o',
+    :source   => 'SecurityKit/Crypto.cpp',
     :category => :other,
     :cflags   => PhusionPassenger::PlatformInfo.crypto_extra_cflags
   define_component 'Utils/CachedFileStat.o',

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

@@ -1,7 +1,7 @@
 #  encoding: utf-8
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -133,9 +133,9 @@ module PhusionPassenger
         puts "<banner>Compiling #{PROGRAM_NAME} agent...</banner>"
         progress_bar = ProgressBar.new
         e_working_dir = Shellwords.escape(@working_dir)
-        args = "#{e_working_dir}/support-binaries/#{AGENT_EXE}" +
-          " CACHING=false" +
-          " OUTPUT_DIR=#{e_working_dir} "
+        args = "#{e_working_dir}/support-binaries/#{AGENT_EXE}" \
+          " CACHING=false" \
+          " OUTPUT_DIR=#{e_working_dir} " \
           " OPTIMIZE=#{!!@optimize}"
         begin
           progress_bar.set(0)

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

@@ -251,7 +251,7 @@ module PhusionPassenger
           if @nginx_tarball
             new_screen
             puts "You specified --nginx-tarball, but the file could not be extracted. " +
-              "Please check the path and format (tar.gz), and ensure Passenger can write to " + 
+              "Please check the path and format (tar.gz), and ensure Passenger can write to " +
               PlatformInfo.tmpexedir + "."
             puts
           else

data/src/ruby_supportlib/phusion_passenger/message_channel.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -26,7 +26,7 @@
 module PhusionPassenger
 
   # This class allows reading and writing structured messages over
-  # I/O channels. This is the Ruby implementation of src/cxx_supportlib/Utils/MessageIO.h;
+  # I/O channels. This is the Ruby implementation of src/cxx_supportlib/IOTools/MessageIO.h;
   # see that file for more information.
   class MessageChannel
     HEADER_SIZE = 2                  # :nodoc:

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -56,11 +56,9 @@ module PhusionPassenger
     # A list of globs which match all files that should be packaged
     # in the Phusion Passenger gem or tarball.
     GLOB = [
-      '.editorconfig',
       'configure',
       'Rakefile',
       'README.md',
-      'CODE_OF_CONDUCT.md',
       'CONTRIBUTORS',
       'CONTRIBUTING.md',
       'LICENSE',
@@ -74,46 +72,49 @@ module PhusionPassenger
       'doc/**/*',
       'images/*',
       'man/*',
-      'dev/**/*',
+      # Only inlcude the top-level scripts, required by e.g. the Homebrew packaging.
+      'dev/*',
       'src/**/*',
       'resources/**/*',
       'resources/templates/error_renderer/.editorconfig'
     ]
 
     # Files that should be excluded from the gem or tarball. Overrides GLOB.
+    #
+    # This is not merely an exclusion list on top of GLOB! All files that you
+    # do not want to include in the package must be explicitly specified here!
+    # Otherwise source_packaging_test.rb will complain.
     EXCLUDE_GLOB = [
       '**/.DS_Store',
-      '.gitignore',
+      '**/*.gch',
+      '**/.editorconfig',
+      '.externalToolBuilders/**/*',
+      '.github/**/*',
+      '.settings/**/*',
+      '.vscode/**/*',
+      '.cproject',
       '.gitattributes',
+      '.gitignore',
       '.gitmodules',
-      '.github/*',
-      '.settings/*',
-      '.externalToolBuilders/*',
-      '.vscode/*',
-      '.cproject',
       '.project',
+      'CODE_OF_CONDUCT.md',
       'Gemfile',
       'Gemfile.lock',
-      'yarn.lock',
-      'Vagrantfile',
       'Jenkinsfile',
       'Passenger.sublime-project',
-      'Passenger.xcodeproj/**/*',
+      'Vagrantfile',
+      'yarn.lock',
       'build/support/vendor/*/.*',
       'build/support/vendor/*/spec/**/*',
+      'dev/*/**/*',
+      'packaging/**/*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/.*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/hacking/**/*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/spec/**/*',
       'src/cxx_supportlib/vendor-copy/*/.*',
-      'packaging/**/*',
       'test/**/*'
     ]
 
-    # Files and directories that should be excluded from the Homebrew installation.
-    HOMEBREW_EXCLUDE = [
-      "package.json", "npm-shrinkwrap.json"
-    ]
-
     def self.files
       result = Dir[*GLOB] - Dir[*EXCLUDE_GLOB]
       result.reject! { |path| path =~ %r{/\.\.?$} }

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

@@ -577,6 +577,23 @@ module PhusionPassenger
     end
     memoize :apache2_sbindir
 
+    def self.apache2_modulesdir(options = {})
+      apxs2 = options.fetch(:apxs2, self.apxs2)
+      if apxs2.nil?
+        # macOS >= 10.13 High Sierra no longer ships apxs2, so we'll use
+        # a hardcoded default.
+        if os_name_simple == 'macosx' && os_version >= '10.13' \
+          && httpd(:apxs2 => apxs2) == '/usr/sbin/httpd'
+          '/usr/libexec/apache2'
+        else
+          nil
+        end
+      else
+        `#{apxs2} -q LIBEXECDIR`.strip
+      end
+    end
+    memoize :apache2_modulesdir
+
 
     ################ Compiler and linker flags ################
 
@@ -824,8 +841,8 @@ module PhusionPassenger
             # /Library/Developer/CommandLineTools.
             xcode_prefix = `/usr/bin/xcode-select -p`.strip
             ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1 " \
-             "-I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/apache2",
-              '-lapr-1']
+             "-I#{xcode_prefix}/SDKs/MacOSX.sdk/usr/include/apr-1",
+             '-lapr-1']
           else
             ['-I/usr/include/apr-1', '-lapr-1']
           end
@@ -873,8 +890,9 @@ module PhusionPassenger
             # On macOS >= 10.13 High Sierra /usr/include no longer
             # exists.
             xcode_prefix = `/usr/bin/xcode-select -p`.strip
-            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1",
-              '-laprutil-1']
+            ["-I#{xcode_prefix}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/apr-1" \
+             "-I#{xcode_prefix}/SDKs/MacOSX.sdk/usr/include/apr-1",
+             '-laprutil-1']
           else
             ['-I/usr/include/apr-1', '-laprutil-1']
           end

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

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -48,6 +48,22 @@ module PhusionPassenger
     end
     GEM_PATH = gem_path
 
+    # 'bundle exec' modifies $GEM_HOME and $GEM_PATH so let's
+    # store the values that we had before Bundler's modifications.
+    gem_home = ENV['BUNDLER_ORIG_GEM_HOME']
+    if gem_home
+      gem_home = gem_home.strip.freeze
+      gem_home = nil if gem_home.empty?
+    end
+    BUNDLER_ORIG_GEM_HOME = gem_home
+
+    gem_path = ENV['BUNDLER_ORIG_GEM_PATH']
+    if gem_path
+      gem_path = gem_path.strip.freeze
+      gem_path = nil if gem_path.empty?
+    end
+    BUNDLER_ORIG_GEM_PATH = gem_path
+
     if defined?(::RUBY_ENGINE)
       RUBY_ENGINE = ::RUBY_ENGINE
     else
@@ -257,12 +273,6 @@ module PhusionPassenger
     # Returns nil otherwise.
     def self.rvm_ruby_string
       if in_rvm?
-        # RVM used to export the necessary information through
-        # environment variables, but doesn't always do that anymore
-        # in the latest versions in order to fight env var pollution.
-        # Scanning $LOAD_PATH seems to be the only way to obtain
-        # the information.
-
         # Getting the RVM name of the Ruby interpreter ("ruby-1.9.2")
         # isn't so hard, we can extract it from the #ruby_executable
         # string. Getting the gemset name is a bit harder, so let's
@@ -273,16 +283,26 @@ module PhusionPassenger
         #   /Users/hongli/.rvm/gems/ruby-1.9.3-p392
         # But also:
         #   /home/bitnami/.rvm/gems/ruby-1.9.3-p385-perf@njist325/ruby/1.9.1
-        if GEM_HOME && GEM_HOME =~ %r{rvm/gems/(.+)}
-          return $1.sub(/\/.*/, '')
+        #
+        # Caveat when we're executed through 'bundle exec':
+        # if `bundle install` was run with `--path=`, then `bundle exec`
+        # will modify $GEM_HOME to the --path directory. That's
+        # why we need to parse the version of $GEM_HOME *before*
+        # `bundle exec` had modified it.
+        [GEM_HOME, BUNDLER_ORIG_GEM_HOME].each do |gem_home|
+          if gem_home && gem_home =~ %r{rvm/gems/(.+)}
+            return $1.sub(/\/.*/, '')
+          end
         end
 
         # User might have explicitly set GEM_HOME to a custom directory,
         # or might have nuked $GEM_HOME. Extract info from $GEM_PATH.
-        if GEM_PATH
-          GEM_PATH.split(':').each do |gem_path|
-            if gem_path =~ %r{rvm/gems/(.+)}
-              return $1.sub(/\/.*/, '')
+        [GEM_PATH, BUNDLER_ORIG_GEM_PATH].each do |gem_path|
+          if gem_path
+            gem_path.split(':').each do |gem_path_part|
+              if gem_path_part =~ %r{rvm/gems/(.+)}
+                return $1.sub(/\/.*/, '')
+              end
             end
           end
         end