passenger 5.0.28 → 5.0.29

data/src/nginx_module/MergeLocationConfig.c.cxxcodebuilder

@@ -0,0 +1,144 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#
+#  "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
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+# This file uses the cxxcodebuilder API. Learn more at:
+# https://github.com/phusion/passenger/cxxcodebuilder
+
+require 'phusion_passenger/nginx/config_options'
+
+def main
+  set_indent_string '    '
+  comment copyright_header_for(__FILE__)
+
+  separator
+
+  comment %q{
+    MergeLocationConfig.c is automatically generated from MergeLocationConfig.c.cxxcodebuilder,
+    using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
+    Edits to MergeLocationConfig.c will be lost.
+
+    To update MergeLocationConfig.c:
+      rake nginx
+
+    To force regeneration of MergeLocationConfig.c:
+      rm -f src/nginx_module/MergeLocationConfig.c
+      rake src/nginx_module/MergeLocationConfig.c
+  }
+
+  separator
+
+  comment %q{
+    0: NGX_CONF_ERROR, 1: OK
+  }
+  function('int generated_merge_part(passenger_loc_conf_t *conf, passenger_loc_conf_t *prev, ngx_conf_t *cf)') do
+    filter_eligible_options(LOCATION_CONFIGURATION_OPTIONS).each do |option|
+      if option[:type] == :string
+        add_code %Q{
+          ngx_conf_merge_str_value(conf->#{struct_field_for(option)},
+            prev->#{struct_field_for(option)},
+            NULL);
+        }
+      elsif option[:type] == :integer || option[:type] == :flag
+        add_code %Q{
+          ngx_conf_merge_value(conf->#{struct_field_for(option)},
+            prev->#{struct_field_for(option)},
+            NGX_CONF_UNSET);
+        }
+      elsif option[:type] == :uinteger
+        add_code %Q{
+          ngx_conf_merge_uint_value(conf->#{struct_field_for(option)},
+            prev->#{struct_field_for(option)},
+            #{default_value_for(option) || "NGX_CONF_UNSET_UINT"});
+        }
+      elsif option[:type] == :string_array
+        add_code %Q{
+          if (merge_string_array(cf, &prev->#{struct_field_for(option)}, &conf->#{struct_field_for(option)}) != NGX_OK) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+              "cannot merge \\"#{option[:name]}\\" configurations");
+            return 0;
+          }
+        }
+      elsif option[:type] == :string_keyval
+        add_code %Q{
+          if (merge_string_keyval_table(cf, &prev->#{struct_field_for(option)}, &conf->#{struct_field_for(option)}) != NGX_OK) {
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+              "cannot merge \\"#{option[:name]}\\" configurations");
+            return 0;
+          }
+        }
+      else
+        raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}"
+      end
+    end
+
+    separator
+    add_code %q{
+      return 1;
+    }
+  end
+end
+
+def filter_eligible_options(options)
+  options.reject do |option|
+    option[:alias_for] ||
+      option.fetch(:field, true).nil? ||
+      option[:field].to_s =~ /\./ ||
+      !option.fetch(:auto_generate_nginx_merge_code, true)
+  end
+end
+
+def struct_field_for(option)
+  if option.has_key?(:field)
+    option[:field]
+  else
+    option[:name].sub(/^passenger_/, '')
+  end
+end
+
+def default_value_for(option)
+  case option[:type]
+  when :string
+    if option[:default]
+      option[:default].inspect
+    else
+      "NULL"
+    end
+  when :integer, :flag
+    if option[:default]
+      option[:default]
+    else
+       "NGX_CONF_UNSET"
+    end
+  when :uinteger
+    if option[:default]
+      option[:default]
+    else
+      "NGX_CONF_UNSET_UINT"
+    end
+  else
+    raise "Unknown type #{option[:type].inspect} for option #{option[:name]}"
+  end
+end
+
+main

data/src/nginx_module/ngx_http_passenger_module.c

@@ -131,7 +131,7 @@ starting_watchdog_after_fork(void *paramCycle, void *paramParams) {
     ngx_cycle_t *cycle = (void *) paramCycle;
     PsgVariantMap *params = (void *) paramParams;
 
-    const char  *log_filename;
+    char        *log_filename;
     FILE        *log_file;
     ngx_core_conf_t *ccf;
     ngx_uint_t   i;
@@ -142,7 +142,7 @@ starting_watchdog_after_fork(void *paramCycle, void *paramParams) {
      * Make sure that they're both redirected to the log file.
      */
     log_file = NULL;
-    log_filename = (const char *) psg_variant_map_get_optional(params, "log_file");
+    log_filename = psg_variant_map_get_optional(params, "log_file");
     if (log_filename == NULL) {
         ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
                 "no passenger log file configured, discarding log output");
@@ -152,6 +152,8 @@ starting_watchdog_after_fork(void *paramCycle, void *paramParams) {
             ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
                     "could not open the passenger log file for writing during Nginx startup, some log lines might be lost (will retry from Passenger core)");
         }
+        free(log_filename);
+        log_filename = NULL;
     }
 
     if (log_file == NULL) {
@@ -223,7 +225,6 @@ start_watchdog(ngx_cycle_t *cycle) {
     ngx_core_conf_t *core_conf;
     ngx_int_t        ret, result;
     ngx_uint_t       i;
-    char            *config_file = NULL;
     ngx_str_t       *prestart_uris;
     char           **prestart_uris_ary = NULL;
     ngx_keyval_t    *ctl = NULL;
@@ -243,11 +244,6 @@ start_watchdog(ngx_cycle_t *cycle) {
     pp_app_type_detector_set_throttle_rate(pp_app_type_detector,
         passenger_main_conf.stat_throttle_rate);
 
-    config_file = ngx_str_null_terminate(&cycle->conf_file);
-    if (config_file == NULL) {
-        goto error_enomem;
-    }
-
     prestart_uris = (ngx_str_t *) passenger_main_conf.prestart_uris->elts;
     prestart_uris_ary = calloc(sizeof(char *), passenger_main_conf.prestart_uris->nelts);
     for (i = 0; i < passenger_main_conf.prestart_uris->nelts; i++) {
@@ -258,7 +254,6 @@ start_watchdog(ngx_cycle_t *cycle) {
     }
 
     psg_variant_map_set_int    (params, "web_server_control_process_pid", getpid());
-    psg_variant_map_set_strset (params, "web_server_config_files", (const char **) &config_file, 1);
     psg_variant_map_set        (params, "server_software", NGINX_VER, strlen(NGINX_VER));
     psg_variant_map_set_bool   (params, "multi_app", 1);
     psg_variant_map_set_bool   (params, "load_shell_envvars", 1);
@@ -348,7 +343,6 @@ cleanup:
     psg_variant_map_free(params);
     free(passenger_root);
     free(error_message);
-    free(config_file);
     if (prestart_uris_ary != NULL) {
         for (i = 0; i < passenger_main_conf.prestart_uris->nelts; i++) {
             free(prestart_uris_ary[i]);

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,12 +31,12 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.28'
+  VERSION_STRING = '5.0.29'
 
-  PREFERRED_NGINX_VERSION = '1.10.0'
-  NGINX_SHA256_CHECKSUM = '8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d'
+  PREFERRED_NGINX_VERSION = '1.10.1'
+  NGINX_SHA256_CHECKSUM = '1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801'
 
-  PREFERRED_PCRE_VERSION  = '8.34'
+  PREFERRED_PCRE_VERSION  = '8.39'
   PCRE_SHA256_CHECKSUM = '1dd78994c81e44ac41cf30b2a21d4b4cc6d76ccde7fc6e77713ed51d7bddca47'
 
   STANDALONE_INTERFACE_VERSION  = 1

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014-2015 Phusion Holding B.V.
+#  Copyright (c) 2014-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -100,7 +100,7 @@ module PhusionPassenger
           opts.separator "  The exit codes are as follows:"
           opts.separator "    0 - All checks passed. No errors, no warnings."
           opts.separator "    #{FAIL_EXIT_CODE} - Some checks failed with an error."
-          opts.separator "    #{WARN_EXIT_CODE} - No checks failed with an error, but some failed produced warnings."
+          opts.separator "    #{WARN_EXIT_CODE} - No checks failed with an error, but some produced warnings."
           opts.separator "    #{INTERNAL_ERROR_CODE} - Some internal error occurred."
           opts.separator ""
 

data/src/ruby_supportlib/phusion_passenger/packaging.rb

@@ -108,6 +108,8 @@ module PhusionPassenger
       'Vagrantfile',
       'Passenger.sublime-project',
       'Passenger.xcodeproj/**/*',
+      'build/support/vendor/*/.*',
+      'build/support/vendor/*/spec/**/*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/.*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/hacking/**/*',
       'src/ruby_supportlib/phusion_passenger/vendor/*/spec/**/*',

data/src/ruby_supportlib/phusion_passenger/platform_info/compiler.rb

@@ -484,6 +484,12 @@ module PhusionPassenger
     end
     memoize :has_math_library?, true
 
+    def self.has_dl_library?
+      return try_link("Checking for -ldl support",
+        :c, "int main() { return 0; }\n", '-ldl')
+    end
+    memoize :has_dl_library?, true
+    
     def self.has_alloca_h?
       return try_compile("Checking for alloca.h",
         :c, '#include <alloca.h>')

data/src/ruby_supportlib/phusion_passenger/platform_info/cxx_portability.rb

@@ -211,7 +211,7 @@ module PhusionPassenger
       end
       result << ' -lrt' if has_rt_library?
       result << ' -lmath' if has_math_library?
-      result << ' -ldl'
+      result << ' -ldl' if has_dl_library?
       result.strip!
       return result
     end

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

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -67,7 +67,7 @@ module PhusionPassenger
           touch_temp_dir_in_background
           ########################
           ########################
-          watch_log_files_in_background if should_watch_logs?
+          watch_log_files_in_background if should_watch_one_or_more_log_files?
           wait_until_engine_has_exited if should_wait_until_engine_has_exited?
         rescue Interrupt
           trapsafe_shutdown_and_cleanup(true)
@@ -456,15 +456,34 @@ module PhusionPassenger
           @threads << thread
           @interruptable_threads << thread
         end
-        thread = Utils.create_thread_and_abort_on_exception do
-          watch_log_file(@options[:log_file])
+        if should_watch_main_log_file?
+          thread = Utils.create_thread_and_abort_on_exception do
+            watch_log_file(@options[:log_file])
+          end
+          @threads << thread
+          @interruptable_threads << thread
         end
-        @threads << thread
-        @interruptable_threads << thread
       end
 
-      def should_watch_logs?
-        return !@options[:daemonize] && @options[:log_file] != "/dev/null"
+      def should_watch_one_or_more_log_files?
+        !@options[:daemonize]
+      end
+
+      def should_watch_main_log_file?
+        if @options[:daemonize]
+          false
+        else
+          begin
+            stat = File.stat(@options[:log_file])
+          rescue Errno::ENOENT
+            stat = nil
+          end
+          if stat
+            stat.file?
+          else
+            true
+          end
+        end
       end
 
       def should_wait_until_engine_has_exited?

data/src/ruby_supportlib/phusion_passenger/vendor/daemon_controller.rb

@@ -1,5 +1,5 @@
 # daemon_controller, library for robust daemon management
-# Copyright (c) 2010-2015 Phusion
+# Copyright (c) 2010-2016 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
@@ -22,6 +22,7 @@
 require 'tempfile'
 require 'fcntl'
 require 'socket'
+require 'pathname'
 require 'timeout'
 if Process.respond_to?(:spawn)
   require 'rbconfig'
@@ -560,7 +561,7 @@ private
   end
 
   def differences_in_log_file
-    if @original_log_file_stat
+    if @original_log_file_stat && @original_log_file_stat.file?
       File.open(@log_file, 'r') do |f|
         f.seek(@original_log_file_stat.size, IO::SEEK_SET)
         diff = f.read.strip
@@ -596,6 +597,39 @@ private
   end
 
   def run_command(command)
+    if should_capture_output_while_running_command?
+      run_command_while_capturing_output(command)
+    else
+      run_command_without_capturing_output(command)
+    end
+  end
+
+  def should_capture_output_while_running_command?
+    if is_std_channel_chardev?(@log_file)
+      false
+    else
+      begin
+        real_log_file = Pathname.new(@log_file).realpath.to_s
+      rescue SystemCallError
+        real_log_file = nil
+      end
+      if real_log_file
+        !is_std_channel_chardev?(real_log_file)
+      else
+        true
+      end
+    end
+  end
+
+  def is_std_channel_chardev?(path)
+    path == "/dev/stdout" ||
+      path == "/dev/stderr" ||
+      path == "/dev/fd/1" ||
+      path == "/dev/fd/2" ||
+      path =~ %r(\A/proc/([0-9]+|self)/fd/[12]\Z)
+  end
+
+  def run_command_while_capturing_output(command)
     # Create tempfile for storing the command's output.
     tempfile = Tempfile.new('daemon-output')
     tempfile_path = tempfile.path
@@ -691,6 +725,90 @@ private
     File.unlink(tempfile_path) rescue nil
   end
 
+  def run_command_without_capturing_output(command)
+    if self.class.fork_supported? || self.class.spawn_supported?
+      if Process.respond_to?(:spawn)
+        options = {
+          :in  => "/dev/null",
+          :out => :out,
+          :err => :err,
+          :close_others => true
+        }
+        @keep_ios.each do |io|
+          options[io] = io
+        end
+        if @daemonize_for_me
+          pid = Process.spawn(@env, ruby_interpreter, SPAWNER_FILE,
+            command, options)
+        else
+          pid = Process.spawn(@env, command, options)
+        end
+      else
+        pid = safe_fork(@daemonize_for_me) do
+          ObjectSpace.each_object(IO) do |obj|
+            if !@keep_ios.include?(obj)
+              obj.close rescue nil
+            end
+          end
+          STDIN.reopen("/dev/null", "r")
+          ENV.update(@env)
+          exec(command)
+        end
+      end
+
+      # run_command might be running in a timeout block (like
+      # in #start_without_locking).
+      begin
+        interruptable_waitpid(pid)
+      rescue Errno::ECHILD
+        # Maybe a background thread or whatever waitpid()'ed
+        # this child process before we had the chance. There's
+        # no way to obtain the exit status now. Assume that
+        # it started successfully; if it didn't we'll know
+        # that later by checking the PID file and by pinging
+        # it.
+        return
+      rescue Timeout::Error
+        daemonization_timed_out
+
+        # If the daemon doesn't fork into the background
+        # in time, then kill it.
+        begin
+          Process.kill('SIGTERM', pid)
+        rescue SystemCallError
+        end
+        begin
+          Timeout.timeout(5, Timeout::Error) do
+            begin
+              interruptable_waitpid(pid)
+            rescue SystemCallError
+            end
+          end
+        rescue Timeout::Error
+          begin
+            Process.kill('SIGKILL', pid)
+            interruptable_waitpid(pid)
+          rescue SystemCallError
+          end
+        end
+        raise DaemonizationTimeout
+      end
+      if $?.exitstatus != 0
+        raise StartError, "Daemon '#{@identifier}' failed to start."
+      end
+    else
+      if @env && !@env.empty?
+        raise "Setting the :env option is not supported on this Ruby implementation."
+      elsif @daemonize_for_me
+        raise "Setting the :daemonize_for_me option is not supported on this Ruby implementation."
+      end
+
+      if !system(command)
+        raise StartError, "Daemon '#{@identifier}' failed to start."
+      end
+    end
+  end
+
   def run_ping_command
     if @ping_command.respond_to?(:call)
       begin