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

checksums.yaml CHANGED

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGU3ZWRlNTY4YTI4N2JiYjg2M2U2YTlmMjg0OTEwNWU1M2JkZWRjMQ==
+    OTQ4ODcwNGVkY2M5MjQwMDYwOTdhMzczODk3YmNkZDU5NGU4YTY2OQ==
   data.tar.gz: !binary |-
-    NGFhZjc4YWI1MTNhZTU5NTk3ZGY2MWZkYmUwZjZmMDBhNDdmODk4Nw==
+    YTQzYTY3NGIxMDM1MGM4NmZhNTdiZGIwYTYzM2VlYjkzZjk4NDM5Yg==
 SHA512:
   metadata.gz: !binary |-
-    NDA0ZmIyNmY2ODQ0ODdhMDlkNzkzODgwNjk1MTQ1ZTc0ODhmZDdjNDRkOWI2
-    OWMyYTM4ZmIyZjA3NTQ3NmRiMTM2NjNmMmNmNmJkZjliODg3MDQ0M2FiZjIy
-    NDYyNzY1ZTBhMmQ3MWMyZDM0MDdhOTVmOTczZjNmMTNjOWQxZjI=
+    YTliMmZjZjE2YzY2MmJhYTljNWJhMTczMTRkY2M5ZGVkNGE5N2FmZGUzM2Zl
+    M2Y5YTc5Mzg5ZDQwOGM4ODMzMWYxY2FmZGExYWJmYjU2MjhkNTMwYzZhODdh
+    MjA0MzVlYmQzMGU5OWE3ZDNhYzg4YzcyYWU0NTdjNGUwN2Y3NDU=
   data.tar.gz: !binary |-
-    NDU4YjAxNzc4YTIxODNiYTRjYjY4Y2VkNWZhYTY0ZWU2ZWQyODE0MGI1NDJh
-    MDJkYjg4NDgzOTdmYmNkMTcyYjkzMWVkM2QyOTg0MWI0MjQ0MWRjNTFkM2Zl
-    NDMzODhjZmE3NTAzN2FhMWM4MjUwYzE2OWJhYmZlODJjNGYzMzI=
+    MDEzN2JiZjgyNGI3ODQzMWIyNzM0NTNmYjM1MTgxMmMwNmQ1MDQ2YWRkMjdm
+    OTY2MzA4NjJmOTljZjFmYTkwZmYyY2M5OTdiZmM0YjY3Yzg2MjQ1YzdmMzQ0
+    NjAwYTY2ZDc5MWQ3YTVhZGM1MmY3ZTc0NjFjYWU2OGM1ZWUyNTE=

checksums.yaml.gz.asc CHANGED

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
-iQEcBAABAgAGBQJWBVguAAoJECrHRaUKISqM9UYH/Rex0SrCvVUTeChbuA/c4qSK
-r6Kt0FDl+krahxG3FReSg0sIB86uvUL0r8Axqd32VnOIpbYBgmzBw3+RKW9p15Cg
-UGpeKpphF+vV42V8pJTTbfOzqLmkVZdiqXj8bStOD5HGguIKUJSQlO1vgT1dXiMu
-SXZVl+2l7yredGoh/J+NxGdLVrXGyHsR9SK2/aOWayC/271jl1038ATIjLpg5Sx4
-mH0WBDCjbj7EE2dLG9ihsd9O6FRQLc2LHkenqULzbJasOEWBUmiI4UMmGhSuRa/+
-+NPpYdok38hYlHBzClyXOV/7AmMLG97MBZOa6X/Dall5v/lCMpVhdpJHJzrzO7E=
-=55ZZ
+iQEcBAABAgAGBQJWKKTjAAoJECrHRaUKISqMaR4H/38J99ZVo8qmXpS9WoXt+7rr
+/g+AUPWmnBXYhJet7B7ogHXb7+hSUolFJ/OE7xoysIEzcx5hGXQq2OoTCvHTPx+x
+f5EiDcG4OjQsrQX8ZJ/GcO8jmWfwocqyjY5CdZsFiDx3ImgkQcmVgCSQLWCxg+l+
+I6Nkit7c5MUYq4MvV8mruMu07dUZhog4XLcig7Xxa7QcHTfyIo2vCdE0/oHFNXr9
+iLJI+IR/+wMvYTvFZsu9V33HZITARf8i54QIhodUQs8KXFrB505mH0Vk5Wcxl1aI
+/TUvCUd/3ofxh7/SNxUJ2TEXN/pKWZJ8Bz+IMg8V7RQxGlQXYY3gan5vN2T1NIU=
+=Dipw
 -----END PGP SIGNATURE-----

data.tar.gz.asc CHANGED

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
-iQEcBAABAgAGBQJWBVguAAoJECrHRaUKISqMnD0H/RmCI5vqS9MtfHzF9CRTJ8mG
-2izv4FJ6Te1JU272ZijuVR9A62lT5bdsaJQG93Gm6XVmQEFuMSeM9rlyB96F0UfP
-Bc47/Bt5mRd1S5TxK67bhQKifmjt9601uD1GgXa4cqiYLtYDcOQFY5YR52uj8U1A
-13GxzAWWEfqHxhMFR6IGSErYLhqtwy7g24DnyQtmHhn5qy2eL0ECnshczMoah6FI
-4rgPH7cY86LiRugDBAKq9Jp4KgBfIU7i2pKkgtUzE4PVVirq9ZeqdBpQGIiznMHX
-glxwM2XGuXm0/8K8N2iMefULIU9XUPmYxA6+1wADIC0KK5fp0Ai6vThFrI/+dko=
-=1Jp0
+iQEcBAABAgAGBQJWKKTiAAoJECrHRaUKISqM7GIIAIor29tWIX30te8/L2/V4aJp
+y0SglTVjTtv/+xatscskG2KJVAmFD970QktbTu8oGEppk8iNZrilrKs8Y+ZbudUa
+gNsu0iIplkk/FnscZAqtlRO63VdUtNwlETW8vjDHFktNQ9MgXQkZvc+8Sjq2687R
+wVdtizCrN3SJvzLECnHrdys7m18xPaDrLWA+1yRvhmt8JzrRg0MepJllvTVotuma
++Olo3LigFisPHcjgAneFJ2xylgfS/koc6yph7OFDPsr7h2inuzlMPMXvkSEpI1w8
+07lf65Quxgw23QgbyIAcHG17rg7laVs5C6OdBHctr7tkyk2jWvVdvD1J85AC8c4=
+=UZWX
 -----END PGP SIGNATURE-----

data/CHANGELOG CHANGED

@@ -1,3 +1,17 @@
+Release 5.0.21
+--------------
+ * Properly handles Ruby applications that output the `Content-Length` and `Transfer-Encoding` headers in non-standard casing, e.g. `Content-length`. Closes GH-1517.
+ * Fixes Ruby application loading incompatibilities caused by the use of absolute paths. Closes GH-1596.
+ * Fixes OpenSSL detection problems on OS X 10.11 El Capitan. OS X 10.11 no longer includes OpenSSL headers, so Passenger will suggest and use OpenSSL from Homebrew. Closes GH-1630.
+ * Introduces the [secure HTTP headers](https://www.phusionpassenger.com/library/indepth/meteor/secure_http_headers.html) feature for Node.js and Meteor apps. This mechanism allows Passenger to send per-request information to the application, while guaranteeing that this information is not spoofed by the client.
+ * Per-request Apache environment variables are now passed to Node.js and Meteor apps through the [`!~Passenger-Envvars`](https://www.phusionpassenger.com/library/indepth/nodejs/apache_per_request_envvars.html) secure header.
+ * Fixes some unintentional caching of request-specific environment variables. Closes GH-1479.
+ * For Node.js applications, Passenger now calls `process.emit('message', 'shutdown')` whenever Passenger shuts down an application process. This is the same hook as used by PM2, allowing applications which use the PM2 graceful shutdown mechanism to be run on Passenger without changes.
+ * [Enterprise] Fixes a bug in passenger-irb where printing strings larger than 64 KB would cause it to crash.
+ * [Enterprise] Fixes the `passenger-config restart-app` command so that it performs a non-rolling-restart unless `--rolling-restart` is given as command line option, as per the documentation. Previously, `passenger-config restart-app` without `--rolling-restart` would perform a rolling restart if rolling restarts are configured in the configuration file, but this contradicted documented behavior. Closes GH-1634.
 Release 5.0.20
 --------------

data/CONTRIBUTORS CHANGED

@@ -52,6 +52,7 @@ John Leach
 Joshua Lund
 jpatterson
 Jude Nagurney
+Kenneth Powers
 Luuk Hendriks (Phusion)
 MAEDA Go
 Magnus Holm

data/README.md CHANGED

@@ -44,4 +44,4 @@ Ruby users can also build a gem from the Git repository and install the gem.
 ## Legal
-Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+"Passenger", "Phusion Passenger" and "Union Station" are registered trademarks of Phusion Holding B.V.

data/Rakefile CHANGED

@@ -1,5 +1,8 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (C) 2008-2015  Phusion
+#  Copyright (C) 2008-2015  Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by

data/bin/passenger CHANGED

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 #  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/bin/passenger-config CHANGED

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 #  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/bin/passenger-install-apache2-module CHANGED

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
 # 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
@@ -75,7 +76,6 @@ class Installer < PhusionPassenger::AbstractInstaller
       'cc',
       'c++',
       'libcurl-dev',
-      'openssl-dev',
       'zlib-dev',
       'apache2',
       'apache2-dev',

data/bin/passenger-install-nginx-module CHANGED

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 #  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
@@ -38,9 +39,11 @@ require 'digest/sha2'
 require 'optparse'
 require 'fileutils'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'platform_info/openssl'
 PhusionPassenger.require_passenger_lib 'abstract_installer'
 PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
+PhusionPassenger.require_passenger_lib 'utils/shellwords'
 DOWNLOAD_OPTION = {
   :connect_timeout => 30,
@@ -539,11 +542,15 @@ private
   end
   def build_nginx_configure_command(prefix, extra_configure_flags = nil)
+    extra_cflags = "-Wno-error #{PlatformInfo.openssl_extra_cflags}".strip
+    extra_ldflags = PlatformInfo.openssl_extra_ldflags
     command = "sh ./configure --prefix='#{prefix}' "
     command << "--with-http_ssl_module "
     command << "--with-http_gzip_static_module "
     command << "--with-http_stub_status_module "
-    command << "--with-cc-opt='-Wno-error' "
+    command << "--with-cc-opt=#{Shellwords.escape extra_cflags} "
+    command << "--with-ld-opt=#{Shellwords.escape extra_ldflags} "
     if @pcre_source_dir
       command << "--with-pcre='#{@pcre_source_dir}' "
     elsif !pcre_is_installed?

data/bin/passenger-memory-stats CHANGED

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 #  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/bin/passenger-status CHANGED

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 #  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/build/agent.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
@@ -66,7 +67,7 @@ end
 # Define compilation task for the agent executable.
 agent_libs = COMMON_LIBRARY.
   only(:base, :bas64, :json, :union_station_filter, :other).
-  exclude('AgentsStarter.o')
+  exclude('WatchdogLauncher.o')
 dependencies = AGENT_OBJECTS.keys + [
   LIBBOOST_OXT,
   agent_libs.link_objects,

data/build/apache2.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/build/basics.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/build/common_library.rb CHANGED

@@ -1,8 +1,9 @@
 # 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
@@ -100,16 +101,16 @@ end
 ########## libev ##########
 if USE_VENDORED_LIBEV
-  LIBEV_SOURCE_DIR = File.expand_path("../src/cxx_supportlib/vendor-copy/libev", File.dirname(__FILE__)) + "/"
-  LIBEV_CFLAGS = "-Isrc/cxx_supportlib/vendor-copy/libev"
+  LIBEV_SOURCE_DIR = File.expand_path("../src/cxx_supportlib/vendor-modified/libev", File.dirname(__FILE__)) + "/"
+  LIBEV_CFLAGS = "-Isrc/cxx_supportlib/vendor-modified/libev"
   LIBEV_TARGET = LIBEV_OUTPUT_DIR + ".libs/libev.a"
   task :libev => LIBEV_TARGET
   dependencies = [
-    "src/cxx_supportlib/vendor-copy/libev/configure",
-    "src/cxx_supportlib/vendor-copy/libev/config.h.in",
-    "src/cxx_supportlib/vendor-copy/libev/Makefile.am"
+    "src/cxx_supportlib/vendor-modified/libev/configure",
+    "src/cxx_supportlib/vendor-modified/libev/config.h.in",
+    "src/cxx_supportlib/vendor-modified/libev/Makefile.am"
   ]
   file LIBEV_OUTPUT_DIR + "Makefile" => dependencies do
     cc = CC
@@ -128,7 +129,7 @@ if USE_VENDORED_LIBEV
       "CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}' orig_CFLAGS=1"
   end
-  libev_sources = Dir["src/cxx_supportlib/vendor-copy/libev/{*.c,*.h}"]
+  libev_sources = Dir["src/cxx_supportlib/vendor-modified/libev/{*.c,*.h}"]
   file LIBEV_OUTPUT_DIR + ".libs/libev.a" => [LIBEV_OUTPUT_DIR + "Makefile"] + libev_sources do
     sh "rm -f #{LIBEV_OUTPUT_DIR}libev.la"
     sh "cd #{LIBEV_OUTPUT_DIR} && make libev.la V=1"

data/build/cplusplus_support.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/build/cxx_dependency_map.rb CHANGED

@@ -154,7 +154,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -233,7 +232,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -312,7 +310,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -391,7 +388,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -470,7 +466,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -550,7 +545,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -629,7 +623,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -708,7 +701,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -787,7 +779,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -866,7 +857,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -954,7 +944,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1057,7 +1046,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1141,7 +1129,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1225,7 +1212,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1309,7 +1295,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1393,7 +1378,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1477,7 +1461,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1561,7 +1544,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1645,7 +1627,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1748,7 +1729,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -1980,7 +1960,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -2114,7 +2093,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -2259,46 +2237,16 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/cxx_supportlib/Utils/Timer.h",
    "src/cxx_supportlib/Utils/HttpConstants.h",
-   "src/cxx_supportlib/AgentsStarter.h",
+   "src/cxx_supportlib/WatchdogLauncher.h",
    "src/cxx_supportlib/MessageClient.h",
    "src/cxx_supportlib/ResourceLocator.h",
    "src/cxx_supportlib/Utils/IniFile.h",
+   "src/cxx_supportlib/Utils/ClassUtils.h",
    "src/apache2_module/SetHeaders.cpp"],
  "src/apache2_module/MergeDirConfig.cpp"=>
   [],
  "src/apache2_module/SetHeaders.cpp"=>
   [],
- "src/cxx_supportlib/AgentsStarter.cpp"=>
-  ["src/cxx_supportlib/oxt/thread.hpp",
-   "src/cxx_supportlib/oxt/macros.hpp",
-   "src/cxx_supportlib/oxt/system_calls.hpp",
-   "src/cxx_supportlib/oxt/detail/context.hpp",
-   "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
-   "src/cxx_supportlib/AgentsStarter.h",
-   "src/cxx_supportlib/oxt/backtrace.hpp",
-   "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
-   "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
-   "src/cxx_supportlib/Constants.h",
-   "src/cxx_supportlib/FileDescriptor.h",
-   "src/cxx_supportlib/Logging.h",
-   "src/cxx_supportlib/Utils/FastStringStream.h",
-   "src/cxx_supportlib/Exceptions.h",
-   "src/cxx_supportlib/oxt/tracable_exception.hpp",
-   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
-   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
-   "src/cxx_supportlib/MessageClient.h",
-   "src/cxx_supportlib/StaticString.h",
-   "src/cxx_supportlib/Utils/MessageIO.h",
-   "src/cxx_supportlib/Utils/MemZeroGuard.h",
-   "src/cxx_supportlib/Utils/ScopeGuard.h",
-   "src/cxx_supportlib/Utils/IOUtils.h",
-   "src/cxx_supportlib/Utils/StrIntUtils.h",
-   "src/cxx_supportlib/ResourceLocator.h",
-   "src/cxx_supportlib/Utils.h",
-   "src/cxx_supportlib/Utils/LargeFiles.h",
-   "src/cxx_supportlib/Utils/IniFile.h",
-   "src/cxx_supportlib/Utils/Timer.h",
-   "src/cxx_supportlib/Utils/VariantMap.h"],
  "src/cxx_supportlib/AppTypes.cpp"=>
   ["src/cxx_supportlib/AppTypes.h",
    "src/cxx_supportlib/Exceptions.h",
@@ -2491,6 +2439,38 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/HashMap.h",
    "src/cxx_supportlib/Utils/StrIntUtils.h",
    "src/cxx_supportlib/Utils/IOUtils.h"],
+ "src/cxx_supportlib/WatchdogLauncher.cpp"=>
+  ["src/cxx_supportlib/oxt/thread.hpp",
+   "src/cxx_supportlib/oxt/macros.hpp",
+   "src/cxx_supportlib/oxt/system_calls.hpp",
+   "src/cxx_supportlib/oxt/detail/context.hpp",
+   "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
+   "src/cxx_supportlib/WatchdogLauncher.h",
+   "src/cxx_supportlib/oxt/backtrace.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
+   "src/cxx_supportlib/Constants.h",
+   "src/cxx_supportlib/FileDescriptor.h",
+   "src/cxx_supportlib/Logging.h",
+   "src/cxx_supportlib/Utils/FastStringStream.h",
+   "src/cxx_supportlib/Exceptions.h",
+   "src/cxx_supportlib/oxt/tracable_exception.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
+   "src/cxx_supportlib/MessageClient.h",
+   "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/Utils/MessageIO.h",
+   "src/cxx_supportlib/Utils/MemZeroGuard.h",
+   "src/cxx_supportlib/Utils/ScopeGuard.h",
+   "src/cxx_supportlib/Utils/IOUtils.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/ResourceLocator.h",
+   "src/cxx_supportlib/Utils.h",
+   "src/cxx_supportlib/Utils/LargeFiles.h",
+   "src/cxx_supportlib/Utils/IniFile.h",
+   "src/cxx_supportlib/Utils/Timer.h",
+   "src/cxx_supportlib/Utils/VariantMap.h",
+   "src/cxx_supportlib/Utils/ClassUtils.h"],
  "src/agent/Core/ApiServer.h"=>
   ["src/cxx_supportlib/oxt/thread.hpp",
    "src/cxx_supportlib/oxt/macros.hpp",
@@ -2560,7 +2540,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Options.h",
    "src/cxx_supportlib/AppTypes.h",
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -2669,7 +2648,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -2731,7 +2709,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -2782,7 +2759,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -2835,7 +2811,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -2877,7 +2852,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/SystemTime.h",
    "src/cxx_supportlib/Utils/../Exceptions.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/UnionStation/Core.h",
@@ -2929,7 +2903,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -2989,7 +2962,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/cxx_supportlib/Constants.h",
@@ -3053,7 +3025,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -3136,7 +3107,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -3211,7 +3181,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -3270,7 +3239,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -3418,7 +3386,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -3521,7 +3488,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -3661,7 +3627,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Options.h",
    "src/cxx_supportlib/AppTypes.h",
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -3832,7 +3797,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -3884,7 +3848,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -3936,7 +3899,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -3972,7 +3934,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/cxx_supportlib/Constants.h",
@@ -4080,7 +4041,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -4132,7 +4092,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -4165,7 +4124,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/../Exceptions.h",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/cxx_supportlib/Constants.h",
@@ -4348,7 +4306,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -4500,7 +4457,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Options.h",
    "src/cxx_supportlib/AppTypes.h",
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -4879,7 +4835,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -4971,53 +4926,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/HashMap.h"],
  "src/apache2_module/Hooks.h"=>
   [],
- "src/cxx_supportlib/Account.h"=>
-  ["src/cxx_supportlib/StaticString.h",
-   "src/cxx_supportlib/oxt/macros.hpp",
-   "src/cxx_supportlib/Exceptions.h",
-   "src/cxx_supportlib/oxt/tracable_exception.hpp",
-   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
-   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
-   "src/cxx_supportlib/Utils/StrIntUtils.h"],
- "src/cxx_supportlib/AccountsDatabase.h"=>
-  ["src/cxx_supportlib/Account.h",
-   "src/cxx_supportlib/StaticString.h",
-   "src/cxx_supportlib/oxt/macros.hpp",
-   "src/cxx_supportlib/Exceptions.h",
-   "src/cxx_supportlib/oxt/tracable_exception.hpp",
-   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
-   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
-   "src/cxx_supportlib/Utils/StrIntUtils.h"],
- "src/cxx_supportlib/AgentsStarter.h"=>
-  ["src/cxx_supportlib/oxt/system_calls.hpp",
-   "src/cxx_supportlib/oxt/macros.hpp",
-   "src/cxx_supportlib/oxt/backtrace.hpp",
-   "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
-   "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
-   "src/cxx_supportlib/Constants.h",
-   "src/cxx_supportlib/FileDescriptor.h",
-   "src/cxx_supportlib/Logging.h",
-   "src/cxx_supportlib/oxt/thread.hpp",
-   "src/cxx_supportlib/oxt/detail/context.hpp",
-   "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
-   "src/cxx_supportlib/Utils/FastStringStream.h",
-   "src/cxx_supportlib/Exceptions.h",
-   "src/cxx_supportlib/oxt/tracable_exception.hpp",
-   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
-   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
-   "src/cxx_supportlib/MessageClient.h",
-   "src/cxx_supportlib/StaticString.h",
-   "src/cxx_supportlib/Utils/MessageIO.h",
-   "src/cxx_supportlib/Utils/MemZeroGuard.h",
-   "src/cxx_supportlib/Utils/ScopeGuard.h",
-   "src/cxx_supportlib/Utils/IOUtils.h",
-   "src/cxx_supportlib/Utils/StrIntUtils.h",
-   "src/cxx_supportlib/ResourceLocator.h",
-   "src/cxx_supportlib/Utils.h",
-   "src/cxx_supportlib/Utils/LargeFiles.h",
-   "src/cxx_supportlib/Utils/IniFile.h",
-   "src/cxx_supportlib/Utils/Timer.h",
-   "src/cxx_supportlib/Utils/VariantMap.h"],
  "src/cxx_supportlib/AppTypes.h"=>
   ["src/cxx_supportlib/Exceptions.h",
    "src/cxx_supportlib/oxt/tracable_exception.hpp",
@@ -5989,6 +5897,37 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
    "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
    "src/cxx_supportlib/Utils/LargeFiles.h"],
+ "src/cxx_supportlib/WatchdogLauncher.h"=>
+  ["src/cxx_supportlib/oxt/system_calls.hpp",
+   "src/cxx_supportlib/oxt/macros.hpp",
+   "src/cxx_supportlib/oxt/backtrace.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/backtrace_enabled.hpp",
+   "src/cxx_supportlib/Constants.h",
+   "src/cxx_supportlib/FileDescriptor.h",
+   "src/cxx_supportlib/Logging.h",
+   "src/cxx_supportlib/oxt/thread.hpp",
+   "src/cxx_supportlib/oxt/detail/context.hpp",
+   "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
+   "src/cxx_supportlib/Utils/FastStringStream.h",
+   "src/cxx_supportlib/Exceptions.h",
+   "src/cxx_supportlib/oxt/tracable_exception.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_disabled.hpp",
+   "src/cxx_supportlib/oxt/detail/tracable_exception_enabled.hpp",
+   "src/cxx_supportlib/MessageClient.h",
+   "src/cxx_supportlib/StaticString.h",
+   "src/cxx_supportlib/Utils/MessageIO.h",
+   "src/cxx_supportlib/Utils/MemZeroGuard.h",
+   "src/cxx_supportlib/Utils/ScopeGuard.h",
+   "src/cxx_supportlib/Utils/IOUtils.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
+   "src/cxx_supportlib/ResourceLocator.h",
+   "src/cxx_supportlib/Utils.h",
+   "src/cxx_supportlib/Utils/LargeFiles.h",
+   "src/cxx_supportlib/Utils/IniFile.h",
+   "src/cxx_supportlib/Utils/Timer.h",
+   "src/cxx_supportlib/Utils/VariantMap.h",
+   "src/cxx_supportlib/Utils/ClassUtils.h"],
  "src/nginx_module/Configuration.h"=>
   ["src/nginx_module/ConfigurationFields.h"],
  "src/nginx_module/ConfigurationFields.h"=>
@@ -6019,7 +5958,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h"],
  "src/nginx_module/ngx_http_passenger_module.h"=>
-  ["src/cxx_supportlib/AgentsStarter.h",
+  ["src/cxx_supportlib/WatchdogLauncher.h",
    "src/cxx_supportlib/oxt/system_calls.hpp",
    "src/cxx_supportlib/oxt/macros.hpp",
    "src/cxx_supportlib/oxt/backtrace.hpp",
@@ -6049,6 +5988,7 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/IniFile.h",
    "src/cxx_supportlib/Utils/Timer.h",
    "src/cxx_supportlib/Utils/VariantMap.h",
+   "src/cxx_supportlib/Utils/ClassUtils.h",
    "src/cxx_supportlib/AppTypes.h",
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/SystemTime.h",
@@ -6307,7 +6247,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -6387,7 +6326,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -6476,7 +6414,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -6575,7 +6512,6 @@ CXX_DEPENDENCY_MAP =
    "src/agent/Core/ApplicationPool/Options.h",
    "src/cxx_supportlib/AppTypes.h",
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -6707,7 +6643,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/agent/Core/UnionStation/Core.h",
    "src/agent/Core/UnionStation/Connection.h",
    "src/agent/Core/UnionStation/Transaction.h",
@@ -6795,7 +6730,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",
@@ -6853,7 +6787,6 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/Utils/CachedFileStat.hpp",
    "src/cxx_supportlib/Utils/StringMap.h",
    "src/cxx_supportlib/Utils/HashMap.h",
-   "src/cxx_supportlib/Account.h",
    "src/cxx_supportlib/DataStructures/HashedStaticString.h",
    "src/cxx_supportlib/Utils/Hasher.h",
    "src/agent/Core/SpawningKit/Result.h",