passenger 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d85fbc3f95f6d5fa631a5a5a2a0750087bda1f9
-  data.tar.gz: f257bced65450de07314089bb532424d29b29bf0
+  metadata.gz: c7a420b19e2627964dfc7eaa315538d2dd03a3e3
+  data.tar.gz: 82558c78d41af58627ad79e1fca8c408a07e3f33
 SHA512:
-  metadata.gz: e52abbcbbd0d9412d11e75f683173169b991a8215106a8ec9f4802d807029dd9bebe8894587f855204fb57f8cb46ff25bcd8319443b93f1b4f6b80a3ad567491
-  data.tar.gz: 75a975eac87498c43ebfa2e57a22f3374386d74a20a5ab956b3d94a3da528f079bb3ed02abd6019b4b001f46cb2641416cb729d43b3c782391deba7a0fcaddb0
+  metadata.gz: 664d7217bfc15efb665fe9104472a6fb33d317059f180bd2c8ed1276afa513685d497e57e6bbff2a7fe562c983cafe4d6b5e79c68d3f3d7120a1bb0e4f1d213d
+  data.tar.gz: a6880e2abb069e4334777baf20682b12736b3fb3b19ed217a2a51cd4ac7ef7638f45be99a107b571d9d92f4d29c857e5ba7451c0f2d4dfa7e8559db5dd914d8b

data/CHANGELOG

@@ -1,3 +1,20 @@
+Release 5.1.3
+-------------------------------
+
+ * [Standalone] Fixes `install-standalone-runtime` command after regression in 5.1.2.
+ * Removes unnecessary logging of "No Error" from macOS Security Update Checker.
+ * Adds support for compiling against the built-in Apache installation supplied with macOS 10.12 Sierra. Previous versions of Passenger failed because macOS Sierra's Apache installation is incomplete and does not supply the apr-config tool. We now work around this by using hardcoded default values for macOS.
+ * Don't output colorized text during dependency check when output isn't a TTY, unless forced. Closes GH-1902.
+ * [Nginx] The preferred Nginx version is now 1.10.3 (previously 1.10.2).
+ * Adds Ubuntu 17.04 "Zesty" packages.
+ * [Enterprise] Fixes `send-cloud-usage` command when Passenger is installed from gem.
+ * [Enterprise] Improves robustness of machine properties reporting for pay-as-you-go cloud-license holders.
+ * [Enterprise] Adds support for reporting available RAM, and CONTAINER_HOST_IDENTIFIER envvar, to support RAM-based pricing model.
+ * Added additional debug level logging for troubleshooting issues with bash scripts. Closes GH-1928.
+ * Revert private keychain use in the Security Update Checker when run as root on macOS, in order to avoid changing the default System Keychain. Closes GH-1922. Remove Cert and Key from keychain separately, to avoid errors when clearing the client certificate.
+ * Fix missing openssl check in `passenger-install-apache2-module` dependency checker. Closes GH-1934.
+
+
 Release 5.1.2
 -------------
 
@@ -16,7 +33,7 @@ Release 5.1.1
  * Fixes some false positives (logging) from the new Node and Meteor cluster warning system. Logging is less repetitive and has extra debug info. Closes GH-1905.
  * Updates the upload-progress module in the Nginx Debian package. The module version that we linked against in 5.1.0 was 0.9.2, but due to a bug in that version the module didn't work.
  * The security update check now reports whether libcurl + SSL backend are statically linked to Passenger, in which case the check also needs to warn about relevant OpenSSL vulnerabilities in the linked library.
- * Increases the allowed line lengths emmited by apps at startup.
+ * Increases the allowed line lengths emitted by apps at startup.
  * Adds support for the unary 'not' operator in the Union Station filter language.
  * [Enterprise] Add missing flying-passenger integration mode to security update check. 
  * Fixes support for Rails 5.0.1 Action Cable. Specifically, we now support the `options` argument in the `write_nonblock` method in hijacked Rack IO sockets.
@@ -41,7 +58,7 @@ Release 5.1.0
  * Fixes an issue where passenger-config couldn't restart an app if the TMPDIR variable was set to /tmp
  * `passenger-install-apache-module` now suggests the correct apache package on Ubuntu Xenial. Closes GH-1884.
  * [Standalone] The TempDirToucher will now spend most of its time with reduced privileges, except when it's actively touching files. This allows it to be killed when Passenger is quit in most circumstances. Closes GH-1678.
- * Fixes a file overwrite vulnerability caused by a predictable temporary file being written by `passenger-install-nginx-module`. Thanks to Jeremy Evans for reporting this.
+ * Fixes a file overwrite vulnerability (CVE-2016-10345) caused by a predictable temporary file being written by `passenger-install-nginx-module`. Thanks to Jeremy Evans for reporting this.
  * [Standalone] Fixes starting Passenger as a non-extant user. Closes GH-1849.
  * Improved look of the error pages for failing to spawn an application (development & production mode), and Error ID is now also shown in production mode.
  * [Standalone] Enable ipv6 support by default in builtin nginx. Closes GH-1873.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 Phusion Holding B.V.
+Copyright (c) 2010-2017 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/bin/passenger

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/bin/passenger-config

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/bin/passenger-install-apache2-module

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -49,6 +49,7 @@ PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 PhusionPassenger.require_passenger_lib 'platform_info/linux'
+PhusionPassenger.require_passenger_lib 'platform_info/macos'
 PhusionPassenger.require_passenger_lib 'platform_info/apache'
 PhusionPassenger.require_passenger_lib 'platform_info/apache_detector'
 PhusionPassenger.require_passenger_lib 'abstract_installer'
@@ -76,6 +77,7 @@ class Installer < PhusionPassenger::AbstractInstaller
       'cc',
       'c++',
       'libcurl-dev',
+      'openssl-dev',
       'zlib-dev',
       'apache2',
       'apache2-dev',
@@ -95,14 +97,21 @@ class Installer < PhusionPassenger::AbstractInstaller
     # apr-config and apu-config are available. If they're not available,
     # then we only register them as required dependency if no Apache
     # module can be compiled without their presence.
-    if (PlatformInfo.apr_config && PlatformInfo.apu_config) ||
-       PlatformInfo.apr_config_needed_for_building_apache_modules?
+    if needs_apr_and_apu
       ids << 'apr-dev'
       ids << 'apu-dev'
     end
     return [specs, ids]
   end
 
+  def needs_apr_and_apu
+    ((PlatformInfo.apr_config && PlatformInfo.apu_config) ||
+     PlatformInfo.apr_config_needed_for_building_apache_modules?) &&
+      (PlatformInfo.apxs2 == '/usr/sbin/apxs' &&
+       (PlatformInfo.os_name_simple != "macosx" ||
+       PlatformInfo.macos_version < 12))
+  end
+
   def install_doc_url
     "https://www.phusionpassenger.com/library/install/apache/"
   end

data/bin/passenger-install-nginx-module

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/bin/passenger-memory-stats

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/bin/passenger-status

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/agent.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/apache2.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/basics.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/common_library.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/cxx_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/documentation.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010, 2011, 2012 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/integration_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/misc.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/nginx.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/node_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion Holding B.V.
+#  Copyright (c) 2013-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/oxt_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/packaging.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -108,6 +108,9 @@ def homebrew_dir
   return "/tmp/homebrew"
 end
 
+def homebrew_tap_dir
+  return "/tmp/homebrew_tap"
+end
 
 task :clobber => 'package:clean'
 
@@ -355,12 +358,22 @@ task 'package:update_homebrew' do
   sh "cd #{homebrew_dir} && git commit -a -m 'passenger #{version}'"
   sh "cd #{homebrew_dir} && git push -f"
   if boolean_option('HOMEBREW_TEST', true)
-    sh "cp /tmp/homebrew/Formula/passenger.rb /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/passenger.rb"
+    sh "cp #{homebrew_dir}/Formula/passenger.rb $(brew --prefix)/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/passenger.rb"
+    if `brew info nginx` !~ /^Not installed$/
+      sh "brew uninstall nginx"
+    end
+    if `brew info nginx-passenger-enterprise` !~ /^Not installed$/
+      sh "brew uninstall nginx-passenger-enterprise"
+    end
     if `brew info passenger` !~ /^Not installed$/
       sh "brew uninstall passenger"
     end
+    if `brew info passenger-enterprise` !~ /^Not installed$/
+      sh "brew uninstall passenger-enterprise"
+    end
     sh "cp #{PKG_DIR}/passenger-#{version}.tar.gz `brew --cache`/"
     sh "brew install passenger"
+    sh "brew install nginx --with-passenger"
     Rake::Task['test:integration:native_packaging'].invoke
   end
 end

data/build/ruby_extension.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/ruby_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/support/cplusplus.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -29,6 +29,7 @@ def run_compiler(*command)
   show_command = command.join(' ')
   puts show_command
   if !system(*command)
+    colors = PhusionPassenger::Utils::AnsiColors.new
     if $? && $?.exitstatus == 4
       # This probably means the compiler ran out of memory.
       msg = "<b>" +
@@ -38,7 +39,7 @@ def run_compiler(*command)
             "this problem, try increasing your swap space: " +
             "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
             "</b>"
-      fail(PhusionPassenger::Utils::AnsiColors.ansi_colorize(msg))
+      fail(colors.ansi_colorize(msg))
     elsif $? && $?.termsig == 9
       msg = "<b>" +
             "-----------------------------------------------\n" +
@@ -47,7 +48,7 @@ def run_compiler(*command)
             "this problem, try increasing your swap space: " +
             "https://www.digitalocean.com/community/articles/how-to-add-swap-on-ubuntu-12-04" +
             "</b>"
-      fail(PhusionPassenger::Utils::AnsiColors.ansi_colorize(msg))
+      fail(colors.ansi_colorize(msg))
     else
       fail "Command failed with status (#{$? ? $?.exitstatus : 1}): [#{show_command}]"
     end

data/build/support/cxx_dependency_map.rb

@@ -6135,7 +6135,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/thread.hpp",
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/cxx_supportlib/Crypto.h"=>
-  [],
+  ["src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/oxt/macros.hpp"],
  "src/cxx_supportlib/DataStructures/HashedStaticString.h"=>
   ["src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",

data/build/support/general.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/build/test_basics.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.

data/dev/ci/run_travis.sh

@@ -267,7 +267,8 @@ fi
 if [[ "$TEST_APACHE2" = 1 ]]; then
 	if [[ "$TRAVIS_OS_NAME" == 'osx' ]]; then
 		brew_update
-		run brew install pcre openssl
+		run brew upgrade openssl || run brew install openssl
+		run brew upgrade pcre || run brew install pcre
 		if [[ "`sw_vers -productVersion | sed 's/^10\.\(.*\)/\1>=12.0/' | bc -l`" == "1" ]] ; then
 			run brew install apr apr-util
 			run brew link apr apr-util --force

data/dev/copy_boost_headers

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#  Copyright (c) 2010-2017 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -174,8 +174,8 @@ end
 def copy_dependencies(cflags)
   done = false
   while !done
-    compiler_output = `c++ test.cpp -c -I. #{cflags} 2>&1`
-    File.unlink('test.o')
+    compiler_output = `c++ test.cpp -c -I. -I.. #{cflags} 2>&1`
+    File.unlink('test.o') if File.exist?('test.o')
     missing_headers = compiler_output.
       split("\n").
       grep(/(error: .*: No such file|fatal error: '.*' file not found)/).

data/dev/index_cxx_dependencies.rb

@@ -114,6 +114,9 @@ EXCLUDE_NAME_REGEXP = %r{
     |linux/
     |tr1/
     |curl/
+    |openssl/
+    |CoreFoundation/
+    |Security/
     |ruby
     |apr_
     |ap_
@@ -126,7 +129,7 @@ def extract_dependencies(source)
   result = []
   File.open(source, "r") do |f|
     f.each do |line|
-      next if line !~ /^[\s\t]*#include (<.+?>|".+?")/
+      next if line !~ /^\s*#include (<.+?>|".+?")/
 
       raw_name = $1
       name = raw_name.gsub(/["<>]/, "")
@@ -192,7 +195,6 @@ end
 def generate_full_map(basic_map)
   result = {}
   basic_map.keys.sort.each do |source_file|
-    deps = basic_map[source_file]
     gather_results = {}
     gather_all_dependencies_recursively(
       source_file, basic_map, gather_results)

data/doc/Users guide Apache.html

@@ -1641,7 +1641,7 @@ Report security vulnerabilities to <a href="mailto:security@phusion.nl">security
 <div class="paragraph"><p>This documentation has moved. Please visit <a href="https://www.phusionpassenger.com/library/config/apache/reference/#passengerdefaultgroup">https://www.phusionpassenger.com/library/config/apache/reference/#passengerdefaultgroup</a></p></div>
 </div>
 <div class="sect3">
-<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_passengershowversioninheader_lt_on_off_gt"></span><h4 data-comment-topic="passengershowversioninheader-on-off--d8rvr0" data-anchor="_passengershowversioninheader_lt_on_off_gt">7.5.6. PassengerShowVersionInHeader &lt;on|off&gt;</h4>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_passengershowversioninheader_lt_on_off_gt"></span><h4 data-comment-topic="passengershowversioninheader-on-off--2iocj2" data-anchor="_passengershowversioninheader_lt_on_off_gt">7.5.6. PassengerShowVersionInHeader &lt;on|off&gt;</h4>
 <div class="paragraph"><p>This documentation has moved. Please visit <a href="https://www.phusionpassenger.com/library/config/apache/reference/#passengershowversioninheader">https://www.phusionpassenger.com/library/config/apache/reference/#passengershowversioninheader</a></p></div>
 </div>
 <div class="sect3">

data/resources/templates/error_layout.html.template

@@ -79,7 +79,7 @@
        text. Thank you.
        -->
       <div class="column">
-        This website is powered by <b>Passenger</b>&reg;, a rock-solid, feature-rich web application server that integrates with Apache and Nginx.
+        This website is powered by <b>Passenger</b>&reg;, a rock-solid, feature-rich web application server that integrates with Apache and Nginx built by <b>Phusion</b>&reg;.
       </div>
     </footer>
   </body>

data/resources/templates/undisclosed_error.html.template

@@ -44,7 +44,7 @@
        text. Thank you.
        -->
       <div class="column">
-        This website is powered by <b>Passenger</b>&reg;, a rock-solid, feature-rich web application server that integrates with Apache and Nginx.
+        This website is powered by <b>Passenger</b>&reg;, a rock-solid, feature-rich web application server that integrates with Apache and Nginx built by <b>Phusion</b>&reg;.
       </div>
     </footer>
     <script>

data/src/agent/AgentMain.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2014-2015 Phusion Holding B.V.
+ *  Copyright (c) 2014-2017 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.