passenger 6.0.4 → 6.0.7

data/src/ruby_supportlib/phusion_passenger/loader_shared_helpers.rb

@@ -316,9 +316,11 @@ module PhusionPassenger
           ActiveRecord::Base.clear_all_connections!
         elsif ActiveRecord::Base.respond_to?(:clear_active_connections!)
           ActiveRecord::Base.clear_active_connections!
-        elsif ActiveRecord::Base.respond_to?(:connected?) &&
-              ActiveRecord::Base.connected?
+        end
+        begin
           ActiveRecord::Base.establish_connection
+        rescue
+          DebugLogging.debug('ActiveRecord is not configured, start it yourself')
         end
       end
 

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

@@ -476,6 +476,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :dynamic_default => "'smart' for Ruby apps, 'direct' for all other apps",
     :type     => :string
   },
+  {
+    :name     => 'passenger_direct_instance_request_address',
+    :scope    => :application,
+    :default  => DEFAULT_BIND_ADDRESS,
+    :type     => :string
+  },
   {
     :name     => 'passenger_load_shell_envvars',
     :scope    => :application,
@@ -556,6 +562,14 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :header   => nil
   },
+  {
+    :name     => 'passenger_temp_path',
+    :scope    => :location,
+    :type     => :string,
+    :function => 'ngx_conf_set_path_slot',
+    :field    => 'upstream_config.temp_path',
+    :auto_generate_nginx_tracking_code => false
+  },
   {
     :name     => 'passenger_ignore_headers',
     :scope    => :location,
@@ -681,6 +695,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :default  => DEFAULT_STICKY_SESSIONS_COOKIE_NAME
   },
+  {
+    :name     => 'passenger_sticky_sessions_cookie_attributes',
+    :scope    => :location,
+    :type     => :string,
+    :default  => DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES
+  },
   {
     :name     => 'passenger_vary_turbocache_by_cookie',
     :scope    => :location,

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

@@ -890,7 +890,7 @@ 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" \
+            ["-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

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

@@ -279,7 +279,7 @@ module PhusionPassenger
           "-c '#{filename}' -o '#{filename}.o'",
           flags)
         result = run_compiler(description, command, filename, source, true)
-        result = result && result[:result] && result[:output] !~ /unknown warning option/i
+        result = result && result[:result] && result[:output] !~ /unknown warning option|unrecognized command line option/i
       end
       return false if !result
 

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

@@ -25,6 +25,16 @@
 
 PhusionPassenger.require_passenger_lib 'utils/tee_input'
 
+if defined?(::Rack::BodyProxy) && !::Rack::BodyProxy.new("").respond_to?(:each)
+  module ::Rack
+    class BodyProxy
+      def each
+        @body.each { |body| yield body }
+      end
+    end
+  end
+end
+
 module PhusionPassenger
   module Rack
 

data/src/ruby_supportlib/phusion_passenger/request_handler.rb

@@ -99,7 +99,7 @@ module PhusionPassenger
       if should_use_unix_sockets?
         @main_socket_address, @main_socket = create_unix_socket_on_filesystem(options)
       else
-        @main_socket_address, @main_socket = create_tcp_socket
+        @main_socket_address, @main_socket = create_tcp_socket(options)
       end
       @server_sockets[:main] = {
         :address     => @main_socket_address,
@@ -109,7 +109,7 @@ module PhusionPassenger
         :accept_http_requests => true
       }
 
-      @http_socket_address, @http_socket = create_tcp_socket
+      @http_socket_address, @http_socket = create_tcp_socket(options)
       @server_sockets[:http] = {
         :address     => @http_socket_address,
         :socket      => @http_socket,
@@ -309,16 +309,17 @@ module PhusionPassenger
       end
     end
 
-    def create_tcp_socket
-      # We use "0.0.0.0" as address in order to force
+    def create_tcp_socket(options)
+      # We default to "127.0.0.1" as address in order to force
       # TCPv4 instead of TCPv6.
-      socket = TCPServer.new('0.0.0.0', 0)
+      bind_address = options.fetch('bind_address', '127.0.0.1')
+      socket = TCPServer.new(bind_address, 0)
       socket.listen(BACKLOG_SIZE)
       socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       socket.binmode
       socket.sync = true
       socket.close_on_exec!
-      socket_address = "tcp://127.0.0.1:#{socket.addr[1]}"
+      socket_address = "tcp://#{bind_address}:#{socket.addr[1]}"
       return [socket_address, socket]
     end
 

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

@@ -258,6 +258,13 @@ module PhusionPassenger
         :default   => PlatformInfo.ruby_supports_fork? ? DEFAULT_SPAWN_METHOD : 'direct',
         :desc      => 'The spawn method to use. Default: see docs'
       },
+      {
+        :name      => :direct_instance_request_address,
+        :type      => :hostname,
+        :type_desc => 'HOST',
+        :default   => '127.0.0.1',
+        :desc      => "The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.\nDefault: %DEFAULT%"
+      },
       {
         :name      => :static_files_dir,
         :type      => :path,
@@ -436,6 +443,12 @@ module PhusionPassenger
         :desc      => "Cookie name to use for sticky sessions.\n" \
                       "Default: #{DEFAULT_STICKY_SESSIONS_COOKIE_NAME}"
       },
+      {
+        :name      => :sticky_sessions_cookie_attributes,
+        :type_desc => "'NAME1=VALUE1; NAME2'",
+        :desc      => "The attributes to use for the sticky session cookie.\n" \
+                      "Default: #{DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES}"
+      },
       {
         :name      => :vary_turbocache_by_cookie,
         :type_desc => 'NAME',

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

@@ -175,6 +175,7 @@ module PhusionPassenger
           add_flag_param(command, :sticky_sessions, "--sticky-sessions")
           add_param(command, :vary_turbocache_by_cookie, "--vary-turbocache-by-cookie")
           add_param(command, :sticky_sessions_cookie_name, "--sticky-sessions-cookie-name")
+          add_param(command, :sticky_sessions_cookie_attributes, "--sticky-sessions-cookie-attributes")
           add_param(command, :ruby, "--ruby")
           add_param(command, :python, "--python")
           add_param(command, :nodejs, "--nodejs")
@@ -230,7 +231,7 @@ module PhusionPassenger
             abort "The '#{option_name}' feature is only available in #{PROGRAM_NAME} " +
               "Enterprise. You are currently running the open source #{PROGRAM_NAME}. " +
               "Please learn more about and/or buy #{PROGRAM_NAME} Enterprise at " +
-              "https://www.phusionpassenger.com/enterprise"
+              "https://www.phusionpassenger.com/features#premium-features"
           end
         end
 
@@ -239,7 +240,7 @@ module PhusionPassenger
             abort "The '#{option_name}' feature is only available in #{PROGRAM_NAME} " +
               "Enterprise. You are currently running the open source #{PROGRAM_NAME}. " +
               "Please learn more about and/or buy #{PROGRAM_NAME} Enterprise at " +
-              "https://www.phusionpassenger.com/enterprise"
+              "https://www.phusionpassenger.com/features#premium-features"
           end
         end
 

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

@@ -286,7 +286,7 @@ module PhusionPassenger
           if fix_existing_indenting
             # Remove extraneous indenting by 'if' blocks
             # and collapse multiple empty newlines
-            result.gsub!(/;[\n ]+/, ";\n")
+            result.gsub!(/;[\n ]+$/, ";\n")
           end
 
           # Set indenting

data/src/ruby_supportlib/phusion_passenger/utils/unseekable_socket.rb

@@ -24,6 +24,10 @@
 
 PhusionPassenger.require_passenger_lib 'utils'   # So that we can know whether #writev is supported.
 
+# https://www.ruby-lang.org/en/news/2019/12/12/separation-of-positional-and-keyword-arguments-in-ruby-3-0/
+def ruby2_keywords(*)
+end if RUBY_VERSION < "2.7"
+
 module PhusionPassenger
   module Utils
 
@@ -117,7 +121,7 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def write_nonblock(string, *args)
+      ruby2_keywords def write_nonblock(string, *args)
         @socket.write_nonblock(string, *args)
       rescue => e
         raise annotate(e)
@@ -141,25 +145,25 @@ module PhusionPassenger
         raise annotate(e)
       end if IO.method_defined?(:writev3)
 
-      def send(*args)
+      ruby2_keywords def send(*args)
         @socket.send(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def sendmsg(*args)
+      ruby2_keywords def sendmsg(*args)
         @socket.sendmsg(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def sendmsg_nonblock(*args)
+      ruby2_keywords def sendmsg_nonblock(*args)
         @socket.sendmsg_nonblock(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def puts(*args)
+      ruby2_keywords def puts(*args)
         @socket.puts(*args)
       rescue => e
         raise annotate(e)
@@ -172,7 +176,7 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def read(*args)
+      ruby2_keywords def read(*args)
         if @simulate_eof
           length, buffer = args
           if buffer
@@ -191,14 +195,14 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def read_nonblock(*args)
+      ruby2_keywords def read_nonblock(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.read_nonblock(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def readpartial(*args)
+      ruby2_keywords def readpartial(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.readpartial(*args)
       rescue => e
@@ -212,21 +216,21 @@ module PhusionPassenger
         raise annotate(e)
       end
 
-      def recv(*args)
+      ruby2_keywords def recv(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.recv(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def recvfrom(*args)
+      ruby2_keywords def recvfrom(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.recvfrom(*args)
       rescue => e
         raise annotate(e)
       end
 
-      def recvfrom_nonblock(*args)
+      ruby2_keywords def recvfrom_nonblock(*args)
         raise EOFError, "end of file reached" if @simulate_eof
         @socket.recvfrom_nonblock(*args)
       rescue => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 6.0.4
+  version: 6.0.7
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -4443,7 +4443,14 @@ files:
 - src/schema_printer/SchemaPrinterMain.cpp.cxxcodebuilder
 homepage: https://www.phusionpassenger.com/
 licenses: []
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/phusion/passenger/issues
+  changelog_uri: https://github.com/phusion/passenger/blob/stable-6.0/CHANGELOG
+  documentation_uri: https://www.phusionpassenger.com/docs/
+  homepage_uri: https://www.phusionpassenger.com/
+  source_code_uri: https://github.com/phusion/passenger
+  mailing_list_uri: https://www.phusionpassenger.com/contact
+  wiki_uri: https://github.com/phusion/passenger/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -4459,7 +4466,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: passenger
+rubyforge_project: 
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4