passenger 5.0.10 → 5.0.11

data/ext/nginx/CreateLocationConfig.c

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -36,6 +36,7 @@
  *   rake ext/nginx/CreateLocationConfig.c
  */
 
+void generated_set_conf_part(passenger_loc_conf_t  *conf) {
 
 
 
@@ -201,3 +202,4 @@
 		conf->vary_turbocache_by_cookie.len  = 0;
 	
 
+}

data/ext/nginx/CreateLocationConfig.c.erb

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -36,6 +36,7 @@
  *   rake ext/nginx/CreateLocationConfig.c
  */
 
+void generated_set_conf_part(passenger_loc_conf_t  *conf) {
 <%
 require 'phusion_passenger/nginx/config_options'
 
@@ -73,3 +74,4 @@ end
 		<% raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}" %>
 	<% end %>
 <% end %>
+}

data/ext/nginx/MergeLocationConfig.c

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -36,6 +36,8 @@
  *   rake ext/nginx/MergeLocationConfig.c
  */
 
+/* 0: NGX_CONF_ERROR, 1: OK */
+int generated_merge_part(passenger_loc_conf_t *conf, passenger_loc_conf_t *prev, ngx_conf_t *cf) {
 
 
 
@@ -109,7 +111,7 @@
 		if (merge_string_array(cf, &prev->base_uris, &conf->base_uris) != NGX_OK) {
 			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 				"cannot merge \"passenger_base_uri\" configurations");
-			return NGX_CONF_ERROR;
+			return 0;
 		}
 	
 
@@ -159,7 +161,7 @@
 		if (merge_string_array(cf, &prev->union_station_filters, &conf->union_station_filters) != NGX_OK) {
 			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 				"cannot merge \"union_station_filter\" configurations");
-			return NGX_CONF_ERROR;
+			return 0;
 		}
 	
 
@@ -179,7 +181,7 @@
 		if (merge_string_keyval_table(cf, &prev->env_vars, &conf->env_vars) != NGX_OK) {
 			ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 				"cannot merge \"passenger_env_var\" configurations");
-			return NGX_CONF_ERROR;
+			return 0;
 		}
 	
 
@@ -261,3 +263,5 @@
 			NULL);
 	
 
+	return 1;
+}

data/ext/nginx/MergeLocationConfig.c.erb

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -36,6 +36,8 @@
  *   rake ext/nginx/MergeLocationConfig.c
  */
 
+/* 0: NGX_CONF_ERROR, 1: OK */
+int generated_merge_part(passenger_loc_conf_t *conf, passenger_loc_conf_t *prev, ngx_conf_t *cf) {
 <%
 require 'phusion_passenger/nginx/config_options'
 
@@ -99,15 +101,17 @@ end
 		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 NGX_CONF_ERROR;
+			return 0;
 		}
 	<% elsif option[:type] == :string_keyval %>
 		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 NGX_CONF_ERROR;
+			return 0;
 		}
 	<% else %>
 		<% raise "Unknown option type #{option[:type].inspect} for option #{option[:name]}" %>
 	<% end %>
 <% end %>
+	return 1;
+}

data/ext/nginx/ngx_http_passenger_module.c

@@ -47,10 +47,6 @@
 #include "common/Utils/modp_b64.cpp" /* File is C compatible. */
 
 
-#define HELPER_SERVER_MAX_SHUTDOWN_TIME 5
-#define HELPER_SERVER_PASSWORD_SIZE     64
-
-
 static int                first_start = 1;
 ngx_str_t                 pp_schema_string;
 ngx_str_t                 pp_placeholder_upstream_address;
@@ -101,8 +97,10 @@ ignore_sigpipe() {
 static char *
 ngx_str_null_terminate(ngx_str_t *str) {
     char *result = malloc(str->len + 1);
-    memcpy(result, str->data, str->len);
-    result[str->len] = '\0';
+    if (result != NULL) {
+        memcpy(result, str->data, str->len);
+        result[str->len] = '\0';
+    }
     return result;
 }
 
@@ -147,10 +145,10 @@ save_master_process_pid(ngx_cycle_t *cycle) {
 }
 
 /**
- * This function is called after forking and just before exec()ing the helper server.
+ * This function is called after forking and just before exec()ing the watchdog.
  */
 static void
-starting_helper_server_after_fork(void *arg) {
+starting_watchdog_after_fork(void *arg) {
     ngx_cycle_t *cycle = (void *) arg;
     char        *log_filename;
     FILE        *log_file;
@@ -245,6 +243,7 @@ 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;
@@ -257,24 +256,29 @@ start_watchdog(ngx_cycle_t *cycle) {
     result    = NGX_OK;
     params    = pp_variant_map_new();
     passenger_root = ngx_str_null_terminate(&passenger_main_conf.root_dir);
+    if (passenger_root == NULL) {
+        goto error_enomem;
+    }
 
     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++) {
-        prestart_uris_ary[i] = malloc(prestart_uris[i].len + 1);
+        prestart_uris_ary[i] = ngx_str_null_terminate(&prestart_uris[i]);
         if (prestart_uris_ary[i] == NULL) {
-            ngx_log_error(NGX_LOG_ALERT, cycle->log, ENOMEM, "Cannot allocate memory");
-            result = NGX_ERROR;
-            goto cleanup;
+            goto error_enomem;
         }
-        memcpy(prestart_uris_ary[i], prestart_uris[i].data, prestart_uris[i].len);
-        prestart_uris_ary[i][prestart_uris[i].len] = '\0';
     }
 
     pp_variant_map_set_int    (params, "web_server_pid", getpid());
+    pp_variant_map_set_strset (params, "web_server_config_files", (const char **) &config_file, 1);
     pp_variant_map_set        (params, "server_software", NGINX_VER, strlen(NGINX_VER));
     pp_variant_map_set_bool   (params, "multi_app", 1);
     pp_variant_map_set_bool   (params, "load_shell_envvars", 1);
@@ -325,7 +329,7 @@ start_watchdog(ngx_cycle_t *cycle) {
     ret = pp_agents_starter_start(pp_agents_starter,
         passenger_root,
         params,
-        starting_helper_server_after_fork,
+        starting_watchdog_after_fork,
         cycle,
         &error_message);
     if (!ret) {
@@ -354,29 +358,11 @@ start_watchdog(ngx_cycle_t *cycle) {
         goto cleanup;
     }
 
-    /* Create various other info files. */
-    last = ngx_snprintf(filename, sizeof(filename) - 1,
-                        "%s/web_server.txt",
-                        pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
-    *last = (u_char) '\0';
-    if (create_file(cycle, filename, (const u_char *) NGINX_VER, strlen(NGINX_VER)) != NGX_OK) {
-        result = NGX_ERROR;
-        goto cleanup;
-    }
-
-    last = ngx_snprintf(filename, sizeof(filename) - 1,
-                        "%s/config_files.txt",
-                        pp_agents_starter_get_instance_dir(pp_agents_starter, NULL));
-    *last = (u_char) '\0';
-    if (create_file(cycle, filename, cycle->conf_file.data, cycle->conf_file.len) != NGX_OK) {
-        result = NGX_ERROR;
-        goto cleanup;
-    }
-
 cleanup:
     pp_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]);
@@ -389,13 +375,18 @@ cleanup:
     }
 
     return result;
+
+error_enomem:
+    ngx_log_error(NGX_LOG_ALERT, cycle->log, ENOMEM, "Cannot allocate memory");
+    result = NGX_ERROR;
+    goto cleanup;
 }
 
 /**
- * Shutdown the helper server, if there's one running.
+ * Shutdown the watchdog, if there's one running.
  */
 static void
-shutdown_helper_server() {
+shutdown_watchdog() {
     if (pp_agents_starter != NULL) {
         pp_agents_starter_free(pp_agents_starter);
         pp_agents_starter = NULL;
@@ -413,13 +404,13 @@ pre_config_init(ngx_conf_t *cf)
 {
     char *error_message;
 
-    shutdown_helper_server();
+    shutdown_watchdog();
 
     ngx_memzero(&passenger_main_conf, sizeof(passenger_main_conf_t));
     pp_schema_string.data = (u_char *) "passenger:";
     pp_schema_string.len  = sizeof("passenger:") - 1;
-    pp_placeholder_upstream_address.data = (u_char *) "unix:/passenger_helper_server";
-    pp_placeholder_upstream_address.len  = sizeof("unix:/passenger_helper_server") - 1;
+    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);
     pp_agents_starter = pp_agents_starter_new(AS_NGINX, &error_message);
@@ -442,9 +433,9 @@ static ngx_int_t
 init_module(ngx_cycle_t *cycle) {
     if (passenger_main_conf.root_dir.len != 0 && !ngx_test_config) {
         if (first_start) {
-            /* Ignore SIGPIPE now so that, if the helper server fails to start,
+            /* Ignore SIGPIPE now so that, if the watchdog fails to start,
              * Nginx doesn't get killed by the default SIGPIPE handler upon
-             * writing the password to the helper server.
+             * writing the password to the watchdog.
              */
             ignore_sigpipe();
             first_start = 0;
@@ -486,7 +477,7 @@ init_worker_process(ngx_cycle_t *cycle) {
  */
 static void
 exit_master(ngx_cycle_t *cycle) {
-    shutdown_helper_server();
+    shutdown_watchdog();
 }
 
 

data/helper-scripts/backtrace-sanitizer.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 2013-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -102,7 +102,7 @@ begin
     # Example lines:
     # ./test() [0x400b64]
     # /lib/libc.so.6(__libc_start_main+0xfd) [0x7fcc0ad00c8d]
-    # PassengerAgent server[0x4d2697]
+    # Passenger core[0x4d2697]
     if line =~ /(.*)\[(.*?)\]$/
       # Split line into:
       # subject: /lib/libc.so.6(__libc_start_main+0xfd)

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake ext/common/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.10'
+  VERSION_STRING = '5.0.11'
 
   PREFERRED_NGINX_VERSION = '1.8.0'
   NGINX_SHA256_CHECKSUM = '23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5'

data/lib/phusion_passenger/admin_tools/instance.rb

@@ -108,8 +108,8 @@ module PhusionPassenger
         return response
       end
 
-      def server_pid
-        @server_pid ||= File.read("#{@path}/server.pid").to_i
+      def core_pid
+        @core_pid ||= File.read("#{@path}/core.pid").to_i
       end
 
       def full_admin_password

data/lib/phusion_passenger/admin_tools/instance_registry.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion
+#  Copyright (c) 2014-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -84,12 +84,16 @@ module PhusionPassenger
     private
       def default_paths
         if result = string_env("PASSENGER_INSTANCE_REGISTRY_DIR")
-          return result
+          return [result]
         end
 
+        # On OSX, TMPDIR is set to a different value per-user. But Apache
+        # is launched through Launchctl and runs without TMPDIR (and thus
+        # uses the default /tmp).
+        #
         # The RPM packages configure Apache and Nginx to use /var/run/passenger-instreg
         # as the instance registry dir. See https://github.com/phusion/passenger/issues/1475
-        [string_env("TMPDIR") || "/tmp", "/var/run/passenger-instreg"]
+        [string_env("TMPDIR"), "/tmp", "/var/run/passenger-instreg"].compact
       end
 
       def string_env(name)

data/lib/phusion_passenger/common_library.rb

@@ -475,18 +475,18 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
       Utils/IniFile.h
       Utils/VariantMap.h
     )
-  define_component 'AgentsBase.o',
-    :source   => 'agents/Base.cpp',
+  define_component 'AgentBase.o',
+    :source   => 'agent/Base.cpp',
     :category => :other,
     :deps     => %w(
-      agents/Base.h
+      agent/Base.h
       Utils/VariantMap.h
     )
-  define_component 'agents/LoggingAgent/FilterSupport.o',
-    :source   => 'agents/LoggingAgent/FilterSupport.cpp',
-    :category => :logging_agent,
+  define_component 'agent/UstRouter/FilterSupport.o',
+    :source   => 'agent/UstRouter/FilterSupport.cpp',
+    :category => :ust_router,
     :deps     => %w(
-      agents/LoggingAgent/FilterSupport.h
+      agent/UstRouter/FilterSupport.h
     )
   define_component 'MemoryKit/mbuf.o',
     :source   => 'MemoryKit/mbuf.cpp',
@@ -546,4 +546,4 @@ end
 
 # Objects that must be linked into the Nginx binary.
 NGINX_LIBS_SELECTOR = [:base, 'AgentsStarter.o', 'ApplicationPool2/AppTypes.o',
-  'Utils/CachedFileStat.o', 'agents/LoggingAgent/FilterSupport.o']
+  'Utils/CachedFileStat.o', 'agent/UstRouter/FilterSupport.o']

data/lib/phusion_passenger/config/about_command.rb

@@ -167,7 +167,7 @@ module PhusionPassenger
           end
           puts
           puts "## Notes for RVM users"
-          puts "Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config --ruby-command'."
+          puts "Do you want to know which command to use for a different Ruby interpreter? 'rvm use' that Ruby interpreter, then re-run 'passenger-config about ruby-command'."
         when "--rubyext-compat-id"
           PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
           puts PhusionPassenger::PlatformInfo.ruby_extension_binary_compatibility_id

data/lib/phusion_passenger/config/api_call_command.rb

@@ -37,7 +37,7 @@ module PhusionPassenger
       include PhusionPassenger::Config::Utils
 
       def self.create_default_options
-        { :agent_name => "server_api" }
+        { :agent_name => "core_api" }
       end
 
       def run
@@ -93,8 +93,8 @@ module PhusionPassenger
           opts.on("-a", "--agent NAME", String, "The name of the socket to send the command#{nl}" +
             "to. This specifies which agent the request#{nl}" +
             "is sent to. Choices: watchdog_api,#{nl}" +
-            "server_api, logging_api.#{nl}" +
-            "Default: server_api") do |val|
+            "core_api, ust_router_api.#{nl}" +
+            "Default: core_api") do |val|
             options[:agent_name] = val
           end
           opts.on("-S", "--socket PATH", String, "Instead of inferring the socket path from#{nl}" +

data/lib/phusion_passenger/config/installation_utils.rb

@@ -32,6 +32,7 @@ PhusionPassenger.require_passenger_lib 'console_text_template'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'platform_info/depcheck'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
+PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
 module PhusionPassenger
   module Config
@@ -123,29 +124,41 @@ module PhusionPassenger
       end
 
       def run_rake_task!(target)
-        total_lines = `#{rake} #{target} --dry-run STDERR_TO_STDOUT=1`.split("\n").size - 1
-        backlog = ""
-
-        command = "#{rake} #{target} --trace STDERR_TO_STDOUT=1"
-        IO.popen(command, "rb") do |io|
-          progress = 1
-          while !io.eof?
-            line = io.readline
-            yield(progress, total_lines)
-            if line =~ /^\*\* /
-              backlog.replace("")
-              progress += 1
-            else
-              backlog << line
+        total_lines = `#{rake} #{target} --dry-run STDERR_TO_STDOUT=1 2>&1`.split("\n").size - 1
+        partial_backlog = ""
+        logfile = PhusionPassenger::Utils::TmpIO.new("passenger-install-log",
+          :mode => File::WRONLY, :unlink_immediately => false)
+
+        begin
+          command = "#{rake} #{target} --trace STDERR_TO_STDOUT=1 2>&1"
+          IO.popen(command, "rb") do |io|
+            progress = 1
+            while !io.eof?
+              line = io.readline
+              logfile.write(line)
+              yield(progress, total_lines)
+              if line =~ /^\*\* /
+                partial_backlog.replace("")
+                progress += 1
+              else
+                partial_backlog << line
+              end
             end
           end
-        end
-        if $?.exitstatus != 0
-          stderr = @stderr || STDERR
-          stderr.puts
-          stderr.puts "*** ERROR: the following command failed:"
-          stderr.puts(backlog)
-          exit 1
+          if $?.exitstatus != 0
+            colors = @colors || PhusionPassenger::Utils::AnsiColors.new
+            stderr = @stderr || STDERR
+            stderr.puts
+            stderr.puts "#{colors.red}*** ERROR: a Rake command failed. You can find the full " +
+              "log in #{logfile.path}. Below, you can find the last few lines of the command's output.#{colors.reset}"
+            stderr.puts "#{colors.red}------------- Begin command output snippet -------------#{colors.reset}"
+            stderr.puts(partial_backlog)
+            stderr.puts "#{colors.red}------------- End command output snippet -------------#{colors.reset}"
+            stderr.puts "#{colors.red}The full log can be found in #{logfile.path}#{colors.reset}"
+            exit 1
+          end
+        ensure
+          logfile.close
         end
       end