passenger 5.0.20 → 5.0.21

data/src/ruby_supportlib/phusion_passenger/ruby_core_io_enhancements.rb

@@ -1,8 +1,9 @@
 # encoding: binary
 #  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/simple_benchmarking.rb

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010 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/standalone/app_finder.rb

@@ -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
@@ -143,9 +144,9 @@ module PhusionPassenger
 
       def find_app_root
         if @dirs.empty?
-          return File.absolute_path_no_resolve(".")
+          return File.absolute_logical_path(".")
         else
-          return File.absolute_path_no_resolve(@dirs[0])
+          return File.absolute_logical_path(@dirs[0])
         end
       end
 
@@ -172,11 +173,11 @@ module PhusionPassenger
       def determine_mode_and_execution_root(options)
         @mode = :single
         if @dirs.empty?
-          @execution_root = Dir.pwd_no_resolve
+          @execution_root = Dir.logical_pwd
         elsif @dirs.size == 1
-          @execution_root = File.absolute_path_no_resolve(@dirs[0])
+          @execution_root = File.absolute_logical_path(@dirs[0])
         else
-          @execution_root = Dir.pwd_no_resolve
+          @execution_root = Dir.logical_pwd
         end
       end
 

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

@@ -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/standalone/config_utils.rb

@@ -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
@@ -91,7 +92,7 @@ module PhusionPassenger
       # it's specified.
       def resolve_config_file_paths(config_file_options, config_filename)
         options = config_file_options
-        config_file_dir = File.dirname(File.absolute_path_no_resolve(config_filename))
+        config_file_dir = File.dirname(File.absolute_logical_path(config_filename))
 
         keys = [:socket_file, :ssl_certificate, :ssl_certificate_key, :log_file,
           :pid_file, :instance_registry_dir, :data_buffer_dir, :meteor_app_settings,

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

@@ -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/standalone/main.rb

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2014 Phusion
+#  Copyright (c) 2013-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/standalone/start_command.rb

@@ -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
@@ -113,6 +114,8 @@ module PhusionPassenger
         # Clear @parsed_options so that #remerge_all_options works.
         options.clear
 
+        logical_pwd = Dir.logical_pwd
+
         # 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
@@ -135,7 +138,7 @@ module PhusionPassenger
           opts.on("-S", "--socket FILE", String,
             "Bind to Unix domain socket instead of TCP#{nl}" +
             "socket") do |value|
-            options[:socket_file] = File.absolute_path_no_resolve(value)
+            options[:socket_file] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--ssl", "Enable SSL support (Nginx#{nl}" +
             "engine only)") do
@@ -144,11 +147,11 @@ module PhusionPassenger
           opts.on("--ssl-certificate PATH", String,
             "Specify the SSL certificate path#{nl}" +
             "(Nginx engine only)") do |value|
-            options[:ssl_certificate] = File.absolute_path_no_resolve(value)
+            options[:ssl_certificate] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--ssl-certificate-key PATH", String,
             "Specify the SSL key path") do |value|
-            options[:ssl_certificate_key] = File.absolute_path_no_resolve(value)
+            options[:ssl_certificate_key] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--ssl-port PORT", Integer,
             "Listen for SSL on this port, while#{nl}" +
@@ -166,18 +169,18 @@ module PhusionPassenger
           opts.on("--log-file FILENAME", String,
             "Where to write log messages. Default:#{nl}" +
             "console, or /dev/null when daemonized") do |value|
-            options[:log_file] = File.absolute_path_no_resolve(value)
+            options[:log_file] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--pid-file FILENAME", String, "Where to store the PID file") do |value|
-            options[:pid_file] = File.absolute_path_no_resolve(value)
+            options[:pid_file] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--instance-registry-dir PATH", String,
             "Use the given instance registry directory") do |value|
-            options[:instance_registry_dir] = File.absolute_path_no_resolve(value)
+            options[:instance_registry_dir] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--data-buffer-dir PATH", String,
             "Use the given data buffer directory") do |value|
-            options[:data_buffer_dir] = File.absolute_path_no_resolve(value)
+            options[:data_buffer_dir] = File.absolute_logical_path(value, logical_pwd)
           end
 
           opts.separator ""
@@ -199,13 +202,13 @@ module PhusionPassenger
           end
           opts.on("--meteor-app-settings FILENAME", String,
             "Settings file to use for (development mode) Meteor apps") do |value|
-            options[:meteor_app_settings] = File.absolute_path_no_resolve(value)
+            options[:meteor_app_settings] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("-R", "--rackup FILE", String,
             "Consider application a Ruby app, and use#{nl}" +
             "the given rackup file") do |value|
             options[:app_type] = "rack"
-            options[:startup_file] = File.absolute_path_no_resolve(value)
+            options[:startup_file] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--app-type NAME", String,
             "Force app to be detected as the given type") do |value|
@@ -213,7 +216,7 @@ module PhusionPassenger
           end
           opts.on("--startup-file FILENAME", String,
             "Force given startup file to be used") do |value|
-            options[:startup_file] = File.absolute_path_no_resolve(value)
+            options[:startup_file] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--spawn-method NAME", String,
             "The spawn method to use. Default: #{DEFAULT_OPTIONS[:spawn_method]}") do |value|
@@ -221,11 +224,11 @@ module PhusionPassenger
           end
           opts.on("--static-files-dir PATH", String,
             "Specify the static files dir (Nginx engine#{nl}" +
-            "only)") do |val|
-            options[:static_files_dir] = File.absolute_path_no_resolve(val)
+            "only)") do |value|
+            options[:static_files_dir] = File.absolute_logical_path(value, logical_pwd)
           end
-          opts.on("--restart-dir PATH", String, "Specify the restart dir") do |val|
-            options[:restart_dir] = File.absolute_path_no_resolve(val)
+          opts.on("--restart-dir PATH", String, "Specify the restart dir") do |value|
+            options[:restart_dir] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--friendly-error-pages", "Turn on friendly error pages") do
             options[:friendly_error_pages] = true
@@ -328,7 +331,7 @@ module PhusionPassenger
           opts.separator ""
           opts.separator "Nginx engine options:"
           opts.on("--nginx-bin FILENAME", String, "Nginx binary to use as core") do |value|
-            options[:nginx_bin] = File.absolute_path_no_resolve(value)
+            options[:nginx_bin] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--nginx-version VERSION", String,
             "Nginx version to use as core.#{nl}" +
@@ -339,12 +342,12 @@ module PhusionPassenger
             "If Nginx needs to be installed, then the#{nl}" +
             "given tarball will be used instead of#{nl}" +
             "downloading from the Internet") do |value|
-            options[:nginx_tarball] = File.absolute_path_no_resolve(value)
+            options[:nginx_tarball] = File.absolute_logical_path(value, logical_pwd)
           end
           opts.on("--nginx-config-template FILENAME", String,
             "The template to use for generating the#{nl}" +
             "Nginx config file") do |value|
-            options[:nginx_config_template] = File.absolute_path_no_resolve(value)
+            options[:nginx_config_template] = File.absolute_logical_path(value, logical_pwd)
           end
 
           opts.separator ""
@@ -394,7 +397,7 @@ module PhusionPassenger
 
       def load_local_config_file
         if @argv.empty?
-          app_dir = File.absolute_path_no_resolve(".")
+          app_dir = Dir.logical_pwd
         elsif @argv.size == 1
           app_dir = @argv[0]
         end

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

@@ -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/standalone/start_command/nginx_engine.rb

@@ -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/standalone/status_command.rb

@@ -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
@@ -75,8 +76,12 @@ module PhusionPassenger
       def find_pid_file
         return if @options[:pid_file]
 
+        logical_pwd = Dir.logical_pwd
+
         ["tmp/pids", "."].each do |dir|
-          path = File.absolute_path_no_resolve("#{dir}/passenger.#{@options[:port]}.pid")
+          path = File.absolute_logical_path(
+            "#{dir}/passenger.#{@options[:port]}.pid",
+            logical_pwd)
           if File.exist?(path)
             @options[:pid_file] = path
             return

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

@@ -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
@@ -79,8 +80,12 @@ module PhusionPassenger
       def find_pid_file
         return if @options[:pid_file]
 
+        logical_pwd = Dir.logical_pwd
+
         ["tmp/pids", "."].each do |dir|
-          path = File.absolute_path_no_resolve("#{dir}/passenger.#{@options[:port]}.pid")
+          path = File.absolute_logical_path(
+            "#{dir}/passenger.#{@options[:port]}.pid",
+            logical_pwd)
           if File.exist?(path)
             @options[:pid_file] = path
             return

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

@@ -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
@@ -29,7 +30,8 @@ module PhusionPassenger
       def run
         puts "Phusion Passenger version #{VERSION_STRING}"
         puts
-        puts '"Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.'
+        puts '"Passenger", "Phusion Passenger" and "Union Station" ' \
+          'are registered trademarks of Phusion Holding B.V.'
       end
     end
 

data/src/ruby_supportlib/phusion_passenger/utils.rb

@@ -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

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

@@ -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/utils/download.rb

@@ -1,8 +1,9 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2014 Phusion
+#  Copyright (c) 2013-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/utils/file_system_watcher.rb

@@ -1,7 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010 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/utils/hosts_file_parser.rb

@@ -1,8 +1,9 @@
 # encoding: binary
 #  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/utils/lock.rb

@@ -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/utils/native_support_utils.rb

@@ -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/utils/progress_bar.rb

@@ -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