passenger 5.3.4 → 6.0.1

data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h

@@ -62,6 +62,7 @@ typedef struct {
     ngx_str_t app_log_file;
     ngx_str_t app_rights;
     ngx_str_t app_root;
+    ngx_str_t app_start_command;
     ngx_str_t app_type;
     ngx_str_t document_root;
     ngx_str_t environment;
@@ -82,6 +83,7 @@ typedef struct {
     ngx_str_t app_log_file_source_file;
     ngx_str_t app_rights_source_file;
     ngx_str_t app_root_source_file;
+    ngx_str_t app_start_command_source_file;
     ngx_str_t app_type_source_file;
     ngx_str_t base_uris_source_file;
     ngx_str_t debugger_source_file;
@@ -121,6 +123,7 @@ typedef struct {
     ngx_str_t upstream_config_intercept_errors_source_file;
     ngx_str_t upstream_config_pass_headers_source_file;
     ngx_str_t upstream_config_read_timeout_source_file;
+    ngx_str_t upstream_config_request_buffering_source_file;
     ngx_str_t user_source_file;
     ngx_str_t vary_turbocache_by_cookie_source_file;
 
@@ -129,6 +132,7 @@ typedef struct {
     ngx_uint_t app_log_file_source_line;
     ngx_uint_t app_rights_source_line;
     ngx_uint_t app_root_source_line;
+    ngx_uint_t app_start_command_source_line;
     ngx_uint_t app_type_source_line;
     ngx_uint_t base_uris_source_line;
     ngx_uint_t debugger_source_line;
@@ -168,6 +172,7 @@ typedef struct {
     ngx_uint_t upstream_config_intercept_errors_source_line;
     ngx_uint_t upstream_config_pass_headers_source_line;
     ngx_uint_t upstream_config_read_timeout_source_line;
+    ngx_uint_t upstream_config_request_buffering_source_line;
     ngx_uint_t user_source_line;
     ngx_uint_t vary_turbocache_by_cookie_source_line;
 
@@ -176,6 +181,7 @@ typedef struct {
     ngx_int_t app_log_file_explicitly_set;
     ngx_int_t app_rights_explicitly_set;
     ngx_int_t app_root_explicitly_set;
+    ngx_int_t app_start_command_explicitly_set;
     ngx_int_t app_type_explicitly_set;
     ngx_int_t base_uris_explicitly_set;
     ngx_int_t debugger_explicitly_set;
@@ -215,6 +221,7 @@ typedef struct {
     ngx_int_t upstream_config_intercept_errors_explicitly_set;
     ngx_int_t upstream_config_pass_headers_explicitly_set;
     ngx_int_t upstream_config_read_timeout_explicitly_set;
+    ngx_int_t upstream_config_request_buffering_explicitly_set;
     ngx_int_t user_explicitly_set;
     ngx_int_t vary_turbocache_by_cookie_explicitly_set;
 } passenger_autogenerated_loc_conf_t;

data/src/nginx_module/MainConfig/AutoGeneratedCreateFunction.c

@@ -58,6 +58,9 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->disable_security_update_check = NGX_CONF_UNSET;
     conf->security_update_check_proxy.data = NULL;
     conf->security_update_check_proxy.len  = 0;
+    conf->disable_anonymous_telemetry = NGX_CONF_UNSET;
+    conf->anonymous_telemetry_proxy.data = NULL;
+    conf->anonymous_telemetry_proxy.len  = 0;
     conf->prestart_uris = NGX_CONF_UNSET_PTR;
     conf->instance_registry_dir.data = NULL;
     conf->instance_registry_dir.len  = 0;
@@ -131,6 +134,14 @@ passenger_create_autogenerated_main_conf(passenger_autogenerated_main_conf_t *co
     conf->security_update_check_proxy_source_file.len = 0;
     conf->security_update_check_proxy_source_line = 0;
     conf->security_update_check_proxy_explicitly_set = 0;
+    conf->disable_anonymous_telemetry_source_file.data = NULL;
+    conf->disable_anonymous_telemetry_source_file.len = 0;
+    conf->disable_anonymous_telemetry_source_line = 0;
+    conf->disable_anonymous_telemetry_explicitly_set = 0;
+    conf->anonymous_telemetry_proxy_source_file.data = NULL;
+    conf->anonymous_telemetry_proxy_source_file.len = 0;
+    conf->anonymous_telemetry_proxy_source_line = 0;
+    conf->anonymous_telemetry_proxy_explicitly_set = 0;
     conf->prestart_uris_source_file.data = NULL;
     conf->prestart_uris_source_file.len = 0;
     conf->prestart_uris_source_line = 0;

data/src/nginx_module/MainConfig/AutoGeneratedManifestGeneration.c

@@ -182,6 +182,29 @@ generate_config_manifest_for_autogenerated_main_conf(manifest_gen_ctx_t *ctx, pa
             (const char *) conf->autogenerated.security_update_check_proxy.data,
             conf->autogenerated.security_update_check_proxy.len);
     }
+    if (conf->autogenerated.disable_anonymous_telemetry_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_disable_anonymous_telemetry",
+            sizeof("passenger_disable_anonymous_telemetry") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.disable_anonymous_telemetry_source_file,
+            conf->autogenerated.disable_anonymous_telemetry_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            conf->autogenerated.disable_anonymous_telemetry);
+    }
+    if (conf->autogenerated.anonymous_telemetry_proxy_explicitly_set) {
+        option_container = find_or_create_manifest_option_container(ctx,
+            ctx->global_config_container,
+            "passenger_anonymous_telemetry_proxy",
+            sizeof("passenger_anonymous_telemetry_proxy") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &conf->autogenerated.anonymous_telemetry_proxy_source_file,
+            conf->autogenerated.anonymous_telemetry_proxy_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) conf->autogenerated.anonymous_telemetry_proxy.data,
+            conf->autogenerated.anonymous_telemetry_proxy.len);
+    }
     if (conf->autogenerated.prestart_uris_explicitly_set) {
         option_container = find_or_create_manifest_option_container(ctx,
             ctx->global_config_container,

data/src/nginx_module/MainConfig/AutoGeneratedStruct.h

@@ -43,6 +43,7 @@ typedef struct {
     ngx_uint_t app_file_descriptor_ulimit;
     ngx_uint_t core_file_descriptor_ulimit;
     ngx_array_t *ctl;
+    ngx_flag_t disable_anonymous_telemetry;
     ngx_flag_t disable_security_update_check;
     ngx_uint_t log_level;
     ngx_uint_t max_instances_per_app;
@@ -59,6 +60,7 @@ typedef struct {
     ngx_str_t admin_panel_password;
     ngx_str_t admin_panel_url;
     ngx_str_t admin_panel_username;
+    ngx_str_t anonymous_telemetry_proxy;
     ngx_str_t data_buffer_dir;
     ngx_str_t default_group;
     ngx_str_t default_user;
@@ -74,12 +76,14 @@ typedef struct {
     ngx_str_t admin_panel_password_source_file;
     ngx_str_t admin_panel_url_source_file;
     ngx_str_t admin_panel_username_source_file;
+    ngx_str_t anonymous_telemetry_proxy_source_file;
     ngx_str_t app_file_descriptor_ulimit_source_file;
     ngx_str_t core_file_descriptor_ulimit_source_file;
     ngx_str_t ctl_source_file;
     ngx_str_t data_buffer_dir_source_file;
     ngx_str_t default_group_source_file;
     ngx_str_t default_user_source_file;
+    ngx_str_t disable_anonymous_telemetry_source_file;
     ngx_str_t disable_security_update_check_source_file;
     ngx_str_t dump_config_manifest_source_file;
     ngx_str_t file_descriptor_log_file_source_file;
@@ -104,12 +108,14 @@ typedef struct {
     ngx_uint_t admin_panel_password_source_line;
     ngx_uint_t admin_panel_url_source_line;
     ngx_uint_t admin_panel_username_source_line;
+    ngx_uint_t anonymous_telemetry_proxy_source_line;
     ngx_uint_t app_file_descriptor_ulimit_source_line;
     ngx_uint_t core_file_descriptor_ulimit_source_line;
     ngx_uint_t ctl_source_line;
     ngx_uint_t data_buffer_dir_source_line;
     ngx_uint_t default_group_source_line;
     ngx_uint_t default_user_source_line;
+    ngx_uint_t disable_anonymous_telemetry_source_line;
     ngx_uint_t disable_security_update_check_source_line;
     ngx_uint_t dump_config_manifest_source_line;
     ngx_uint_t file_descriptor_log_file_source_line;
@@ -134,12 +140,14 @@ typedef struct {
     ngx_int_t admin_panel_password_explicitly_set;
     ngx_int_t admin_panel_url_explicitly_set;
     ngx_int_t admin_panel_username_explicitly_set;
+    ngx_int_t anonymous_telemetry_proxy_explicitly_set;
     ngx_int_t app_file_descriptor_ulimit_explicitly_set;
     ngx_int_t core_file_descriptor_ulimit_explicitly_set;
     ngx_int_t ctl_explicitly_set;
     ngx_int_t data_buffer_dir_explicitly_set;
     ngx_int_t default_group_explicitly_set;
     ngx_int_t default_user_explicitly_set;
+    ngx_int_t disable_anonymous_telemetry_explicitly_set;
     ngx_int_t disable_security_update_check_explicitly_set;
     ngx_int_t dump_config_manifest_explicitly_set;
     ngx_int_t file_descriptor_log_file_explicitly_set;

data/src/nginx_module/config

@@ -75,7 +75,8 @@ PASSENGER_MODULE_DEPS="${ngx_addon_dir}/Configuration.h \
     ${ngx_addon_dir}/ngx_http_passenger_module.h \
     ${PASSENGER_INCLUDEDIR}/cxx_supportlib/Constants.h \
     ${PASSENGER_INCLUDEDIR}/cxx_supportlib/WatchdogLauncher.h \
-    ${PASSENGER_INCLUDEDIR}/cxx_supportlib/AppTypes.h"
+    ${PASSENGER_INCLUDEDIR}/cxx_supportlib/AppTypeDetector/CBindings.h \
+    ${PASSENGER_INCLUDEDIR}/cxx_supportlib/WrapperRegistry/CBindings.h"
 PASSENGER_MODULE_SRCS="${ngx_addon_dir}/ngx_http_passenger_module.c \
     ${ngx_addon_dir}/Configuration.c \
     ${ngx_addon_dir}/ContentHandler.c \

data/src/nginx_module/ngx_http_passenger_module.c

@@ -60,7 +60,8 @@ static int                first_start = 1;
 ngx_str_t                 pp_schema_string;
 ngx_str_t                 pp_placeholder_upstream_address;
 PP_CachedFileStat        *pp_stat_cache;
-PP_AppTypeDetector       *pp_app_type_detector;
+PsgWrapperRegistry       *psg_wrapper_registry;
+PsgAppTypeDetector       *psg_app_type_detector;
 PsgWatchdogLauncher      *psg_watchdog_launcher = NULL;
 ngx_cycle_t              *pp_current_cycle;
 
@@ -348,7 +349,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     }
 
     if (autogenerated_main_conf->stat_throttle_rate != NGX_CONF_UNSET_UINT) {
-        pp_app_type_detector_set_throttle_rate(pp_app_type_detector,
+        psg_app_type_detector_set_throttle_rate(psg_app_type_detector,
             autogenerated_main_conf->stat_throttle_rate);
     }
 
@@ -367,6 +368,8 @@ start_watchdog(ngx_cycle_t *cycle) {
     psg_json_value_set_ngx_str_ne(w_config, "instance_registry_dir", &autogenerated_main_conf->instance_registry_dir);
     psg_json_value_set_ngx_flag  (w_config, "security_update_checker_disabled", autogenerated_main_conf->disable_security_update_check);
     psg_json_value_set_ngx_str_ne(w_config, "security_update_checker_proxy_url", &autogenerated_main_conf->security_update_check_proxy);
+    psg_json_value_set_ngx_flag  (w_config, "telemetry_collector_disabled", autogenerated_main_conf->disable_anonymous_telemetry);
+    psg_json_value_set_ngx_str_ne(w_config, "telemetry_collector_proxy_url", &autogenerated_main_conf->anonymous_telemetry_proxy);
     psg_json_value_set_ngx_flag  (w_config, "user_switching", autogenerated_main_conf->user_switching);
     psg_json_value_set_ngx_flag  (w_config, "show_version_in_header", autogenerated_main_conf->show_version_in_header);
     psg_json_value_set_ngx_flag  (w_config, "turbocaching", autogenerated_main_conf->turbocaching);
@@ -511,7 +514,10 @@ pre_config_init(ngx_conf_t *cf)
     pp_placeholder_upstream_address.data = (u_char *) "unix:/passenger_core";
     pp_placeholder_upstream_address.len  = sizeof("unix:/passenger_core") - 1;
     pp_stat_cache = pp_cached_file_stat_new(1024);
-    pp_app_type_detector = pp_app_type_detector_new(DEFAULT_STAT_THROTTLE_RATE);
+    psg_wrapper_registry = psg_wrapper_registry_new();
+    psg_wrapper_registry_finalize(psg_wrapper_registry);
+    psg_app_type_detector = psg_app_type_detector_new(psg_wrapper_registry,
+        DEFAULT_STAT_THROTTLE_RATE);
     psg_watchdog_launcher = psg_watchdog_launcher_new(IM_NGINX, &error_message);
 
     if (psg_watchdog_launcher == NULL) {

data/src/nginx_module/ngx_http_passenger_module.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (c) 2010-2017 Phusion Holding B.V.
+ * Copyright (c) 2010-2018 Phusion Holding B.V.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,7 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include "cxx_supportlib/WatchdogLauncher.h"
-#include "cxx_supportlib/AppTypes.h"
+#include "cxx_supportlib/AppTypeDetector/CBindings.h"
 #include "cxx_supportlib/Utils/CachedFileStat.h"
 
 /**
@@ -43,6 +43,11 @@
      1000   * PASSENGER_NGINX_MINOR_VERSION + \
      PASSENGER_NGINX_MICRO_VERSION)
 
+/* https://trac.nginx.org/nginx/ticket/1618 */
+#if NGINX_VERSION_NUM >= 1015003
+    #define NGINX_NO_SEND_REQUEST_BODY_INFINITE_LOOP_BUG
+#endif
+
 extern ngx_module_t ngx_http_passenger_module;
 
 /**
@@ -55,7 +60,9 @@ extern ngx_str_t                pp_placeholder_upstream_address;
 /** A CachedFileStat object used for caching stat() calls. */
 extern PP_CachedFileStat        *pp_stat_cache;
 
-extern PP_AppTypeDetector       *pp_app_type_detector;
+extern PsgWrapperRegistry       *psg_wrapper_registry;
+
+extern PsgAppTypeDetector       *psg_app_type_detector;
 
 extern PsgWatchdogLauncher      *psg_watchdog_launcher;
 

data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb

@@ -228,6 +228,19 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :context   => :global,
     :desc      => "Use specified HTTP/SOCKS proxy for the #{PROGRAM_NAME} security update check."
   },
+  {
+    :name      => 'PassengerDisableAnonymousTelemetry',
+    :type      => :flag,
+    :context   => :global,
+    :default   => false,
+    :desc      => "Whether to disable #{PROGRAM_NAME} anonymous telemetry."
+  },
+  {
+    :name      => 'PassengerAnonymousTelemetryProxy',
+    :type      => :string,
+    :context   => :global,
+    :desc      => "Use specified HTTP/SOCKS proxy for #{PROGRAM_NAME} anonymous telemetry collection."
+  },
   {
     :name      => 'PassengerStatThrottleRate',
     :type      => :integer,
@@ -341,6 +354,12 @@ APACHE2_CONFIGURATION_OPTIONS = [
     :desc      => 'Force specific application type.',
     :header    => nil
   },
+  {
+    :name      => 'PassengerAppStartCommand',
+    :type      => :string,
+    :desc      => 'Command string for starting the application.',
+    :header    => nil
+  },
   {
     :name      => 'PassengerStartupFile',
     :type      => :string,

data/src/ruby_supportlib/phusion_passenger/common_library.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2012-2017 Phusion Holding B.V.
+#  Copyright (c) 2012-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -293,24 +293,24 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
     :source   => 'SystemTools/UserDatabase.cpp',
     :category => :base
   define_component 'Utils/SystemTime.o',
-    :source   => 'Utils/SystemTime.cpp',
+    :source   => 'SystemTools/SystemTime.cpp',
     :category => :base
-  define_component 'Utils/StrIntUtils.o',
-    :source   => 'Utils/StrIntUtils.cpp',
+  define_component 'StrIntTools/StrIntUtils.o',
+    :source   => 'StrIntTools/StrIntUtils.cpp',
     :category => :base,
     :optimize => :very_heavy
-  define_component 'Utils/StrIntUtilsNoStrictAliasing.o',
-    :source   => 'Utils/StrIntUtilsNoStrictAliasing.cpp',
+  define_component 'StrIntTools/StrIntUtilsNoStrictAliasing.o',
+    :source   => 'StrIntTools/StrIntUtilsNoStrictAliasing.cpp',
     :category => :base,
     # Compiling with -O3 causes segfaults on RHEL 6
     :optimize => :heavy,
     :strict_aliasing => false
-  define_component 'Utils/IOUtils.o',
-    :source   => 'Utils/IOUtils.cpp',
+  define_component 'IOTools/IOUtils.o',
+    :source   => 'IOTools/IOUtils.cpp',
     :optimize => :light,
     :category => :base
-  define_component 'Utils/Hasher.o',
-    :source   => 'Utils/Hasher.cpp',
+  define_component 'Algorithms/Hasher.o',
+    :source   => 'Algorithms/Hasher.cpp',
     :category => :base,
     :optimize => :very_heavy
   define_component 'Utils.o',
@@ -321,8 +321,8 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
     :category => :base,
     :optimize => true
 
-  define_component 'Crypto.o',
-    :source   => 'Crypto.cpp',
+  define_component 'SecurityKit/Crypto.o',
+    :source   => 'SecurityKit/Crypto.cpp',
     :category => :other,
     :cflags   => PhusionPassenger::PlatformInfo.crypto_extra_cflags
   define_component 'Utils/CachedFileStat.o',
@@ -350,8 +350,11 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
   define_component 'DataStructures/LString.o',
     :source   => 'DataStructures/LString.cpp',
     :category => :other
-  define_component 'AppTypes.o',
-    :source   => 'AppTypes.cpp',
+  define_component 'AppTypeDetector/CBindings.o',
+    :source   => 'AppTypeDetector/CBindings.cpp',
+    :category => :other
+  define_component 'WrapperRegistry/CBindings.o',
+    :source   => 'WrapperRegistry/CBindings.cpp',
     :category => :other
 
   define_component 'vendor-modified/modp_b64.o',
@@ -380,6 +383,6 @@ end
 
 # A subset of the objects are linked to the Nginx binary. This defines
 # what those objects are.
-NGINX_LIBS_SELECTOR = [:base, 'WatchdogLauncher.o', 'AppTypes.o',
-  'Utils/CachedFileStat.o', 'JsonTools/CBindings.o',
+NGINX_LIBS_SELECTOR = [:base, 'WatchdogLauncher.o', 'AppTypeDetector/CBindings.o',
+  'WrapperRegistry/CBindings.o', 'Utils/CachedFileStat.o', 'JsonTools/CBindings.o',
   'FileTools/PathManipCBindings.o']

data/src/ruby_supportlib/phusion_passenger/config/agent_compiler.rb

@@ -1,7 +1,7 @@
 #  encoding: utf-8
 #
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -133,9 +133,9 @@ module PhusionPassenger
         puts "<banner>Compiling #{PROGRAM_NAME} agent...</banner>"
         progress_bar = ProgressBar.new
         e_working_dir = Shellwords.escape(@working_dir)
-        args = "#{e_working_dir}/support-binaries/#{AGENT_EXE}" +
-          " CACHING=false" +
-          " OUTPUT_DIR=#{e_working_dir} "
+        args = "#{e_working_dir}/support-binaries/#{AGENT_EXE}" \
+          " CACHING=false" \
+          " OUTPUT_DIR=#{e_working_dir} " \
           " OPTIMIZE=#{!!@optimize}"
         begin
           progress_bar.set(0)

data/src/ruby_supportlib/phusion_passenger/config/download_agent_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2017 Phusion Holding B.V.
+#  Copyright (c) 2014-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -256,7 +256,11 @@ module PhusionPassenger
       end
 
       def real_download_support_file(site, name, output)
-        url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
+        if site[:url].include?('{{VERSION}}')
+          url = site[:url].gsub('{{VERSION}}', VERSION_STRING) + "/#{name}"
+        else
+          url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
+        end
         options = {
           :cacert => site[:cacert],
           :logger => @logger,

data/src/ruby_supportlib/phusion_passenger/config/download_nginx_engine_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2017 Phusion Holding B.V.
+#  Copyright (c) 2014-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -260,7 +260,11 @@ module PhusionPassenger
       end
 
       def real_download_support_file(site, name, output)
-        url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
+        if site[:url].include?('{{VERSION}}')
+          url = site[:url].gsub('{{VERSION}}', VERSION_STRING) + "/#{name}"
+        else
+          url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
+        end
         options = {
           :cacert => site[:cacert],
           :logger => @logger,

data/src/ruby_supportlib/phusion_passenger/config/nginx_engine_compiler.rb

@@ -251,7 +251,7 @@ module PhusionPassenger
           if @nginx_tarball
             new_screen
             puts "You specified --nginx-tarball, but the file could not be extracted. " +
-              "Please check the path and format (tar.gz), and ensure Passenger can write to " + 
+              "Please check the path and format (tar.gz), and ensure Passenger can write to " +
               PlatformInfo.tmpexedir + "."
             puts
           else

data/src/ruby_supportlib/phusion_passenger/message_channel.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -26,7 +26,7 @@
 module PhusionPassenger
 
   # This class allows reading and writing structured messages over
-  # I/O channels. This is the Ruby implementation of src/cxx_supportlib/Utils/MessageIO.h;
+  # I/O channels. This is the Ruby implementation of src/cxx_supportlib/IOTools/MessageIO.h;
   # see that file for more information.
   class MessageChannel
     HEADER_SIZE = 2                  # :nodoc:

data/src/ruby_supportlib/phusion_passenger/native_support.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -225,7 +225,7 @@ module PhusionPassenger
     end
 
     # Name of the user under which we are executing, or the id as fallback
-    # N.B. loader_shared_helpers.rb has the same method 
+    # N.B. loader_shared_helpers.rb has the same method
     def current_user_name_or_id
       require 'etc' if !defined?(Etc)
       begin
@@ -271,7 +271,11 @@ module PhusionPassenger
     end
 
     def real_download(site, name, output_dir, logger, options)
-      url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
+      if site[:url].include?('{{VERSION}}')
+        url = site[:url].gsub('{{VERSION}}', VERSION_STRING) + "/#{name}"
+      else
+        url = "#{site[:url]}/#{VERSION_STRING}/#{name}"
+      end
       filename = "#{output_dir}/#{name}"
       real_options = options.merge(
         :cacert => site[:cacert],

data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb

@@ -200,6 +200,21 @@ NGINX_CONFIGURATION_OPTIONS = [
     :context  => [:main],
     :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
   },
+  {
+    :name     => 'passenger_disable_anonymous_telemetry',
+    :scope    => :global,
+    :type     => :flag,
+    :default  => false,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
+  {
+    :name     => 'passenger_anonymous_telemetry_proxy',
+    :scope    => :global,
+    :type     => :string,
+    :context  => [:main],
+    :struct   => 'NGX_HTTP_MAIN_CONF_OFFSET'
+  },
   {
     :name     => 'passenger_pre_start',
     :scope    => :global,
@@ -470,6 +485,12 @@ NGINX_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :dynamic_default => 'Autodetected'
   },
+  {
+    :name     => 'passenger_app_start_command',
+    :scope    => :application,
+    :type     => :string,
+    :header   => nil
+  },
   {
     :name     => 'passenger_restart_dir',
     :scope    => :application,
@@ -604,6 +625,14 @@ NGINX_CONFIGURATION_OPTIONS = [
     :field    => 'upstream_config.busy_buffers_size_conf',
     :auto_generate_nginx_tracking_code => false
   },
+  {
+    :name     => 'passenger_request_buffering',
+    :scope    => :location,
+    :type     => :flag,
+    :default  => true,
+    :field    => 'upstream_config.request_buffering',
+    :function => 'passenger_conf_set_request_buffering'
+  },
   {
     :name     => 'passenger_intercept_errors',
     :scope    => :location,

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
+#  Copyright (c) 2010-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -56,11 +56,9 @@ module PhusionPassenger
     # A list of globs which match all files that should be packaged
     # in the Phusion Passenger gem or tarball.
     GLOB = [
-      '.editorconfig',
       'configure',
       'Rakefile',
       'README.md',
-      'CODE_OF_CONDUCT.md',
       'CONTRIBUTORS',
       'CONTRIBUTING.md',
       'LICENSE',
@@ -74,46 +72,49 @@ module PhusionPassenger
       'doc/**/*',
       'images/*',
       'man/*',
-      'dev/**/*',
+      # Only inlcude the top-level scripts, required by e.g. the Homebrew packaging.
+      'dev/*',
       'src/**/*',
       'resources/**/*',
       'resources/templates/error_renderer/.editorconfig'
     ]
 
     # Files that should be excluded from the gem or tarball. Overrides GLOB.
+    #
+    # This is not merely an exclusion list on top of GLOB! All files that you
+    # do not want to include in the package must be explicitly specified here!
+    # Otherwise source_packaging_test.rb will complain.
     EXCLUDE_GLOB = [
       '**/.DS_Store',
-      '.gitignore',
+      '**/*.gch',
+      '**/.editorconfig',
+      '.externalToolBuilders/**/*',
+      '.github/**/*',
+      '.settings/**/*',
+      '.vscode/**/*',
+      '.cproject',
       '.gitattributes',
+      '.gitignore',
       '.gitmodules',
-      '.github/*',
-      '.settings/*',
-      '.externalToolBuilders/*',
-      '.vscode/*',
-      '.cproject',
       '.project',
+      'CODE_OF_CONDUCT.md',
       'Gemfile',
       'Gemfile.lock',
-      'yarn.lock',
-      'Vagrantfile',
       'Jenkinsfile',
       'Passenger.sublime-project',
-      'Passenger.xcodeproj/**/*',
+      'Vagrantfile',
+      'yarn.lock',
       'build/support/vendor/*/.*',
       'build/support/vendor/*/spec/**/*',
+      'dev/*/**/*',
+      'packaging/**/*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/.*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/hacking/**/*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/spec/**/*',
       'src/cxx_supportlib/vendor-copy/*/.*',
-      'packaging/**/*',
       'test/**/*'
     ]
 
-    # Files and directories that should be excluded from the Homebrew installation.
-    HOMEBREW_EXCLUDE = [
-      "package.json", "npm-shrinkwrap.json"
-    ]
-
     def self.files
       result = Dir[*GLOB] - Dir[*EXCLUDE_GLOB]
       result.reject! { |path| path =~ %r{/\.\.?$} }