passenger 5.3.7 → 6.0.0

data/src/nginx_module/ContentHandler.h

@@ -40,6 +40,11 @@ typedef struct {
     u_char     *status_start;
     u_char     *status_end;
 
+    /* body_rechunk_output_filter state. */
+    ngx_chain_t *free;
+    ngx_chain_t *busy;
+    unsigned header_sent: 1;
+
     /** The application's 'public' directory. */
     ngx_str_t   public_dir;
 

data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c

@@ -75,6 +75,8 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->app_type.len  = 0;
     conf->startup_file.data = NULL;
     conf->startup_file.len  = 0;
+    conf->app_start_command.data = NULL;
+    conf->app_start_command.len  = 0;
     conf->restart_dir.data = NULL;
     conf->restart_dir.len  = 0;
     conf->abort_websockets_on_process_shutdown = NGX_CONF_UNSET;
@@ -183,6 +185,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->startup_file_source_file.len = 0;
     conf->startup_file_source_line = 0;
     conf->startup_file_explicitly_set = 0;
+    conf->app_start_command_source_file.data = NULL;
+    conf->app_start_command_source_file.len = 0;
+    conf->app_start_command_source_line = 0;
+    conf->app_start_command_explicitly_set = 0;
     conf->restart_dir_source_file.data = NULL;
     conf->restart_dir_source_file.len = 0;
     conf->restart_dir_source_line = 0;
@@ -255,6 +261,10 @@ passenger_create_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t  *con
     conf->upstream_config_busy_buffers_size_conf_source_file.len = 0;
     conf->upstream_config_busy_buffers_size_conf_source_line = 0;
     conf->upstream_config_busy_buffers_size_conf_explicitly_set = 0;
+    conf->upstream_config_request_buffering_source_file.data = NULL;
+    conf->upstream_config_request_buffering_source_file.len = 0;
+    conf->upstream_config_request_buffering_source_line = 0;
+    conf->upstream_config_request_buffering_explicitly_set = 0;
     conf->upstream_config_intercept_errors_source_file.data = NULL;
     conf->upstream_config_intercept_errors_source_file.len = 0;
     conf->upstream_config_intercept_errors_source_line = 0;

data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c

@@ -345,6 +345,20 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
             (const char *) plcf->autogenerated.startup_file.data,
             plcf->autogenerated.startup_file.len);
     }
+    if (plcf->autogenerated.app_start_command_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            app_options_container,
+            "passenger_app_start_command",
+            sizeof("passenger_app_start_command") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.app_start_command_source_file,
+            plcf->autogenerated.app_start_command_source_line);
+        psg_json_value_set_str(hierarchy_member, "value",
+            (const char *) plcf->autogenerated.app_start_command.data,
+            plcf->autogenerated.app_start_command.len);
+    }
     if (plcf->autogenerated.restart_dir_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);
@@ -529,6 +543,19 @@ generate_config_manifest_for_autogenerated_loc_conf(manifest_gen_ctx_t *ctx, pas
         psg_json_value_set_bool(hierarchy_member, "value",
             plcf->upstream_config.buffering);
     }
+    if (plcf->autogenerated.upstream_config_request_buffering_explicitly_set) {
+        find_or_create_manifest_app_and_loc_options_containers(ctx,
+            plcf, cscf, clcf, &app_options_container, &loc_options_container);
+        option_container = find_or_create_manifest_option_container(ctx,
+            loc_options_container,
+            "passenger_request_buffering",
+            sizeof("passenger_request_buffering") - 1);
+        hierarchy_member = add_manifest_option_container_hierarchy_member(option_container,
+            &plcf->autogenerated.upstream_config_request_buffering_source_file,
+            plcf->autogenerated.upstream_config_request_buffering_source_line);
+        psg_json_value_set_bool(hierarchy_member, "value",
+            plcf->upstream_config.request_buffering);
+    }
     if (plcf->autogenerated.upstream_config_intercept_errors_explicitly_set) {
         find_or_create_manifest_app_and_loc_options_containers(ctx,
             plcf, cscf, clcf, &app_options_container, &loc_options_container);

data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c

@@ -113,6 +113,9 @@ passenger_merge_autogenerated_loc_conf(passenger_autogenerated_loc_conf_t *conf,
     ngx_conf_merge_str_value(conf->startup_file,
         prev->startup_file,
         NULL);
+    ngx_conf_merge_str_value(conf->app_start_command,
+        prev->app_start_command,
+        NULL);
     ngx_conf_merge_str_value(conf->restart_dir,
         prev->restart_dir,
         "tmp");

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/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
@@ -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;
 
 /**

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,15 +31,16 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h configkit_schemas_inline_comments' after changing this number.
-  VERSION_STRING = '5.3.7'
+  VERSION_STRING = '6.0.0'
 
-  PREFERRED_NGINX_VERSION = '1.14.0'
-  NGINX_SHA256_CHECKSUM = '5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5'
+  # Tip: find the SHA-256 with ./dev/nginx_version_sha2 <VERSION>
+  PREFERRED_NGINX_VERSION = '1.15.7'
+  NGINX_SHA256_CHECKSUM = '8f22ea2f6c0e0a221b6ddc02b6428a3ff708e2ad55f9361102b1c9f4142bdf93'
 
   # Packaging may be locked to an older version due to the specific module configuration being
   # incompatible with the version we prefer (latest stable).
-  PACKAGING_PREFERRED_NGINX_VERSION = '1.14.0'
-  PACKAGING_NGINX_SHA256_CHECKSUM = '5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5'
+  PACKAGING_PREFERRED_NGINX_VERSION = '1.15.7'
+  PACKAGING_NGINX_SHA256_CHECKSUM = '8f22ea2f6c0e0a221b6ddc02b6428a3ff708e2ad55f9361102b1c9f4142bdf93'
 
   # sha256sum of the .tar.gz
   PREFERRED_PCRE_VERSION  = '8.42'

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

@@ -354,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/nginx/config_options.rb

@@ -485,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,
@@ -619,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/standalone/app_finder.rb

@@ -150,6 +150,7 @@ module PhusionPassenger
         options = options.dup
         ConfigUtils.load_local_config_file!(dir, options)
         options[:app_type] ||
+        options[:app_start_command] ||
           STARTUP_FILES.any? do |file|
             File.exist?("#{dir}/#{file}")
           end

data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2015-2017 Phusion Holding B.V.
+#  Copyright (c) 2015-2018 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -242,6 +242,16 @@ module PhusionPassenger
         :type_desc => 'FILENAME',
         :desc      => 'Force given startup file to be used'
       },
+      {
+        :name      => :app_start_command,
+        :type_desc => 'COMMAND',
+        :desc      => 'Force the app to be started through this command'
+      },
+      {
+        :name      => :app_support_kuria_protocol,
+        :type      => :boolean,
+        :desc      => 'Force the app to be recognized as a Kuria app',
+      },
       {
         :name      => :spawn_method,
         :type_desc => 'NAME',

data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb

@@ -139,6 +139,7 @@ module PhusionPassenger
           add_param(command, :environment, "--environment")
           add_param(command, :app_type, "--app-type")
           add_param(command, :startup_file, "--startup-file")
+          add_param(command, :app_start_command, "--app-start-command")
           add_param(command, :spawn_method, "--spawn-method")
           add_param(command, :restart_dir, "--restart-dir")
           if @options.has_key?(:friendly_error_pages)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 5.3.7
+  version: 6.0.0
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-10 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -301,6 +301,7 @@ files:
 - src/agent/Core/SpawningKit/UserSwitchingRules.h
 - src/agent/Core/TelemetryCollector.h
 - src/agent/ExecHelper/ExecHelperMain.cpp
+- src/agent/FileReadHelper/FileReadHelperMain.cpp
 - src/agent/README.md
 - src/agent/Shared/ApiAccountUtils.h
 - src/agent/Shared/ApiServerUtils.h
@@ -358,6 +359,7 @@ files:
 - src/cxx_supportlib/Algorithms/Hasher.cpp
 - src/cxx_supportlib/Algorithms/Hasher.h
 - src/cxx_supportlib/Algorithms/MovingAverage.h
+- src/cxx_supportlib/AppLocalConfigFileUtils.h
 - src/cxx_supportlib/AppTypeDetector/CBindings.cpp
 - src/cxx_supportlib/AppTypeDetector/CBindings.h
 - src/cxx_supportlib/AppTypeDetector/Detector.h