RubyGems - passenger - Versions diffs - 5.0.20 → 5.0.21 - Mend

passenger 5.0.20 → 5.0.21

Potentially problematic release.

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

Files changed (408) hide show

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2012-2015 Phusion
+#  Copyright (c) 2012-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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
@@ -294,8 +295,8 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'Utils/LargeFiles.o',
     :source   => 'Utils/LargeFiles.cpp',
     :category => :other
-  define_component 'AgentsStarter.o',
-    :source   => 'AgentsStarter.cpp',
+  define_component 'WatchdogLauncher.o',
+    :source   => 'WatchdogLauncher.cpp',
     :category => :other
   define_component 'MemoryKit/mbuf.o',
     :source   => 'MemoryKit/mbuf.cpp',
@@ -337,5 +338,5 @@ end
 # A subset of the objects are linked to the Nginx binary. This defines
 # what those objects are.
-NGINX_LIBS_SELECTOR = [:base, 'AgentsStarter.o', 'AppTypes.o',
+NGINX_LIBS_SELECTOR = [:base, 'WatchdogLauncher.o', 'AppTypes.o',
   'Utils/CachedFileStat.o', 'UnionStationFilterSupport.o']

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion
+#  Copyright (c) 2010-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,9 +1,10 @@
 #  encoding: utf-8
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion
+#  Copyright (c) 2010-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2013 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,9 +1,10 @@
 # encoding: utf-8
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2015 Phusion
+#  Copyright (c) 2013-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,9 +1,10 @@
 #  encoding: utf-8
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion
+#  Copyright (c) 2010-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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
@@ -30,6 +31,7 @@ PhusionPassenger.require_passenger_lib 'common_library'
 PhusionPassenger.require_passenger_lib 'config/installation_utils'
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 PhusionPassenger.require_passenger_lib 'platform_info/compiler'
 PhusionPassenger.require_passenger_lib 'utils/shellwords'
 PhusionPassenger.require_passenger_lib 'utils/progress_bar'
@@ -41,6 +43,26 @@ module PhusionPassenger
     class NginxEngineCompiler < AbstractInstaller
       include InstallationUtils
+      def self.configure_script_options
+        extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags}".strip
+        result = "--with-cc-opt=#{Shellwords.escape extra_cflags} "
+        extra_ldflags = PlatformInfo.openssl_extra_ldflags
+        if !extra_ldflags.empty?
+          result << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
+        end
+        result << "--without-http_fastcgi_module " \
+          "--without-http_scgi_module " \
+          "--without-http_uwsgi_module " \
+          "--with-http_gzip_static_module " \
+          "--with-http_stub_status_module " \
+          "--with-http_ssl_module " \
+          "--with-http_realip_module"
+        result
+      end
     protected
       def dependencies
         specs = [
@@ -302,7 +324,7 @@ module PhusionPassenger
         # work around the problem by configure Nginx with prefix
         # /tmp.
         command << "#{shell} ./configure --prefix=/tmp " +
-          "#{STANDALONE_NGINX_CONFIGURE_OPTIONS} " +
+          "#{self.class.configure_script_options} " +
           "--add-module=#{Shellwords.escape PhusionPassenger.nginx_module_source_dir}"
         run_command_yield_activity(command) do
           yield

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2015 Phusion
+#  Copyright (c) 2013-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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
@@ -224,7 +225,7 @@ module PhusionPassenger
           request.content_type = "application/json"
           request.body = PhusionPassenger::Utils::JSON.generate(
             :name => group_name,
-            :method => restart_method)
+            :restart_method => restart_method)
           response = @instance.http_request("agents.s/core_api", request)
           if response.code.to_i / 100 == 2
             response.body

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2014 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,8 +1,9 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,8 +1,9 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2014 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion
+#  Copyright (c) 2010-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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
@@ -108,15 +109,6 @@ module PhusionPassenger
     RPM_DEV_PACKAGE           = "passenger-devel"
     RPM_APACHE_MODULE_PACKAGE = "mod_passenger"
     RPM_NGINX_PACKAGE         = "nginx"
-    STANDALONE_NGINX_CONFIGURE_OPTIONS =
-      "--with-cc-opt='-Wno-error' " <<
-      "--without-http_fastcgi_module " <<
-      "--without-http_scgi_module " <<
-      "--without-http_uwsgi_module " <<
-      "--with-http_gzip_static_module " <<
-      "--with-http_stub_status_module " <<
-      "--with-http_ssl_module " <<
-      "--with-http_realip_module"
   end
   SharedConstants.constants.each do |name|

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

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2013 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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

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

@@ -1,8 +1,9 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2011-2015 Phusion
+#  Copyright (c) 2011-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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
@@ -24,6 +25,7 @@
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'public_api'
+PhusionPassenger.require_passenger_lib 'ruby_core_enhancements'
 PhusionPassenger.require_passenger_lib 'debug_logging'
 PhusionPassenger.require_passenger_lib 'utils/shellwords'
@@ -314,6 +316,23 @@ module PhusionPassenger
       UnionStationHooks.check_initialized
     end
+    # If the current working directory equals `app_root`, and `abs_path` is a
+    # file inside `app_root`, then returns its basename. Otherwise, returns
+    # `abs_path`.
+    #
+    # The main use case for this method is to ensure that we load config.ru
+    # with a relative path (only its base name) in most circumstances,
+    # instead of with an absolute path. This is necessary in order to retain
+    # compatibility with apps that expect config.ru's __FILE__ to be relative.
+    # See https://github.com/phusion/passenger/issues/1596
+    def maybe_make_path_relative_to_app_root(app_root, abs_path)
+      if Dir.logical_pwd == app_root && File.dirname(abs_path) == app_root
+        File.basename(abs_path)
+      else
+        abs_path
+      end
+    end
     def create_socket_address(protocol, address)
       if protocol == 'unix'
         return "unix:#{address}"

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

@@ -1,8 +1,9 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion
+#  Copyright (c) 2010-2015 Phusion Holding B.V.
 #
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#  "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
@@ -231,6 +232,11 @@ module PhusionPassenger
       args.each do |arg|
         message << arg.to_s << DELIMITER
       end
+      if message.size > 2 ** 16 - 1
+        raise ArgumentError, 'Message size too large'
+      end
       @io.write([message.size].pack('n') << message)
       @io.flush
     end