passenger 5.0.9 → 5.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFhY2FmOWRiZWQ2ZjZkZmZjMTMzMjY1YTdmMjIyMTdjMjY5Njg5MA==
+    NTE3MDk3NTZhM2E0YmZjYjRlMGQ1MTU2NDZmNzBmZTlhNmE4NWI0OQ==
   data.tar.gz: !binary |-
-    NTU2MGZmMWFhZmE1ZWI1MDQ3MWU5NjBjMmE1MGEyNjNkMTBjYzllYQ==
+    ZmU4MjYyZGJjOWI5ZTJjODUwYzM3MTc3YWVlNDA5MWY0MDllOTQyZQ==
 SHA512:
   metadata.gz: !binary |-
-    Mjg3NTEyMzgzYTU4Yjk3OGExMGYxZDkwZjlhODc0OGIyMjUxNDI1N2JiY2I5
-    MWE2ODM1OTRiMGQwZWU2MGE2MDg1MzVkM2RmOTUwNjUwOGNmYTAxNTZiODI0
-    M2FiM2RkNWUyYjRiZmU3MGYwODE1YjllNzlmOGU1YWNhNDFkODM=
+    NzdjNDJlMjQ3ZDJkZTg1N2YwMmExYTYxNDM3OWM1YTI0ZGE5MWRhZTBjYjM4
+    YTk4ZGE1OGUyZTVhYWMxZDVhN2YyMjBiZWI0ZDNkNDFiN2Y5M2Y0OTY1Njgx
+    ODNlZmQ4NzQwMzI2OTYwN2ZmYzAxMWJkZGQwN2Q1NjI5MDc5NDI=
   data.tar.gz: !binary |-
-    YWFmZjI1MzI3ZmRiZjgxMTZjYjFkZGE3NGUyYWZkYThiNmI4YjYyNTY5NWJl
-    NDYxMDRlNzU1NGQyNWZkN2JmNjVmNTc3ODBkNWMxOTE3YmJiYjNlNjA4ZTE1
-    Yzc0ZGJiOTQ0MzQ4ZTZiZTY4Yjg4YmU5MzYwYjIwOTQ3YTIwOWQ=
+    MmFkMmMxMzNmYzQ2YWQ5MDc5ZjE1ODU0YzVlMzRiNGEyOWE4ZWRmNTE5NTI4
+    YWQxYTgxMWIyNTJmZWJjM2FjYzA3ODY5Yzc0OTI2NTU0OGZiZjJkNjlmYjY2
+    NTI0ODU4MWQ5NDc1MDI3YWMzYTZkZjlhZDIyZDk4OTg2NTZlOGU=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVb0YJAAoJECrHRaUKISqMfcIIAIii/TpyNGySvg08YS36RVU5
-wJi6g3Y8UZ04Kjd9Ccdn8c1JXJbOR3JYY1Dl+8MP8ZIqBuIx0MnVXcj4Vn1RxFjj
-GSIBKpRtpiIpajeqsULfsHOOyc0sZqZJzISh6WFgYhAZC0x7gEJoB217PJd2YK2h
-PxegmOj2+2EGB86T9LhG9u8QIdoQgvydnnE4mNfnNBAKDMFrG9f86HqetlBy2PK5
-EqmV1nysqM4w8F/tLhiwB34/t4zUFVLsGfw1Ek+hHCyKmAMJRsBchrWF40ZJdlB0
-O7Tv52czrajhazEYsNajvj9HmN2eQL1Wv3H7Tm0pChB/TRweahmVAXYG40PBsR4=
-=QFWp
+iQEcBAABAgAGBQJVeH8AAAoJECrHRaUKISqMiO4IAKoKQUyUaazkuMdhIcm92NQB
+NXuz0Cv+ckyoJIc6IRBNiXXaV+uys67pAYhQQVLcuVaTQ3BN5M4JylZQbad8soSY
+A70O2pL6vdIovVfiGFacesLphy6cSjAJ75EG5Vh2D/RcSRwVQvoeFvRjyU72pAsY
+ixXiM8DT+jw09FHphD4dFozh8adD3yuqKIUWCPE7qkPKD9G5Inu2QzIUpUJQQ7bh
+6G58J0ohn2AL18qRIVIFrrGjxc1M4fPgwQFDK+a/+NhEDeAQH5KgfQ6wqSS1Lz0i
+dG1+jqntPM8Be6FzzWYTB1L+uVd8IfE9UM1+REgvGJG8roGISWlC+3tWl5Mp14E=
+=68/m
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVb0YJAAoJECrHRaUKISqMPRsIAIdmYwKUqKv0J9nS3gFUBBGa
-BPOS+uxmWtItdk3QfbxSlIZlCKehSB/tnn/L64fspxIx+cPUDh+h4A2/dKlSRl8z
-fhn1gOOBdaidK+pvMiqjHja3ssXwfD2S2zANWrBFU8zJgjx0/DvE/lqsb1JkOQRT
-Tukdj/vitrhySTaKvbOjE0lXljuAD+AFMI92yypBsiTXdb3Dg2VKd0NhcedI0+2m
-LSvCXKgP+/X6iqSRuIoLfWKzSdnoGeZqNDYwc8nm9TxbWAlpQ1DVS6vQgCsAztA2
-dDeJxWdS8V4pirjoddT/TpvEqrPRSjiS3uPRXwH4u2i/6uCl98xZ5t2v9q7+svQ=
-=1sKu
+iQEcBAABAgAGBQJVeH7/AAoJECrHRaUKISqMQZ8H/RnWcjNuNcpgRko+KV6nLxof
+/meZflUvmMn6QvR2kE4f4zEsGrhwoP5w17f4+gvg19b8IfSOrqHOFrET8rc4UEUu
+TOytgbpyPD4BGSjjy4LCn5Ldv+AA/VE3817IZuozo+j6NuQ6qcKReeNt8K4DXDZ6
+aPSRwuY5zqWpK/g69e1byqxn5LrotoyLSmmbpCDObQxAXDHelnluRw1JiEFzojAj
+6ObZj/i7XbHnGKIa3QsvdEh1y63Lnc8T+7N1seukqceLmbQ+D85cWuE7BEbTJhBA
+/8+RF4t1v5tuRaXOPaQKDT/SD+Re3KO5kuuNc8a6q4TiLVGyJ3eApkilqFzCEsA=
+=LCRZ
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,17 @@
+Release 5.0.10
+--------------
+
+ * It is now possible to run `passenger-status`, `passenger-config restart-app` and other admin commands without using sudo. When run without sudo, these admin commands will allow you to operate on apps and processes that are owned by the user that invoked the admin command. Closes GH-1392.
+ * Fixes a crash introduces in 5.0.9 due to not properly initializing a variable. Closes GH-1530.
+ * The `passenger-config reopen-logs` command now works by instructing the Watchdog process to reopen the log file, while instructing the other Passenger processes to re-inerhit the log file from the Watchdog instead of trying to reopen the log file on their own. This makes log file reopening more robust. Closes GH-1452.
+ * `passenger-config restart-app` no longer leaves the terminal in a state with black background. Closes GH-1526.
+ * `passenger-config admin-command` has been renamed to `passenger-config api-call` in order to avoid confusion with any potential admin interfaces that we will introduce in the future.
+ * If Union Station support is enabled, process and system metrics weren't being sent correctly to Union Station. This has been fixed.
+ * [Enterprise] Fixes the fact that the Passenger Enterprise RPM didn't correctly set SELinux permissions on its own files.
+ * [Apache] passenger-install-apache2-module no longer aborts with an error if the Apache configuration file contains errors. Closes GH-1525.
+ * [Apache] Fixes a typo that would cause passenger-install-apache2-module to crash on Red Hat and CentOS systems on which the SELinux command line tools are not installed. Closes GH-1527.
+
+
 Release 5.0.9
 -------------
 
@@ -163,6 +177,7 @@ Release 5.0.0 release candidate 1
  * [Nginx] It is no longer necessary to re-specify `passenger_enabled` in `location` contexts. Closes GH-1338.
  * [Enterprise] Fixed a bug in mass deployment reloading.
  * [Enterprise] Fixed a bug in mass deployment daemonization.
+ * [Enterprise] Fixed passenger-irb. Closes GH-1350.
  * [Enterprise] The mass deployment mode now supports the `app_type` and `startup_file` configuration options in Passengerfile.json/passenger-standalone.json. Closes GH-1366.
 
 

data/CONTRIBUTORS

@@ -13,6 +13,7 @@ Chad Fowler
 Chris Walquist
 Christoffer Sawicki
 Clemens Gruber
+Cody Russell
 Damien Le Berrigaud
 Dan Peterson
 Danial Pearce
@@ -25,6 +26,7 @@ Dmitry Galinsky
 Dylan Vaughn
 Erik Ogan
 Evan Phoenix
+Fedor Sumkin
 flygoast
 Gaspard Bucher
 Goffert van Gool (Phusion)
@@ -44,6 +46,7 @@ Jan Berkel
 Jason Cannon
 jastix
 Jay Freeman (saurik)
+jbergler
 John Dewey
 John Leach
 Joshua Lund
@@ -66,8 +69,10 @@ Paul Kmiec
 Pepijn Looije
 Perry Smith
 Philip M. Gollucci
+Radagaisus
 Redmar Kerkhoff
 remi
+Richard Michael
 Rob Paisley
 Robin Bowes
 Ryan Schwartz
@@ -77,6 +82,7 @@ Sam Pohlenz
 Sean Wilkinson
 Sebastian Delmont
 Slippy Douglas
+Stephen Bannasch
 Tim Bishop
 Tim Carey-Smith
 Tinco Andringa (Phusion)

data/README.md

@@ -4,7 +4,7 @@
 
 What makes it so fast and reliable is its **C++** core, its **zero-copy** architecture, its **watchdog** system and its **hybrid** evented, multi-threaded and multi-process design.
 
-<a href="http://vimeo.com/phusionnl/review/80475623/c16e940d1f"><img src="http://blog.phusion.nl/wp-content/uploads/2014/01/gameofthrones.jpg" height="300"></a><br><em>Phusion Passenger used in Game of Thrones Ascention</em>
+<a href="http://vimeo.com/phusionnl/review/80475623/c16e940d1f"><img src="http://blog.phusion.nl/wp-content/uploads/2014/01/gameofthrones.jpg" height="300"></a><br><em>Phusion Passenger used in Game of Thrones Ascent</em>
 
 **Learn more:** [Website](https://www.phusionpassenger.com/) | [Documentation](https://www.phusionpassenger.com/documentation_and_support) | [Support resources](https://www.phusionpassenger.com/documentation_and_support) | [Github](https://github.com/phusion/passenger) | [Twitter](https://twitter.com/phusion_nl) | [Blog](http://blog.phusion.nl/)
 

data/bin/passenger-install-apache2-module

@@ -162,7 +162,7 @@ private
     begin
       sestatus = `sestatus`
       getenforce = `getenforce`
-    rescue Errno::ENOTENT
+    rescue Errno::ENOENT
       return
     end
 
@@ -281,21 +281,34 @@ private
     # Server compiled with....
     #  -D APACHE_MPM_DIR="server/mpm/prefork"
     output = PlatformInfo.apache2ctl_V
-    output =~ /^Server MPM: +(.*)$/
-    if $1
-      mpm = $1.downcase
-    else
-      output =~ /APACHE_MPM_DIR="server\/mpm\/(.*)"/
+
+    if output
+      output =~ /^Server MPM: +(.*)$/
       if $1
         mpm = $1.downcase
       else
-        mpm = nil
+        output =~ /APACHE_MPM_DIR="server\/mpm\/(.*)"/
+        if $1
+          mpm = $1.downcase
+        else
+          mpm = nil
+        end
       end
-    end
-    if mpm != "prefork" && mpm != "worker" && mpm != "event"
+      if mpm != "prefork" && mpm != "worker" && mpm != "event"
+        new_screen
+        render_template 'apache2/apache_must_be_compiled_with_compatible_mpm',
+          :current_mpm => mpm
+        wait
+      end
+    elsif !@apache2.config_file_broken?
+      # 'output' may be nil because the config file is broken (see
+      # PlatformInfo.apache2ctl_V for more information), but we already
+      # warn the user about in #validate_install.
+      # So here we only warn about not being able to detect an MPM type
+      # if 'output' is nil but not as a result of the config file being broken.
       new_screen
-      render_template 'apache2/apache_must_be_compiled_with_compatible_mpm',
-        :current_mpm => mpm
+      render_template 'apache2/mpm_unknown',
+        :control_command => @apache2.ctl
       wait
     end
   end

data/bin/passenger-status

@@ -106,17 +106,20 @@ end
 
 def show_status(instance, options)
   # if the noshow override is not specified, the default is to show the header, unless show=xml
-  if options[:noheader] != true && options[:show] != 'xml' 
+  if options[:noheader] != true && options[:show] != 'xml'
     print_header(STDOUT, instance)
   end
 
   case options[:show]
   when 'pool'
     request = Net::HTTP::Get.new("/pool.txt?colorize=#{options[:color]}&verbose=#{options[:verbose]}")
-    request.basic_auth("ro_admin", obtain_read_only_admin_password(instance))
-    response = instance.http_request("agents.s/server_admin", request)
+    try_performing_ro_admin_basic_auth(request, instance)
+    response = instance.http_request("agents.s/server_api", request)
     if response.code.to_i / 100 == 2
       puts response.body
+    elsif response.code.to_i == 401
+      print_permission_error_message
+      exit 2
     else
       STDERR.puts "*** An error occured."
       STDERR.puts "#{response.code}: #{response.body}"
@@ -125,10 +128,13 @@ def show_status(instance, options)
 
   when 'requests', 'server'
     request = Net::HTTP::Get.new("/server.json")
-    request.basic_auth("ro_admin", obtain_read_only_admin_password(instance))
-    response = instance.http_request("agents.s/server_admin", request)
+    try_performing_ro_admin_basic_auth(request, instance)
+    response = instance.http_request("agents.s/server_api", request)
     if response.code.to_i / 100 == 2
       puts response.body
+    elsif response.code.to_i == 401
+      print_permission_error_message
+      exit 2
     else
       STDERR.puts "*** An error occured."
       STDERR.puts "#{response.code}: #{response.body}"
@@ -137,8 +143,8 @@ def show_status(instance, options)
 
   when 'backtraces'
     request = Net::HTTP::Get.new("/backtraces.txt")
-    request.basic_auth("ro_admin", obtain_read_only_admin_password(instance))
-    response = instance.http_request("agents.s/server_admin", request)
+    try_performing_ro_admin_basic_auth(request, instance)
+    response = instance.http_request("agents.s/server_api", request)
     if response.code.to_i / 100 == 2
       text = response.body
       # Colorize output
@@ -146,6 +152,9 @@ def show_status(instance, options)
       text.gsub!(/^(Thread .*:)$/, color.black_bg + color.yellow + '\1' + color.reset)
       text.gsub!(/^( +in '.*? )(.*?)\(/, '\1' + color.bold + '\2' + color.reset + '(')
       puts text
+    elsif response.code.to_i == 401
+      print_permission_error_message
+      exit 2
     else
       STDERR.puts "*** An error occured."
       STDERR.puts "#{response.code}: #{response.body}"
@@ -154,8 +163,8 @@ def show_status(instance, options)
 
   when 'xml'
     request = Net::HTTP::Get.new("/pool.xml?secrets=#{options[:verbose]}")
-    request.basic_auth("ro_admin", obtain_read_only_admin_password(instance))
-    response = instance.http_request("agents.s/server_admin", request)
+    try_performing_ro_admin_basic_auth(request, instance)
+    response = instance.http_request("agents.s/server_api", request)
     if response.code.to_i / 100 == 2
       indented = format_with_xmllint(response.body)
       if indented
@@ -164,6 +173,9 @@ def show_status(instance, options)
         puts response.body
         STDERR.puts "*** Tip: if you install the 'xmllint' command then the XML output will be indented."
       end
+    elsif response.code.to_i == 401
+      print_permission_error_message
+      exit 2
     else
       STDERR.puts "*** An error occured."
       STDERR.puts "#{response.code}: #{response.body}"
@@ -172,10 +184,13 @@ def show_status(instance, options)
 
   when 'union_station'
     request = Net::HTTP::Get.new("/status.txt")
-    request.basic_auth("ro_admin", obtain_read_only_admin_password(instance))
-    response = instance.http_request("agents.s/logging_admin", request)
+    try_performing_ro_admin_basic_auth(request, instance)
+    response = instance.http_request("agents.s/logging_api", request)
     if response.code.to_i / 100 == 2
       puts response.body
+    elsif response.code.to_i == 401
+      print_permission_error_message
+      exit 2
     else
       STDERR.puts "*** An error occured."
       STDERR.puts "#{response.code}: #{response.body}"
@@ -191,13 +206,13 @@ def print_header(io, instance)
   io.puts
 end
 
-def obtain_read_only_admin_password(instance)
+def try_performing_ro_admin_basic_auth(request, instance)
   begin
     password = instance.read_only_admin_password
   rescue Errno::EACCES
-    print_permission_error_message
-    exit 2
+    return
   end
+  request.basic_auth("ro_admin", password)
 end
 
 def print_permission_error_message

data/build/agents.rb

@@ -29,7 +29,8 @@ AGENT_OBJECTS = {
     'ext/common/agents/Watchdog/HelperAgentWatcher.cpp',
     'ext/common/agents/Watchdog/LoggingAgentWatcher.cpp',
     'ext/common/agents/Watchdog/InstanceDirToucher.cpp',
-    'ext/common/agents/Watchdog/AdminServer.h',
+    'ext/common/agents/Watchdog/ApiServer.h',
+    'ext/common/agents/ApiServerUtils.h',
     'ext/common/agents/HelperAgent/OptionParser.h',
     'ext/common/agents/LoggingAgent/OptionParser.h',
     'ext/common/ServerKit/Server.h',
@@ -44,7 +45,7 @@ AGENT_OBJECTS = {
   'ServerMain.o' => [
     'ext/common/agents/HelperAgent/Main.cpp',
     'ext/common/agents/HelperAgent/OptionParser.h',
-    'ext/common/agents/HelperAgent/AdminServer.h',
+    'ext/common/agents/HelperAgent/ApiServer.h',
     'ext/common/agents/HelperAgent/ResponseCache.h',
     'ext/common/agents/HelperAgent/RequestHandler.h',
     'ext/common/agents/HelperAgent/RequestHandler/Client.h',
@@ -57,20 +58,20 @@ AGENT_OBJECTS = {
     'ext/common/agents/HelperAgent/RequestHandler/CheckoutSession.cpp',
     'ext/common/agents/HelperAgent/RequestHandler/SendRequest.cpp',
     'ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp',
+    'ext/common/agents/ApiServerUtils.h',
     'ext/common/ServerKit/Server.h',
     'ext/common/ServerKit/HttpServer.h',
     'ext/common/ServerKit/HttpHeaderParser.h',
     'ext/common/ServerKit/AcceptLoadBalancer.h',
     'ext/common/ServerKit/FileBufferedChannel.h',
     'ext/common/ApplicationPool2/Pool.h',
-    'ext/common/ApplicationPool2/Pool/AnalyticsCollection.h',
-    'ext/common/ApplicationPool2/Pool/GarbageCollection.h',
-    'ext/common/ApplicationPool2/Pool/GeneralUtils.h',
-    'ext/common/ApplicationPool2/Pool/ProcessUtils.h',
-    'ext/common/ApplicationPool2/Pool/Inspection.h',
-    'ext/common/ApplicationPool2/Pool/Debug.h',
     'ext/common/ApplicationPool2/Group.h',
-    'ext/common/ApplicationPool2/Spawner.h',
+    'ext/common/ApplicationPool2/BasicGroupInfo.h',
+    'ext/common/ApplicationPool2/BasicProcessInfo.h',
+    'ext/common/ApplicationPool2/Context.h',
+    'ext/common/ApplicationPool2/Process.h',
+    'ext/common/ApplicationPool2/Session.h',
+    'ext/common/SpawningKit/Spawner.h',
     'ext/common/Constants.h',
     'ext/common/StaticString.h',
     'ext/common/Account.h',
@@ -86,11 +87,12 @@ AGENT_OBJECTS = {
   'LoggingMain.o' => [
     'ext/common/agents/LoggingAgent/Main.cpp',
     'ext/common/agents/LoggingAgent/OptionParser.h',
-    'ext/common/agents/LoggingAgent/AdminServer.h',
+    'ext/common/agents/LoggingAgent/ApiServer.h',
     'ext/common/agents/LoggingAgent/LoggingServer.h',
     'ext/common/agents/LoggingAgent/RemoteSender.h',
     'ext/common/agents/LoggingAgent/DataStoreId.h',
     'ext/common/agents/LoggingAgent/FilterSupport.h',
+    'ext/common/agents/ApiServerUtils.h',
     'ext/common/ServerKit/Server.h',
     'ext/common/ServerKit/HttpServer.h',
     'ext/common/ServerKit/HttpHeaderParser.h',

data/build/cxx_tests.rb

@@ -58,46 +58,46 @@ TEST_CXX_OBJECTS = {
   'test/cxx/ApplicationPool2/OptionsTest.o' => %w(
     test/cxx/ApplicationPool2/OptionsTest.cpp
     ext/common/ApplicationPool2/Options.h),
-  'test/cxx/ApplicationPool2/DirectSpawnerTest.o' => %w(
-    test/cxx/ApplicationPool2/DirectSpawnerTest.cpp
-    test/cxx/ApplicationPool2/SpawnerTestCases.cpp
-    ext/common/ApplicationPool2/Options.h
-    ext/common/ApplicationPool2/Process.h
-    ext/common/ApplicationPool2/Socket.h
-    ext/common/ApplicationPool2/Spawner.h
-    ext/common/ApplicationPool2/DirectSpawner.h),
-  'test/cxx/ApplicationPool2/SmartSpawnerTest.o' => %w(
-    test/cxx/ApplicationPool2/SmartSpawnerTest.cpp
-    test/cxx/ApplicationPool2/SpawnerTestCases.cpp
-    ext/common/ApplicationPool2/Options.h
-    ext/common/ApplicationPool2/Process.h
-    ext/common/ApplicationPool2/Socket.h
-    ext/common/ApplicationPool2/Spawner.h
-    ext/common/ApplicationPool2/SmartSpawner.h),
   'test/cxx/ApplicationPool2/ProcessTest.o' => %w(
     test/cxx/ApplicationPool2/ProcessTest.cpp
     ext/common/ApplicationPool2/Process.h
     ext/common/ApplicationPool2/Socket.h
-    ext/common/ApplicationPool2/Session.h),
+    ext/common/ApplicationPool2/Session.h
+    ext/common/SpawningKit/Spawner.h
+    ext/common/SpawningKit/DummySpawner.h),
   'test/cxx/ApplicationPool2/PoolTest.o' => %w(
     test/cxx/ApplicationPool2/PoolTest.cpp
-    ext/common/ApplicationPool2/SuperGroup.h
-    ext/common/ApplicationPool2/Group.h
     ext/common/ApplicationPool2/Pool.h
-    ext/common/ApplicationPool2/Pool/AnalyticsCollection.h
-    ext/common/ApplicationPool2/Pool/GarbageCollection.h
-    ext/common/ApplicationPool2/Pool/GeneralUtils.h
-    ext/common/ApplicationPool2/Pool/ProcessUtils.h
-    ext/common/ApplicationPool2/Pool/Inspection.h
-    ext/common/ApplicationPool2/Pool/Debug.h
+    ext/common/ApplicationPool2/Group.h
+    ext/common/ApplicationPool2/BasicGroupInfo.h
+    ext/common/ApplicationPool2/BasicProcessInfo.h
+    ext/common/ApplicationPool2/Context.h
     ext/common/ApplicationPool2/Process.h
     ext/common/ApplicationPool2/Socket.h
     ext/common/ApplicationPool2/Options.h
-    ext/common/ApplicationPool2/Spawner.h
-    ext/common/ApplicationPool2/SpawnerFactory.h
-    ext/common/ApplicationPool2/SmartSpawner.h
-    ext/common/ApplicationPool2/DirectSpawner.h
-    ext/common/ApplicationPool2/DummySpawner.h),
+    ext/common/SpawningKit/Spawner.h
+    ext/common/SpawningKit/Factory.h
+    ext/common/SpawningKit/SmartSpawner.h
+    ext/common/SpawningKit/DirectSpawner.h
+    ext/common/SpawningKit/DummySpawner.h),
+  'test/cxx/SpawningKit/DirectSpawnerTest.o' => %w(
+    test/cxx/SpawningKit/DirectSpawnerTest.cpp
+    test/cxx/SpawningKit/SpawnerTestCases.cpp
+    ext/common/ApplicationPool2/Options.h
+    ext/common/SpawningKit/Config.h
+    ext/common/SpawningKit/Options.h
+    ext/common/SpawningKit/Result.h
+    ext/common/SpawningKit/Spawner.h
+    ext/common/SpawningKit/DirectSpawner.h),
+  'test/cxx/SpawningKit/SmartSpawnerTest.o' => %w(
+    test/cxx/SpawningKit/SmartSpawnerTest.cpp
+    test/cxx/SpawningKit/SpawnerTestCases.cpp
+    ext/common/ApplicationPool2/Options.h
+    ext/common/SpawningKit/Config.h
+    ext/common/SpawningKit/Options.h
+    ext/common/SpawningKit/Result.h
+    ext/common/SpawningKit/Spawner.h
+    ext/common/SpawningKit/SmartSpawner.h),
   'test/cxx/MemoryKit/MbufTest.o' => %w(
     test/cxx/MemoryKit/MbufTest.cpp
     ext/common/MemoryKit/mbuf.h),

data/doc/Design and Architecture.html

@@ -1467,15 +1467,6 @@ Queuing requests and limiting concurrency. Each process tells the ApplicationPoo
 <div class="paragraph"><p>The Pool class is the core of the subsystem. It contains high-level process management logic but not low-level details, such as the details of spawning processes. The code is further divided into the following classes, each of which contain the core code managing its respective domain:</p></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
-<strong>SuperGroup</strong>
-</dt>
-<dd>
-<p>
-        A logical collection of different applications. It’s designed to be able to contain one or more Groups, but currently it always contains exactly 1 Group.
-</p>
-<div class="paragraph"><p>SuperGroup was originally introduced as a building block for a future feature: polyglot, multi-language applications. The idea was that, as more and more programming languages are introduced and become popular, there would be more and more demand to write applications in multiple languages. This would be done by splitting applications into multiple parts, with each part implemented in a different language. We wanted to introduce a feature that makes it super-easy to make such polyglot applications as a single whole. However, as time went on, we realized that we were mistaken and that most developers actually don’t want to bother with multiple programming languages: they’d rather stick with a single one. So nowadays, SuperGroup is actually obsolete, but it’s still kept in the codebase because it’s not harmful, and removing it is too much work.</p></div>
-</dd>
-<dt class="hdlist1">
 <strong>Group</strong>
 </dt>
 <dd>
@@ -1516,7 +1507,7 @@ Queuing requests and limiting concurrency. Each process tells the ApplicationPoo
 </p>
 </dd>
 </dl></div>
-<div class="paragraph"><p>If you look at the diagram, then you see that SuperGroup, Group and Process all have 0..1 associations with their containing classes. An object that has a NULL association with its containing object, is considered invalid and should not be used. The fact that the association can be NULL is a detail of the memory management scheme that we employ.</p></div>
+<div class="paragraph"><p>If you look at the diagram, then you see that Group and Process all have 0..1 associations with their containing classes. An object that has a NULL association with its containing object, is considered invalid and should not be used. The fact that the association can be NULL is a detail of the memory management scheme that we employ.</p></div>
 </div>
 <div class="sect2">
 <span class="anchor_helper" id="spawner_subsystem"></span><h3 data-anchor="spawner_subsystem">3.3. The Spawner subsystem</h3>