passenger 5.1.10 → 5.1.11

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

@@ -344,6 +344,13 @@ module PhusionPassenger
     end
     memoize :cc_supports_visibility_flag?, true
 
+    def self.cc_supports_fno_limit_debug_info_flag?
+      try_compile_with_warning_flag(
+        "Checking for C compiler '-fno-limit-debug-info' support",
+        :c, '', '-fno-limit-debug-info')
+    end
+    memoize :cc_supports_fno_limit_debug_info_flag?
+
     def self.cxx_supports_visibility_flag?
       return false if os_name_simple == "aix"
       return try_compile("Checking for C++ compiler '-fvisibility' support",
@@ -386,6 +393,13 @@ module PhusionPassenger
     end
     memoize :cxx_supports_wno_unused_local_typedefs_flag?, true
 
+    def self.cxx_supports_fno_limit_debug_info_flag?
+      try_compile_with_warning_flag(
+        "Checking for C++ compiler '-fno-limit-debug-info' support",
+        :cxx, '', '-fno-limit-debug-info')
+    end
+    memoize :cxx_supports_fno_limit_debug_info_flag?
+
     def self.cc_supports_no_tls_direct_seg_refs_option?
       return try_compile("Checking for C compiler '-mno-tls-direct-seg-refs' support",
         :c, '', '-mno-tls-direct-seg-refs')
@@ -489,7 +503,7 @@ module PhusionPassenger
         :c, "int main() { return 0; }\n", '-ldl')
     end
     memoize :has_dl_library?, true
-    
+
     def self.has_alloca_h?
       return try_compile("Checking for alloca.h",
         :c, '#include <alloca.h>')
@@ -513,44 +527,33 @@ module PhusionPassenger
       #
       # In any case we'll always want to use -ggdb for better GDB debugging.
       if cc_is_gcc?
-        return '-ggdb'
+        result = '-ggdb'
       else
-        return '-g'
-      end
-    end
-
-    def self.dmalloc_ldflags
-      if !ENV['DMALLOC_LIBS'].to_s.empty?
-        return ENV['DMALLOC_LIBS']
+        result = '-g'
       end
-      if os_name_simple == "macosx"
-        ['/opt/local', '/usr/local', '/usr'].each do |prefix|
-          filename = "#{prefix}/lib/libdmallocthcxx.a"
-          if File.exist?(filename)
-            return filename
-          end
-        end
-        return nil
-      else
-        return "-ldmallocthcxx"
+      if cc_supports_fno_limit_debug_info_flag?
+        result << ' -fno-limit-debug-info'
       end
+      result
     end
-    memoize :dmalloc_ldflags
 
-    def self.electric_fence_ldflags
-      if os_name_simple == "macosx"
-        ['/opt/local', '/usr/local', '/usr'].each do |prefix|
-          filename = "#{prefix}/lib/libefence.a"
-          if File.exist?(filename)
-            return filename
-          end
-        end
-        return nil
+    # C++ compiler flags that should be passed in order to enable debugging information.
+    def self.debugging_cxxflags
+      # According to OpenBSD's pthreads man page, pthreads do not work
+      # correctly when an app is compiled with -g. It recommends using
+      # -ggdb instead.
+      #
+      # In any case we'll always want to use -ggdb for better GDB debugging.
+      if cc_is_gcc?
+        result = '-ggdb'
       else
-        return "-lefence"
+        result = '-g'
+      end
+      if cxx_supports_fno_limit_debug_info_flag?
+        result << ' -fno-limit-debug-info'
       end
+      result
     end
-    memoize :electric_fence_ldflags
 
     def self.export_dynamic_flags
       if os_name_simple == "linux"

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

@@ -144,7 +144,6 @@ module PhusionPassenger
         end
       end
 
-      flags << debugging_cflags
       flags << '-DHAS_ALLOCA_H' if has_alloca_h?
       flags << '-DHAVE_ACCEPT4' if has_accept4?
       flags << '-DHAS_SFENCE' if supports_sfence_instruction?
@@ -152,6 +151,7 @@ module PhusionPassenger
       flags << "-DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
 
       if cc_or_cxx == :cxx
+        flags << debugging_cxxflags
         flags << cxx_11_flag if cxx_11_flag
 
         if cxx_supports_wno_unused_local_typedefs_flag?
@@ -164,6 +164,8 @@ module PhusionPassenger
         check_unordered_map(flags, "std::unordered_map", "unordered_map", "HAS_UNORDERED_MAP") ||
           check_unordered_map(flags, "std::tr1::unordered_map", "unordered_map", "HAS_TR1_UNORDERED_MAP") ||
           check_hash_map(flags)
+      else
+        flags << debugging_cflags
       end
 
       if os_name_simple == "solaris"

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

@@ -103,13 +103,7 @@ define 'apr-dev' do
     emerge "apr"
   end
   on :macosx do
-    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
+    install_osx_command_line_tools
   end
 end
 
@@ -139,12 +133,6 @@ define 'apu-dev' do
     yum_install "apr-util-devel"
   end
   on :macosx do
-    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
+    install_osx_command_line_tools
   end
 end

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

@@ -49,15 +49,52 @@ module PhusionPassenger
       end
     end
     memoize :os_name_simple
-    
-    # Returns the operating system's name exactly as advertised by the system. While it is 
-    # in lowercase and contains no spaces, it can contain things like version number or 
+
+    # Returns the operating system's name exactly as advertised by the system. While it is
+    # in lowercase and contains no spaces, it can contain things like version number or
     # may be less intuitive (e.g. "darwin" for OS X).
     def self.os_name_full
       rb_config['target_os']
     end
     memoize :os_name_full
 
+    # Returns the operating system's version number, or nil if unknown.
+    # This includes the patch version, so for example on macOS Sierra
+    # it could return "10.12.5".
+    #
+    # On Debian/Ubuntu, this returns the version number (e.g. "16.04")
+    # as opposed to the codename ("Trusty").
+    def self.os_version
+      case os_name_simple
+      when 'macosx'
+        `/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?
+        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
+        end
+
+        if File.exist?('/etc/debian_version')
+          return read_file('/etc/debian_version').strip
+        end
+
+        nil
+
+      else
+        nil
+      end
+    end
+
     # The current platform's shared library extension ('so' on most Unices).
     def self.library_extension
       if os_name_simple == "macosx"

data/src/ruby_supportlib/phusion_passenger/standalone/app_finder.rb

@@ -44,23 +44,14 @@ module PhusionPassenger
       attr_reader :apps
       attr_reader :execution_root
 
-      def self.looks_like_app_directory?(dir, options = {})
-        options = options.dup
-        ConfigUtils.load_local_config_file!(dir, options)
-        return options[:app_type] ||
-          STARTUP_FILES.any? do |file|
-            File.exist?("#{dir}/#{file}")
-          end
-      end
-
       def self.supports_multi?
         false
       end
 
-      def initialize(dirs, options = {})
+      def initialize(dirs, options = {}, local_options = {})
         @dirs = dirs
         @options = options.dup
-        determine_mode_and_execution_root(options)
+        determine_mode_and_execution_root(options, local_options)
       end
 
       def scan
@@ -150,8 +141,18 @@ module PhusionPassenger
         end
       end
 
-      def looks_like_app_directory?(dir, options = {})
-        return AppFinder.looks_like_app_directory?(dir, options)
+      # Only pass `local_options` if the directory that you're checking is
+      # the directory that should be used in single mode.
+      #
+      # `local_options` must be the the value obtained from
+      # `ConfigUtils.load_local_config_file_from_app_dir_param!`.
+      def looks_like_app_directory?(dir, options = {}, local_options = {})
+        options = options.dup
+        ConfigUtils.load_local_config_file!(dir, options)
+        options[:app_type] ||
+          STARTUP_FILES.any? do |file|
+            File.exist?("#{dir}/#{file}")
+          end
       end
 
       def filename_to_server_names(filename)
@@ -170,7 +171,7 @@ module PhusionPassenger
         return !!select([io], nil, nil, timeout)
       end
 
-      def determine_mode_and_execution_root(options)
+      def determine_mode_and_execution_root(options, local_options)
         @mode = :single
         if @dirs.empty?
           @execution_root = Dir.logical_pwd

data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb

@@ -246,7 +246,7 @@ module PhusionPassenger
         :name      => :spawn_method,
         :type_desc => 'NAME',
         :default   => PlatformInfo.ruby_supports_fork? ? DEFAULT_SPAWN_METHOD : 'direct',
-        :desc      => 'The spawn method to use. Default: %DEFAULT%'
+        :desc      => 'The spawn method to use. Default: see docs'
       },
       {
         :name      => :static_files_dir,

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

@@ -195,7 +195,7 @@ module PhusionPassenger
       end
 
       def find_pid_and_log_file(execution_root, options)
-        if options[:socket_file]
+        if !options[:socket_file].nil?
           pid_basename = 'passenger.pid'
           log_basename = 'passenger.log'
         else

data/src/ruby_supportlib/phusion_passenger/standalone/start_command.rb

@@ -98,7 +98,7 @@ module PhusionPassenger
         # If you add or change an option, make sure to update the following places too:
         # - src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb,
         #   function #build_daemon_controller_options
-        # - resources/templates/config/standalone.erb
+        # - resources/templates/standalone/config.erb
         OptionParser.new do |opts|
           defaults = CONFIG_DEFAULTS
           nl = "\n" + ' ' * 37
@@ -286,7 +286,7 @@ module PhusionPassenger
 
       def find_apps
         PhusionPassenger.require_passenger_lib 'standalone/app_finder'
-        @app_finder = AppFinder.new(@argv, @options)
+        @app_finder = AppFinder.new(@argv, @options, @local_options)
         @apps = @app_finder.scan
         if @app_finder.multi_mode? && @options[:engine] != 'nginx'
           puts "Mass deployment enabled, so forcing engine to 'nginx'."
@@ -535,7 +535,12 @@ module PhusionPassenger
             @engine.stop
             STDOUT.puts " done"
             STDOUT.flush
-            File.delete(@options[:socket_file]) if @options[:engine] == "nginx" && @options[:socket_file]
+            if @options[:engine] == "nginx" && @options[:socket_file]
+              begin
+                File.delete(@options[:socket_file])
+              rescue Errno::ENOENT
+              end
+            end
           end
           @engine = nil
         end

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb

@@ -40,8 +40,8 @@ module PhusionPassenger
       private
         def start_engine_real
           write_nginx_config_file(nginx_config_path)
-          maybe_debug_nginx_config
-          test_nginx_config
+          maybe_debug_nginx_config(nginx_config_path)
+          test_nginx_config(nginx_config_path, 'nginx.conf')
 
           Standalone::ControlUtils.require_daemon_controller
           @engine = DaemonController.new(build_daemon_controller_options)
@@ -97,45 +97,45 @@ module PhusionPassenger
         end
 
 
-        def maybe_debug_nginx_config
+        def maybe_debug_nginx_config(path)
           if @options[:debug_nginx_config]
-            File.open(nginx_config_path, 'rb') do |f|
+            File.open(path, 'rb') do |f|
               puts(f.read)
             end
             exit
           end
         end
 
-        def test_nginx_config
+        def test_nginx_config(path, file)
           command = "#{Shellwords.escape @nginx_binary}" \
-            " -c #{Shellwords.escape nginx_config_path}" \
+            " -c #{Shellwords.escape path}" \
             " -p #{Shellwords.escape @working_dir}" \
             " -t"
           output = `#{command} 2>&1`
           if $? && $?.exitstatus != 0
-            output.gsub!(nginx_config_path, 'nginx.conf')
+            output.gsub!(path, file)
             output = PlatformInfo.send(:reindent, output, 4)
 
             message = "*** ERROR: the Nginx configuration that #{PROGRAM_NAME}" \
               " Standalone generated internally contains problems. The error " \
               "message returned by the Nginx engine is:\n\n" \
               "#{output}\n\n"
-            if @options[:nginx_config_template]
+            debug_log_file = Utils::TmpIO.new('passenger-standalone',
+              :suffix => '.log', :binary => true, :unlink_immediately => false)
+            begin
+              File.open(path, 'rb') do |f|
+                debug_log_file.write(f.read)
+              end
+            ensure
+              debug_log_file.close
+            end
+            if @options[:nginx_config_template] && file == 'nginx.conf'
               message << "This probably means that you have a problem in your " \
                 "Nginx configuration template. Please fix your template.\n\n" \
                 "Tip: to debug your template, re-run #{SHORT_PROGRAM_NAME} " \
                 "Standalone with the `--debug-nginx-config` option. This " \
                 "allows you to see how the final Nginx config file looks like."
             else
-              debug_log_file = Utils::TmpIO.new('passenger-standalone',
-                :suffix => '.log', :binary => true, :unlink_immediately => false)
-              begin
-                File.open(nginx_config_path, 'rb') do |f|
-                  debug_log_file.write(f.read)
-                end
-              ensure
-                debug_log_file.close
-              end
               message << "This probably means that you have found a bug in " \
                 "#{PROGRAM_NAME} Standalone. Please report this bug to our " \
                 "Github issue tracker: https://github.com/phusion/passenger/issues\n\n" \
@@ -167,7 +167,8 @@ module PhusionPassenger
             :log_file      => @options[:log_file],
             :start_timeout => 25,
             :stop_timeout  => 60,
-            :log_file_activity_timeout => 12
+            :log_file_activity_timeout => 12,
+            :dont_stop_if_pid_file_invalid => true
           }
         end
 

data/src/ruby_supportlib/phusion_passenger/standalone/stop_command.rb

@@ -48,7 +48,12 @@ module PhusionPassenger
         end
         if running
           @controller.stop
-          File.delete(@options[:socket_file]) if @options[:engine] == "nginx" && @options[:socket_file]
+          if @options[:engine] == "nginx" && @options[:socket_file]
+            begin
+              File.delete(@options[:socket_file])
+            rescue Errno::ENOENT
+            end
+          end
         else
           Standalone::ControlUtils.warn_pid_file_not_found(@options)
           exit 1

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller.rb

@@ -167,6 +167,14 @@ class DaemonController
   #
   #  The default value is 7.
   #
+  # [:dont_stop_if_pid_file_invalid]
+  #  If the :stop_command option is given, then normally daemon_controller will
+  #  always execute this command upon calling #stop. But if :dont_stop_if_pid_file_invalid
+  #  is given, then daemon_controller will not do that if the PID file does not contain
+  #  a valid number.
+  #
+  #  The default is false.
+  #
   # [:daemonize_for_me]
   #  Normally daemon_controller will wait until the daemon has daemonized into the
   #  background, in order to capture any errors that it may print on stdout or
@@ -203,6 +211,7 @@ class DaemonController
     @start_timeout = options[:start_timeout] || 15
     @stop_timeout = options[:stop_timeout] || 15
     @log_file_activity_timeout = options[:log_file_activity_timeout] || 7
+    @dont_stop_if_pid_file_invalid = options[:dont_stop_if_pid_file_invalid]
     @daemonize_for_me = options[:daemonize_for_me]
     @keep_ios = options[:keep_ios] || []
     @lock_file = determine_lock_file(options, @identifier, @pid_file)
@@ -430,6 +439,9 @@ private
 
   def kill_daemon
     if @stop_command
+      if @dont_stop_if_pid_file_invalid && read_pid_file.nil?
+        return
+      end
       begin
         run_command(@stop_command)
       rescue StartError => e
@@ -472,7 +484,11 @@ private
   end
 
   def read_pid_file
-    pid = File.read(@pid_file).strip
+    begin
+      pid = File.read(@pid_file).strip
+    rescue Errno::ENOENT
+      return nil
+    end
     if pid =~ /\A\d+\Z/
       pid.to_i
     else