passenger 6.0.2 → 6.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0619ca90cabc94ee6b8801d143b14877ab15500d'
-  data.tar.gz: f65f9070719053192fcc50206cb146cd18dbba2f
+  metadata.gz: f5bed57f29715aa183e879b4f8ff0606e510f5d4
+  data.tar.gz: b970598c5d2970d0d95be66917b9c00992477339
 SHA512:
-  metadata.gz: 9e844139554498a4662950e649dcf56b768bc74f9a306ef070d13fa504e2f18869e701fd8ceb064aaba5bb4987277ee9910f8aaf2ec8135f60823645895a1965
-  data.tar.gz: 8b0bc8083d5a620506813ae1946fc900e3ae65016fcd552a5c8ea6273d0cf247482d676146eb889fa776b1059e91d4dc51249c9aa7a2c070120f2d9458e32992
+  metadata.gz: a84cbe0a43944e25b8c3b18342402e445f4654f787d98cfa701e03f8c027990ef68dbaab2fda87d68eefe0b3777ef1f2c1171efa5966a41417ddaaf91b3dad3b
+  data.tar.gz: 34905738ff424b9c60a5993f2dd4d60374b1835b6cd34c44eeb70c14d1b2e8d0c74f77a24ce47515e419825b31ffc6178a3a133c7724d3ee4fb08acfd2d8ba50

data/CHANGELOG

@@ -1,9 +1,142 @@
+Release 6.0.7
+-------------
+ * Addresses regression introduced in 6.0.5 when attempting to establish database connection after fork and activerecord is not configured in the expected way. Closes GH-2281.
+ * Addresses regression introduced in 5.1.5 where hook scripts would fail to run. As a result the PASSENGER_ERROR_PAGE and PASSENGER_CONFIG_MANIFEST env vars have been removed from the passenger hook script environment.
+ * Match static rails assets on 8-digit content hash. Contributed by @mattozinga.
+ * Allow skipping the Apache/Nginx sections of the `passenger-memory-stats` output, through the `--no-apache` and `--no-nginx` commandline options. Closes GH-2306. Contributed by Saverio Miroddi (@saveriomiroddi).
+ * Fixes an issue where `passenger-memory-stats` would throw an error if a process went away while it was running. Closes GH-2305.
+ * Fixes a formatting issue with apr-1 include flags on macOS.
+ * Fixes a warning about BOOST_*_ENDIAN macros being deprecated by migrating to new suggested macros.
+ * Fixes an occasional issue with the node loader where the startup handshake would fail to record progress.
+ * Adds an option for specifying the address to bind ruby apps to, for sending requests directly to specific app instances:
+  - Standalone: direct_instance_request_address
+  - Nginx:      passenger_direct_instance_request_address
+  - Apache:     PassengerDirectInstanceRequestAddress
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache: 4.0 (was: 3.7.10)
+    - curl: 7.73.0 (was: 7.71.1)
+    - git: 2.29.1 (was: 2.27.0)
+    - gnupg: 2.2.23 (was: 2.2.21)
+    - libgpg_error: 1.39 (was: 1.38)
+    - ruby: 2.7.2 (was: 2.7.1)
+    - libassuan 2.5.4 (was: 2.5.3)
+    - libgcrypt 1.8.7 (was 1.8.6)
+    - OpenSSL 1.1.1h (was 1.0.2u)
+
+Release 6.0.6
+-------------
+ * Update gemspec with up to date metadata.
+ * Reverts the addition of the 'etc' gem to the Passenger gemspec, because it broke on normal ruby installs. Closes GH-2283.
+ * Builds Ubuntu focal Nginx dynamic module package against Nginx 1.18.0. Closes GH-2291.
+ * No longer providing prebuilt Ruby 2.1 or 2.2 binaries, they have been EOL for years and rubygems no longer supports them.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache 3.7.10 (was 3.7.9)
+    - Curl 7.71.1 (was 7.69.1)
+    - Git 2.27.0 (was 2.26.2)
+    - GnuPG 2.2.21 (was 2.2.20)
+    - libgpg_error 1.38 (was 1.37)
+    - libgcrypt 1.8.6 (was 1.8.5)
+    - RubyGems 3.1.4 (was 3.0.8)
+
+
+Release 6.0.5
+-------------
+
+ * [Enterprise] Fixed a regression (introduced in 5.0.0) where Flying Passenger could not update the Passenger configuration. Closes GH-1554.
+ * Adds Ubuntu 20.04 "Focal" packages, and removes Ubuntu 19.04 "Disco" packages.
+ * Adds RHEL / CentOS 8 packages.
+ * [Nginx] Converts CentOS 7 packages to provide a dynamic module instead of a full Nginx install.
+ * Fixes the encoding name for xml output from the `passenger-status --show=xml` command. Closes GH-2248.
+ * Adds the 'etc' gem as an explicit dependency. Closes GH-2124.
+ * Adds a user agent to the passenger pre-spawn script. Closes GH-1534.
+ * Fixes a compilation issue on FreeBSD. Closes GH-2240.
+ * Fixes an issue where rack bodies may not be processed correctly.
+ * Improves the database reconnection speed in forked processes. closes GH-2253.
+ * [Nginx] Adds a config option `passenger_temp_path` to set the path used for the disk backed response cache. Re-Closes GH-2075.
+ * [Apache] Protects the path info and script name passed to the app from modifications done by mod_security. Closes GH-2198.
+ * Ensures baseuri is set per request, even if config is loaded from cache. Closes GH-2117.
+ * Make temp dir toucher cleanup code more resilient to permissions issues.
+ * [Nginx] Bumps the preferred Nginx version to 1.18.0 (previously 1.17.3).
+ * [Nginx] The preferred PCRE version is now 8.44 (previously 8.43).
+ * Removed deprecated rubyforge gemspec property. Contributed by @olleolleolle.
+ * Adds an option for specifying the attributes on the sticky session cookie:
+	- Apache:     PassengerStickySessionsCookieAttributes     "SameSite=Lax; Secure;"
+	- Nginx:      passenger_sticky_sessions_cookie_attributes "SameSite=Lax; Secure;"
+	- Standalone: --sticky-sessions-cookie-attributes         "SameSite=Lax; Secure;"
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - ccache 3.7.9 (was 3.7.3)
+    - Curl 7.69.1 (was 7.66.0)
+    - Git 2.26.2 (was 2.23.0)
+    - GnuPG 2.2.20 (was 2.2.17)
+    - libgpg_error 1.37 (was 1.36)
+    - OpenSSL 1.0.2u (was 1.0.2t)
+    - PCRE 8.44 (was 8.43)
+    - s3cmd 2.1.0 (was 2.0.2)
+    - RubyGems 3.0.8 (was 3.0.6)
+    - Rubies:
+      - 2.4.6 -> 2.4.10
+      - 2.5.5 -> 2.5.8
+      - 2.6.3 -> 2.6.6
+      + 2.7.1
+
+
+Release 6.0.4
+-------------
+
+ * Adds Debian 10 "Buster" packages.
+
+
+Release 6.0.3
+-------------
+
+ * Add an option to specify the spawn dir during startup, which is specifically useful for CageFS users. Contributed by @plmnikulin. Closes GH-2145.
+
+    - Apache: `PassengerSpawnDir`
+    - Nginx: `passenger_spawn_dir`
+
+ * [Nginx] Bumps the preferred Nginx version to 1.17.3 (previously 1.15.8).
+ * [Nginx] The preferred PCRE version is now 8.43 (previously 8.42).
+ * Adds Ubuntu 19.04 "Disco" packages, and removes Ubuntu 18.10 "Cosmic" and Ubuntu 14.04 "Trusty" packages.
+ * Changes minimum supported macOS version to 10.12 Sierra.
+ * Improves container detection and fixes a compilation warning in GCC 8+. Closes GH-2186.
+ * Allowed externally specifying an app instance to send a request to. Contributed by Mark R. James (@mrj).
+ * Fixed an incompatibility with sending requests to specific app instances, when using the rails web-console gem. Contributed by Mark R. James (@mrj).
+ * Fixed a regression (introduced in 5.1.9) where some hooks were not called. Closes GH-2103. Contributed by Mark R. James (@mrj).
+ * Fixes compilation with clang 8 (latest macOS update) by updating vendored boost library from 1.67 to 1.69.
+ * Reverts a regression intruduced in 6.0.2 where Passenger would crash if it had to use the disk backed response cache. Closes GH-2189.
+ * [Nginx] Adds an option `passenger_buffer_upload` to allow buffering uploaded data in Passenger before forwarding it to the app. As a workaround for apps that cannot handle chunked data.
+ * [Enterprise] When using deferred port binding, no longer binds port if all apps do not start up.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+    - PCRE 8.43 (was 8.42)
+    - Curl 7.65.1 (was 7.64.0)
+    - ccache 3.7.3 (was 3.6)
+    - Git 2.22.0 (was 2.20.1)
+    - OpenSSL 1.0.2s (was 1.0.2q)
+    - RubyGems 3.0.6 (was 3.0.2)
+    - GnuPG 2.2.16 (was 2.2.13)
+    - libgcrypt 1.8.5 (was 1.8.4)
+    - libgpg_error 1.36 (was 1.35)
+    - libiconv 1.16 (was 1.15)
+    - Ruby:
+      - 2.4.5 -> 2.4.6
+      - 2.5.3 -> 2.5.5
+      - 2.6.1 -> 2.6.3
+
+
 Release 6.0.2
 -------------
 
  * Allow compilation to work when Apple messed up their system ruby headers.
  * Only try to read pid 1's /proc files as root, in container detection. Closes GH-2168.
- * Add an option to disable prefixing application logs with "App PID stdout": `PassengerDisableLogPrefix` (Apache) / `passenger_disable_log_prefix` (Nginx). Closes GH-1915.
+ * Add an option to disable prefixing application logs with "App PID stdout". Contributed by Ian Kottman. Closes GH-1915.
+
+    - Apache: `PassengerDisableLogPrefix`
+    - Nginx: `passenger_disable_log_prefix`
+
  * Add support for identifying the Passenger instance by PID. Closes GH-2146. Contributed by Saverio Miroddi (@saveriomiroddi).
  * [Ruby] Made Passenger more resiliant to Rack bugs. Closes GH-2150.
  * [Nginx] Do not touch Nginx's proxy_temp_path var in Passenger's nginx modules. Closes GH-2075. Contributed by Roman Berestnikov-Sivolov (@ROMB).
@@ -338,7 +471,7 @@ Release 5.1.1
  * 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 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. 
+ * [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.
  * [Apache] Introduces a small delay to prevent running the Security Update Checker twice at startup.
 
@@ -350,11 +483,11 @@ Release 5.1.0
  * [Enterprise] When running a Rails app in multithreaded mode, Passenger Enterprise automatically tags Rails logs with the current thread number. This makes it possible to distinguish logs generated by different threads.
  * Fixes permissions issue on Linux when setting OOM score after lowering privileges. Closes GH-1858.
  * [Standalone] Allows raw json envvars in Passengerfile.json. Closes GH-1837.
- * [Standalone] Make the `max_requests` option available on the command line as well. 
+ * [Standalone] Make the `max_requests` option available on the command line as well.
  * Fixes unaligned memory access in base64 decoder on platforms that have strict aliasing requirements (non x86/x86_64). Closes GH-1646.
  * Introduces daily Passenger security update check to warn (error log) if there are newer Passenger versions with important security fixes (describing what was discovered, what is affected, which version has the fix).
  * Fixes compilation on Linux when a non-glibc C library is in use. Closes GH-1870.
- * `passenger-install-nginx-module` and the standalone compiler now add the http v2, realip and addition module flags for Nginx (just like the APT/RPM/autobuilder already had). Closes GH-1788. 
+ * `passenger-install-nginx-module` and the standalone compiler now add the http v2, realip and addition module flags for Nginx (just like the APT/RPM/autobuilder already had). Closes GH-1788.
  * [Apache] Fixes PassengerShowVersionInHeader option. Thanks to Sebastian Welther for contributing this.
  * Passenger now reports when you try to use Node.js or Meteor clustering, and tries to continue with just a nonfunctional shim in place, so that if your code uses the clustering APIs your app may still work.
  * Updates libev config.sub and config.guess to support newer platforms such as the IBM power 8.
@@ -517,7 +650,7 @@ Release 5.0.22
  * The `passenger-config validate-install` command no longer prints false warnings about duplicate Passenger installs on systems that use RBenv. Closes GH-1627.
  * Fixes race conditions in the automatic building of the Ruby native support extension. Closes GH-1570.
  * [Enterprise] Fixes compatibility with byebug 7.0. Closes GH-1662.
- * Support Union Station logging for Node.js applications, with Express/MongoDB automatically supported. 
+ * Support Union Station logging for Node.js applications, with Express/MongoDB automatically supported.
  * The Ruby Union Station hooks no longer abort with a fatal error when the application does not call the Union Station initializer method during startup. The error is now only logged.
  * In case of an error response (HTTP 5xx), Union Station logging will also contain request headers.
  * The Union Station hooks are now more resilient against environment variable problems.
@@ -580,7 +713,7 @@ Release 5.0.16
  * Supports seek() such that body.rewind works when using Rack middleware that uses Zlib::GzipReader (e.g. for compressed requests). Closes GH-1553.
  * [Apache] Improves detection of Apache configuration file problems. Closes GH-1577.
  * [Enterprise] Fixes installation of the Passenger Enterprise Apache module on Debian Testing.
- * Fixes logging of HTTP response code for Union Station. This regression was introduced by Passenger 5. Closes GH-1581. 
+ * Fixes logging of HTTP response code for Union Station. This regression was introduced by Passenger 5. Closes GH-1581.
  * Adds a new subcommand `passenger-config about support-binaries-dir`.
  * Fixes a regression in the Node.js loader with regard to custom startup files. This bug was introduced in 5.0.14. Closes GH-1557 (again).
  * Fixes a crash when a Ruby application is accessed through a sub-URI and a root virtual host at the same time.
@@ -2401,9 +2534,9 @@ Release 2.2.15
  * [Apache] Fixed incorrect temp dir cleanup by passenger-status
    On some systems, running passenger-status could print the following
    message:
-   
+
       *** Cleaning stale folder /tmp/passenger.1234
-   
+
    ...after which Phusion Passenger breaks because that directory is
    necessary for it to function properly. The cause of this problem
    has been found and has been fixed.
@@ -2480,10 +2613,10 @@ Release 2.2.11
    affects Apache. When under high load, Apache might freeze and stop
    responding to requests. It is caused by a race condition which is
    why it escaped our last release testing.
-   
+
    This problem does not affect Nginx; you only have to upgrade if
    you're using Apache.
-   
+
    http://groups.google.com/group/phusion-passenger/t/d5bb2f17c8446ea0
 
 
@@ -2505,20 +2638,20 @@ Release 2.2.9
    Actually, previous Phusion Passenger releases were already compatible
    with Rails 3, depending on the spawn method that would be invoked. Here's
    the story:
-   
+
    Since Phusion Passenger 2.2.8, when the file config.ru exists, Phusion
    Passenger will treat the app as a Rack app, not as a Rails app. This is
    in contrast to earlier versions which gave Rails detection more priority
    than Rack detection. Phusion Passenger loads Rack apps and Rails apps in
    different ways. The Rails loader was not compatible with Rails 3, which
    is what we've fixed in this release.
-   
+
    That said, a Rails 3 app would have worked out-of-the-box on Phusion
    Passenger 2.2.8 as well because Rails 3 apps include a config.ru file
    by default, causing Phusion Passenger 2.2.8 to use the Rack loader.
    Earlier versions of Phusion Passenger would just completely bail out
    because they'd use the Rails loader.
-   
+
    That said, with 2.2.9 there are still some caveats:
    - Smart spawning (the mechanism with which REE's 33% memory reduction
      is implemented) is *not* supported for Rack apps. This means that if
@@ -2527,7 +2660,7 @@ Release 2.2.9
    - Rails 3 depends on Rack 1.1.0. You must have Rack 1.1.0 installed as
      a gem, even if you've bundled it with the gem bundler. This is because
      Phusion Passenger itself depends on Rack.
-   
+
    Both of these caveats are temporary. We have plans to solve both of these
    properly in the future.
  * What's up with the Gem Bundler?
@@ -2537,9 +2670,9 @@ Release 2.2.9
    version seems to work fine. Please note that you need to insert the
    following snippet in config/preinitializer.rb, as instructed by the gem
    bundler's README:
-   
+
      require "#{RAILS_ROOT}/vendor/gems/environment"
-   
+
    The Rails::Boot monkey patching code as posted at
    http://yehudakatz.com/2009/11/03/using-the-new-gem-bundler-today/
    does not seem to be required anymore.
@@ -2588,7 +2721,7 @@ Release 2.2.8
    seen an error message along the lines of
 
       *** Exception IOError in Passenger RequestHandler (closed stream)
-   
+
    then this is a Ruby bug at work. This bug has been fixed in Ruby 1.9.2,
    but Ruby 1.9.1 still contains this bug. We've added a workaround so that
    the bug is not triggered with this Ruby version. Issue #432.
@@ -2679,7 +2812,7 @@ Release 2.2.5
    headers. It turns out that some people relied on the old behavior, we so now
    environment variables set with mod_env are set in both ENV and in the CGI
    environment.
-   
+
    Fixes bug #335.
 
  * [Apache] Fixed compilation problems on some Linux systems with older versions of Apache
@@ -2747,7 +2880,7 @@ Release 2.2.5
    order: first models, then controllers, then helpers.
 
    Bug #359.
- 
+
  * Fixed a few bugs in WSGI compliance
    PATH_INFO is supposed to be set to the request URI, but without the query
    string and without the base URI. This has been fixed: bug #360.

data/CONTRIBUTING.md

@@ -19,7 +19,7 @@
    * [Further reading](#further_reading)
  * [Pull requests](#pull_requests)
 
-Thank you for your interest in Phusion Passenger. Phusion Passenger is open source so your contributions are very welcome. Although we also provide a [commercial version](https://www.phusionpassenger.com/enterprise) and [commercial support](https://www.phusionpassenger.com/commercial_support), the core remains open source and we remain committed to keep it that way. This guide gives you an overview of the ways with which you can contribute, as well as contribution guidelines.
+Thank you for your interest in Phusion Passenger. Phusion Passenger is open source so your contributions are very welcome. Although we also provide a [commercial version](https://www.phusionpassenger.com/features#premium-features) and [commercial support](https://www.phusionpassenger.com/commercial_support), the core remains open source and we remain committed to keep it that way. This guide gives you an overview of the ways with which you can contribute, as well as contribution guidelines.
 
 You can contribute in one of the following areas:
 

data/CONTRIBUTORS

@@ -64,6 +64,8 @@ Luuk Hafkamp (Phusion)
 Luuk Hendriks (Phusion)
 MAEDA Go
 Magnus Holm
+Mark R. James
+Matt Ozinga
 Michal Papis
 Michał Pokrywka
 Mike
@@ -71,8 +73,10 @@ Mike Boone
 Morton Jonuschat
 Nathaniel Bibler
 Neil Wilson
+Nicolas Maloeuvre
 Ninh Bui (Phusion)
 Oleksiy Shchukin
+Olle Jonsson
 Pat Downey
 Paul B
 Paul Kmiec
@@ -80,6 +84,7 @@ Pepijn Looije
 Perry Smith
 Philip M. Gollucci
 PikachuEXE
+plmnikulin
 Po-Chuan Hsieh
 Radagaisus
 Redmar Kerkhoff

data/bin/passenger-install-nginx-module

@@ -268,7 +268,7 @@ private
     new_screen
     puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
 
-    url = "http://downloads.sourceforge.net/project/pcre/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
+    url = "https://ftp.pcre.org/pub/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz"
     dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
     tarball = "#{@working_dir}/pcre.tar.gz"
 

data/bin/passenger-memory-stats

@@ -38,6 +38,7 @@ PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'admin_tools/memory_stats'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
+require 'optparse'
 
 include PhusionPassenger
 
@@ -107,27 +108,78 @@ class Table
   end
 end
 
+# Parses the specific commandline options.
+#
+# Modeled after `passenger-status` logic, with minor tweaks.
+#
+class CommandLineOptionsParser
+  def parse
+    options = {}
+    parser = create_option_parser(options)
+
+    begin
+      parser.parse!
+      options
+    rescue OptionParser::ParseError => e
+      STDERR.puts e
+      STDERR.puts
+      STDERR.puts "Please see '--help' for valid options."
+
+      exit 1
+    end
+  end
+
+  private
+
+  def create_option_parser(options)
+    OptionParser.new do |opts|
+      opts.banner = "Usage: #{File.basename(__FILE__)} [-h|--help] [--no-apache] [--no-nginx]"
+
+      opts.separator ""
+      opts.separator "Tool for inspecting the application server and Phusion Passenger's memory statistics."
+      opts.separator ""
+
+      opts.separator "Options:"
+
+      opts.on("--no-apache", "Do not display the Apache statistics.") do
+        options[:no_apache] = true
+      end
+      opts.on("--no-nginx", "Do not display the Nginx statistics.") do
+        options[:no_nginx] = true
+      end
+    end
+  end
+end
+
 class App
   def initialize
     @stats = AdminTools::MemoryStats.new
     @colors = Utils::AnsiColors.new
   end
 
-  def start
+  def start(options = {})
+    print_apache_stats = !options.fetch(:no_apache, false)
+    print_nginx_stats = !options.fetch(:no_nginx, false)
+
     puts "Version: #{PhusionPassenger::VERSION_STRING}"
     puts "Date   : #{Time.now}"
-    if @stats.apache_processes
-      print_process_list("Apache processes", @stats.apache_processes)
-    else
-      puts "#{@colors.blue_bg}#{@colors.bold}#{@colors.yellow}------------- Apache processes -------------#{@colors.reset}\n"
-      STDERR.puts "*** WARNING: The Apache executable cannot be found."
-      STDERR.puts "Please set the APXS2 environment variable to your 'apxs2' " <<
-        "executable's filename, or set the HTTPD environment variable " <<
-        "to your 'httpd' or 'apache2' executable's filename."
+
+    if print_apache_stats
+      if @stats.apache_processes
+        print_process_list("Apache processes", @stats.apache_processes)
+      else
+        puts "#{@colors.blue_bg}#{@colors.bold}#{@colors.yellow}------------- Apache processes -------------#{@colors.reset}\n"
+        STDERR.puts "*** WARNING: The Apache executable cannot be found."
+        STDERR.puts "Please set the APXS2 environment variable to your 'apxs2' " <<
+          "executable's filename, or set the HTTPD environment variable " <<
+          "to your 'httpd' or 'apache2' executable's filename."
+      end
     end
 
-    puts
-    print_process_list("Nginx processes", @stats.nginx_processes)
+    if print_nginx_stats
+      puts
+      print_process_list("Nginx processes", @stats.nginx_processes)
+    end
 
     puts
     print_process_list("Passenger processes", @stats.passenger_processes, :show_ppid => false)
@@ -175,4 +227,5 @@ private
   end
 end
 
-App.new.start
+options = CommandLineOptionsParser.new.parse
+App.new.start(options)

data/build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder/builder.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-#  Copyright (c) 2016 Phusion Holding B.V.
+#  Copyright (c) 2016-2018 Phusion Holding B.V.
 #
 #  "Union Station" and "Passenger" are trademarks of Phusion Holding B.V.
 #
@@ -360,13 +360,66 @@ module CxxCodeBuilder
     #   bar(int x) {
     #       printf("x = %d\n", x);
     #   }
-    def function(declaration, body = nil)
+    def function(declaration, body = nil, &block)
+      function_or_constructor(declaration, nil, body, &block)
+    end
+
+    # Adds a C++ constructor definition to the internal buffer. This is
+    # like #function, but also allows defining member initializers.
+    # `member_initializers` is a Hash which maps field names to their
+    # initialization expressions.
+    #
+    # Example:
+    #
+    #   member_initializers = {
+    #     'name' => '"Delorean"',
+    #     'color' => 'COLOR_RED'
+    #   }
+    #   constructor('Car::Car()', member_initializers) do
+    #     add_code 'printf("Created a car\n");'
+    #   end
+    #
+    # Output:
+    #
+    #   Car::Car()
+    #       : name("Delorean"),
+    #         color(COLOR_RED)
+    #   {
+    #       printf("Created a car\n");
+    #   }
+    def constructor(declaration, member_initializers, body = nil, &block)
+      function_or_constructor(declaration, member_initializers, body, &block)
+    end
+
+    def function_or_constructor(declaration, member_initializers, body = nil)
       declaration =~ /(.*?)([a-z0-9_:]+)\s*\((.*)\s*(const)?/mi
       return_type_and_attributes = $1
       name_and_params = "#{$2}(#{$3} #{$4}".strip
 
       add_code return_type_and_attributes.strip
-      add_code "#{name_and_params.strip} {"
+      if member_initializers && !member_initializers.empty?
+        add_code "#{name_and_params.strip}"
+        indent do
+          member_initializers.each_with_index do |elem, i|
+            field, expr = elem
+            if i == 0
+              prefix = @indent_string * @indent_level + ': '
+            else
+              prefix = @indent_string * @indent_level + '  '
+            end
+            if i == member_initializers.size - 1
+              suffix = nil
+            else
+              suffix = ','
+            end
+            add_raw_code("#{prefix}#{field}(#{expr})#{suffix}\n")
+          end
+        end
+        add_code '{'
+      else
+        add_code "#{name_and_params.strip} {"
+      end
+
       indent do
         if block_given?
           yield