passenger 5.0.23 → 5.0.24

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

@@ -73,9 +73,9 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
     :desc => "The Node.js command to use."
   },
   {
-      :name => "PassengerMeteorAppSettings",
-      :type => :string,
-      :desc => "Settings file for (non-bundled) Meteor apps."
+    :name => "PassengerMeteorAppSettings",
+    :type => :string,
+    :desc => "Settings file for (non-bundled) Meteor apps."
   },
   {
     :name => "PassengerAppEnv",

data/src/ruby_supportlib/phusion_passenger/constants.rb

@@ -44,6 +44,7 @@ module PhusionPassenger
     # Default config values
     DEFAULT_LOG_LEVEL = 3
     DEFAULT_INTEGRATION_MODE = "standalone"
+    DEFAULT_SOCKET_BACKLOG = 1024
     DEFAULT_RUBY = "ruby"
     DEFAULT_PYTHON = "python"
     DEFAULT_NODEJS = "node"

data/src/ruby_supportlib/phusion_passenger/native_support.rb

@@ -209,7 +209,7 @@ module PhusionPassenger
         return false
       end
 
-      STDERR.puts " [#{library_name}] trying to compile for the current Ruby interpreter..."
+      STDERR.puts " [#{library_name}] trying to compile for the current user (#{current_user_name_or_id}) and Ruby interpreter..."
       STDERR.puts "     (set PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0 to disable)"
 
       require 'fileutils'
@@ -224,6 +224,22 @@ module PhusionPassenger
       end
     end
 
+    # Name of the user under which we are executing, or the id as fallback
+    # N.B. loader_shared_helpers.rb has the same method 
+    def current_user_name_or_id
+      require 'etc' if !defined?(Etc)
+      begin
+        user = Etc.getpwuid(Process.uid)
+      rescue ArgumentError
+        user = nil
+      end
+      if user
+        return user.name
+      else
+        return "##{Process.uid}"
+      end
+    end
+
     def installation_target_dirs
       target_dirs = []
       if (output_dir = ENV['PASSENGER_NATIVE_SUPPORT_OUTPUT_DIR']) && !output_dir.empty?
@@ -310,37 +326,40 @@ module PhusionPassenger
         :unlink_immediately => false)
       options = { :logger => logger }
       begin
-        try_directories(target_dirs, options) do |target_dir|
-          result = nil
+        result = try_directories(target_dirs, options) do |target_dir|
+          make_result = nil
           # Perform the actual compilation in a temporary directory to avoid
           # problems with multiple processes trying to concurrently compile.
           # https://github.com/phusion/passenger/issues/1570
           PhusionPassenger::Utils.mktmpdir("passenger-native-support-") do |tmpdir|
             Dir.chdir(tmpdir) do
-              result =
+              make_result =
                 sh_nonfatal("#{PlatformInfo.ruby_command} #{Shellwords.escape extconf_rb}",
                   options) &&
                 sh_nonfatal("make", options)
-              if result
+              if make_result
                 begin
                   FileUtils.cp_r(".", target_dir)
                 rescue SystemCallError => e
                   log("Error: #{e}")
-                  result = false
+                  make_result = false
                 end
               end
             end
           end
-          if result
-            log "Compilation succesful. The logs are here:"
+          if make_result
+            log "Compilation successful. The logs are here:"
             log logger.path
             [target_dir, false]
           else
-            log "Warning: compilation didn't succeed. To learn why, read this file:"
-            log logger.path
             [nil, false]
           end
         end
+        if !result
+          log "Warning: compilation didn't succeed. To learn why, read this file:"
+          log logger.path
+        end
+        return result
       end
     ensure
       logger.close if logger
@@ -348,6 +367,7 @@ module PhusionPassenger
 
     def try_directories(dirs, options = {})
       result = nil
+      log("# current user is: #{current_user_name_or_id}", options)
       dirs.each_with_index do |dir, i|
         begin
           mkdir(dir, options)

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

@@ -86,6 +86,12 @@
 
 
 LOCATION_CONFIGURATION_OPTIONS = [
+  {
+    :name      => 'passenger_socket_backlog',
+    :type      => :integer,
+    :context   => [:main],
+    :struct   => "NGX_HTTP_MAIN_CONF_OFFSET"
+  },
   {
     :name     => 'passenger_enabled',
     :context  => [:srv, :loc, :lif],

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

@@ -117,7 +117,7 @@ module PhusionPassenger
       else
         apache2ctl = self.apache2ctl
       end
-      if os_name == "linux" &&
+      if os_name_simple == "linux" &&
          linux_distro_tags.include?(:gentoo) &&
          apache2ctl == "/usr/sbin/apache2ctl"
         # On Gentoo, `apache2ctl -V` doesn't forward the command to `apache2 -V`,
@@ -582,7 +582,7 @@ module PhusionPassenger
         apxs2_flags = `#{apxs2} -q CFLAGS`.strip << " -I" << `#{apxs2} -q INCLUDEDIR`.strip
         apxs2_flags.gsub!(/-O\d? /, '')
 
-        if os_name =~ /solaris/
+        if os_name_simple == "solaris"
           if (language == :c && !cc_is_sun_studio?) || (language == :cxx && !cxx_is_sun_studio?)
             # Remove flags not supported by GCC
             # The big problem is Coolstack apxs includes a bunch of solaris -x directives.
@@ -597,7 +597,7 @@ module PhusionPassenger
           end
         end
 
-        if os_name == "linux" &&
+        if os_name_simple == "linux" &&
            linux_distro_tags.include?(:redhat) &&
            apxs2 == "/usr/sbin/apxs" &&
            httpd_architecture_bits == 64
@@ -611,7 +611,7 @@ module PhusionPassenger
         apxs2_flags.strip!
         flags << apxs2_flags
       end
-      if !httpd.nil? && os_name == "macosx"
+      if !httpd.nil? && os_name_simple == "macosx"
         # The default Apache install on OS X is a universal binary.
         # Figure out which architectures it's compiled for and do the same
         # thing for mod_passenger. We use the 'file' utility to do this.
@@ -742,7 +742,7 @@ module PhusionPassenger
         flags = `#{apr_config} --cppflags --includes`.strip
         libs = `#{apr_config} --link-ld`.strip
         flags.gsub!(/-O\d? /, '')
-        if os_name =~ /solaris/
+        if os_name_simple == "solaris"
           if (language == :c && !cc_is_sun_studio?) || (language == :cxx && !cxx_is_sun_studio?)
             # Remove flags not supported by non-Sun Studio compilers
             flags = flags.split(/ +/).reject do |f|
@@ -750,7 +750,7 @@ module PhusionPassenger
             end
             flags = flags.join(' ')
           end
-        elsif os_name =~ /aix/
+        elsif os_name_simple == "aix"
           libs << " -Wl,-G -Wl,-brtl"
         end
         [flags, libs]
@@ -777,7 +777,7 @@ module PhusionPassenger
         flags = `#{apu_config} --includes`.strip
         libs = `#{apu_config} --link-ld`.strip
         flags.gsub!(/-O\d? /, '')
-        if os_name =~ /solaris/
+        if os_name_simple == "solaris"
           if (language == :c && !cc_is_sun_studio?) || (language == :cxx && !cxx_is_sun_studio?)
             # Remove flags not supported by non-Sun Studio compilers
             flags = flags.split(/ +/).reject do |f|

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

@@ -83,7 +83,7 @@ module PhusionPassenger
       else
         ruby_arch = cpu_architectures[0]
       end
-      return "#{ruby_engine}-#{ruby_ext_version}-#{ruby_arch}-#{os_name}"
+      return "#{ruby_engine}-#{ruby_ext_version}-#{ruby_arch}-#{os_name_simple}"
     end
     memoize :ruby_extension_binary_compatibility_id
 
@@ -109,7 +109,7 @@ module PhusionPassenger
     #   compiling a binary with the system's C++ compiler with its default
     #   options.
     def self.cxx_binary_compatibility_id
-      if os_name == "macosx"
+      if os_name_simple == "macosx"
         # RUBY_PLATFORM gives us the kernel version, but we want
         # the OS X version.
         os_version_string = `sw_vers -productVersion`.strip
@@ -132,7 +132,7 @@ module PhusionPassenger
         os_runtime = nil
       end
 
-      return [os_arch, os_name, os_runtime].compact.join("-")
+      return [os_arch, os_name_simple, os_runtime].compact.join("-")
     end
     memoize :cxx_binary_compatibility_id
   end

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

@@ -338,14 +338,14 @@ module PhusionPassenger
     end
 
     def self.cc_supports_visibility_flag?
-      return false if os_name =~ /aix/
+      return false if os_name_simple == "aix"
       return try_compile("Checking for C compiler '-fvisibility' support",
         :c, '', '-fvisibility=hidden')
     end
     memoize :cc_supports_visibility_flag?, true
 
     def self.cxx_supports_visibility_flag?
-      return false if os_name =~ /aix/
+      return false if os_name_simple == "aix"
       return try_compile("Checking for C++ compiler '-fvisibility' support",
         :cxx, '', '-fvisibility=hidden')
     end
@@ -422,7 +422,7 @@ module PhusionPassenger
     # http://gcc.gnu.org/ml/gcc-patches/2006-07/msg00861.html
     # Warnings should be suppressed with -Wno-attributes.
     def self.cc_visibility_flag_generates_warnings?
-      if os_name =~ /linux/ && `#{cc} -v 2>&1` =~ /gcc version (.*?)/
+      if os_name_simple == "linux" && `#{cc} -v 2>&1` =~ /gcc version (.*?)/
         return $1 <= "4.1.2"
       else
         return false
@@ -431,7 +431,7 @@ module PhusionPassenger
     memoize :cc_visibility_flag_generates_warnings?, true
 
     def self.cxx_visibility_flag_generates_warnings?
-      if os_name =~ /linux/ && `#{cxx} -v 2>&1` =~ /gcc version (.*?)/
+      if os_name_simple == "linux" && `#{cxx} -v 2>&1` =~ /gcc version (.*?)/
         return $1 <= "4.1.2"
       else
         return false
@@ -455,7 +455,7 @@ module PhusionPassenger
     def self.cxx_11_flag
       # C++11 support on FreeBSD 10.0 + Clang seems to be bugged.
       # http://llvm.org/bugs/show_bug.cgi?id=18310
-      return nil if os_name =~ /freebsd/
+      return nil if os_name_simple == "freebsd"
 
       source = %{
         struct Foo {
@@ -517,7 +517,7 @@ module PhusionPassenger
       if !ENV['DMALLOC_LIBS'].to_s.empty?
         return ENV['DMALLOC_LIBS']
       end
-      if os_name == "macosx"
+      if os_name_simple == "macosx"
         ['/opt/local', '/usr/local', '/usr'].each do |prefix|
           filename = "#{prefix}/lib/libdmallocthcxx.a"
           if File.exist?(filename)
@@ -532,7 +532,7 @@ module PhusionPassenger
     memoize :dmalloc_ldflags
 
     def self.electric_fence_ldflags
-      if os_name == "macosx"
+      if os_name_simple == "macosx"
         ['/opt/local', '/usr/local', '/usr'].each do |prefix|
           filename = "#{prefix}/lib/libefence.a"
           if File.exist?(filename)
@@ -547,7 +547,7 @@ module PhusionPassenger
     memoize :electric_fence_ldflags
 
     def self.export_dynamic_flags
-      if os_name == "linux"
+      if os_name_simple == "linux"
         return '-rdynamic'
       else
         return nil

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

@@ -166,28 +166,28 @@ module PhusionPassenger
           check_hash_map(flags)
       end
 
-      if os_name =~ /solaris/
+      if os_name_simple == "solaris"
         if send("#{cc_or_cxx}_is_sun_studio?")
           flags << '-mt'
         else
           flags << '-pthreads'
         end
-        if os_name =~ /solaris2\.11/
+        if os_name_full =~ /solaris2\.11/
           # skip the _XOPEN_SOURCE and _XPG4_2 definitions in later versions of Solaris / OpenIndiana
           flags << '-D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
         else
           flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
-          flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if os_name =~ /solaris2\.9/
+          flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if os_name_full =~ /solaris2\.9/
         end
-        flags << '-DBOOST_HAS_STDINT_H' unless os_name =~ /solaris2\.9/
+        flags << '-DBOOST_HAS_STDINT_H' unless os_name_full =~ /solaris2\.9/
         if send("#{cc_or_cxx}_is_sun_studio?")
           flags << '-xtarget=ultra' if RUBY_PLATFORM =~ /sparc/
         else
           flags << '-mcpu=ultrasparc' if RUBY_PLATFORM =~ /sparc/
         end
-      elsif os_name =~ /openbsd/
+      elsif os_name_simple == "openbsd"
         flags << '-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS'
-      elsif os_name =~ /aix/
+      elsif os_name_simple == "aix"
         flags << '-pthread'
         flags << '-DOXT_DISABLE_BACKTRACES'
       elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux|^arm.*-linux|sh4-linux)/
@@ -204,7 +204,7 @@ module PhusionPassenger
     def self.portability_c_or_cxx_ldflags(cc_or_cxx)
       result = ''
       result << cxx_11_flag if cc_or_cxx == :cxx && cxx_11_flag
-      if os_name =~ /solaris/
+      if os_name_simple == "solaris"
         result << ' -lxnet -lsocket -lnsl -lpthread'
       else
         result << ' -lpthread'

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

@@ -220,13 +220,13 @@ module PhusionPassenger
           else
             case platform
             when :linux
-              invoke = true if PlatformInfo.os_name =~ /linux/
+              invoke = true if PlatformInfo.os_name_simple == "linux"
             when :freebsd
-              invoke = true if PlatformInfo.os_name =~ /freebsd/
+              invoke = true if PlatformInfo.os_name_simple == "freebsd"
             when :macosx
-              invoke = true if PlatformInfo.os_name == "macosx"
+              invoke = true if PlatformInfo.os_name_simple == "macosx"
             when :solaris
-              invoke = true if PlatformInfo.os_name =~ /solaris/
+              invoke = true if PlatformInfo.os_name_simple == "solaris"
             when :other_platforms
               invoke = true
             end

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

@@ -44,7 +44,7 @@ module PhusionPassenger
     # distributions it is likely compatible with.
     # Returns nil if the operating system is not Linux.
     def self.linux_distro_tags
-      if os_name != "linux"
+      if os_name_simple != "linux"
         return nil
       end
       lsb_release = read_file("/etc/lsb-release")

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

@@ -29,7 +29,7 @@ module PhusionPassenger
 
   module PlatformInfo
     def self.openssl_extra_cflags
-      if PlatformInfo.os_name == "macosx"
+      if PlatformInfo.os_name_simple == "macosx"
         if File.exist?("/usr/include/openssl")
           ""
         else
@@ -45,7 +45,7 @@ module PhusionPassenger
     memoize :openssl_extra_cflags
 
     def self.openssl_extra_ldflags
-      if PlatformInfo.os_name == "macosx"
+      if PlatformInfo.os_name_simple == "macosx"
         if File.exist?("/usr/include/openssl")
           ""
         else

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

@@ -28,26 +28,39 @@ PhusionPassenger.require_passenger_lib 'platform_info'
 module PhusionPassenger
 
   module PlatformInfo
-    # Returns the operating system's name. This name is in lowercase and contains no spaces,
-    # and thus is suitable to be used in some kind of ID. It may contain a version number.
-    # Linux is always identified as "linux". OS X is always identified as "macosx".
-    # Identifiers for other operating systems may contain a version number, e.g. "freebsd10".
-    def self.os_name
+    # 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
+    # of the os without having to worry about version numbers, etc.
+    # N.B. unrecognized os names will just be returned as-is.
+    def self.os_name_simple
       if rb_config['target_os'] =~ /darwin/ && (sw_vers = find_command('sw_vers'))
         'macosx'
       elsif rb_config['target_os'] =~ /^linux-/
         'linux'
       elsif rb_config['target_os'] =~ /solaris/
         'solaris'
+      elsif rb_config['target_os'] =~ /freebsd/
+        'freebsd'
+      elsif rb_config['target_os'] =~ /aix/
+        'aix'
       else
         rb_config['target_os']
       end
     end
-    memoize :os_name
+    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 
+    # may be less intuitive (e.g. "darwin" for OS X).
+    def self.os_name_full
+      rb_config['target_os']
+    end
+    memoize :os_name_full
 
     # The current platform's shared library extension ('so' on most Unices).
     def self.library_extension
-      if os_name == "macosx"
+      if os_name_simple == "macosx"
         return "bundle"
       else
         return "so"
@@ -100,7 +113,7 @@ module PhusionPassenger
     def self.cpu_architectures
       uname = uname_command
       raise "The 'uname' command cannot be found" if !uname
-      if os_name == "macosx"
+      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
@@ -152,7 +165,7 @@ module PhusionPassenger
 
     # Returns whether the flock() function is supported on this OS.
     def self.supports_flock?
-      defined?(File::LOCK_EX) && os_name != 'solaris'
+      defined?(File::LOCK_EX) && os_name_simple != 'solaris'
     end
 
     # Returns whether the OS's main CPU architecture supports the

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

@@ -424,7 +424,7 @@ module PhusionPassenger
 
   private
     def self.locate_ruby_tool_by_basename(name)
-      if os_name == "macosx" &&
+      if os_name_simple == "macosx" &&
          ruby_command =~ %r(\A/System/Library/Frameworks/Ruby.framework/Versions/.*?/usr/bin/ruby\Z)
         # On OS X we must look for Ruby binaries in /usr/bin.
         # RubyGems puts executables (e.g. 'rake') in there, not in

data/src/ruby_supportlib/phusion_passenger/ruby_core_enhancements.rb

@@ -122,7 +122,7 @@ module Signal
   def self.list_trappable
     ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
     case ruby_engine
-    when "jruby"
+    when /jruby/
       result = Signal.list.dup
       result.delete("QUIT")
       result.delete("ILL")
@@ -130,7 +130,6 @@ module Signal
       result.delete("SEGV")
       result.delete("USR1")
       result.delete("IOT")
-      result.delete("EXIT")
     else
       result = Signal.list.dup
       result.delete("ALRM")
@@ -146,6 +145,7 @@ module Signal
     # Ruby engine.
     result.delete("STOP")
     result.delete("KILL")
+    result.delete("EXIT")
 
     return result
   end