passenger 5.0.0.rc2 → 5.0.1

data/ext/common/Constants.h

@@ -112,7 +112,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "5.0.0.rc2"
+	#define PASSENGER_VERSION "5.0.1"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/Hooks.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -29,6 +29,7 @@
 #include <vector>
 #include <utility>
 
+#include <boost/foreach.hpp>
 #include <oxt/backtrace.hpp>
 
 #include <sys/types.h>

data/ext/common/Utils.cpp

@@ -1081,7 +1081,7 @@ runCommandAndCaptureOutput(const char **command) {
 				syscalls::kill(SIGKILL, pid);
 				syscalls::waitpid(pid, NULL, 0);
 				throw SystemException(string("Cannot read output from the '") +
-					command[1] + "' command", e);
+					command[0] + "' command", e);
 			}
 			done = ret == 0;
 			result.append(buf, ret);

data/ext/common/Utils/JsonUtils.h

@@ -36,6 +36,24 @@ namespace Passenger {
 
 using namespace std;
 
+
+/**************************************************************
+ *
+ * Methods for generating JSON.
+ *
+ **************************************************************/
+
+/**
+ * Returns a JSON document as its string representation.
+ * This string is not prettified and does not contain a
+ * trailing newline.
+ *
+ *     Json::Value doc;
+ *     doc["foo"] = "bar";
+ *     cout << stringifyJson(doc) << endl;
+ *     // Prints:
+ *     // {"foo": "bar"}
+ */
 inline string
 stringifyJson(const Json::Value &value) {
 	Json::FastWriter writer;
@@ -44,12 +62,29 @@ stringifyJson(const Json::Value &value) {
 	return str;
 }
 
-/** `str` MUST be NULL-terminated! */
+/**
+ * Encodes the given string as a JSON string. `str` MUST be NULL-terminated!
+ *
+ *     cout << jsonString("hello \"user\"") << endl;
+ *     // Prints:
+ *     // "hello \"user\""
+ */
 inline string
 jsonString(const Passenger::StaticString &str) {
 	return stringifyJson(Json::Value(Json::StaticString(str.data())));
 }
 
+/**
+ * Encodes the given Unix timestamp into a JSON object that
+ * describes it.
+ *
+ *     timeToJson(time(NULL) - 10);
+ *     // {
+ *     //   "timestamp": 1424887842,
+ *     //   "local": "Wed Feb 25 19:10:34 CET 2015",
+ *     //   "relative": "10s ago"
+ *     // }
+ */
 inline Json::Value
 timeToJson(unsigned long long timestamp) {
 	Json::Value doc;
@@ -107,6 +142,7 @@ signedByteSizeToJson(long long size) {
 	return doc;
 }
 
+
 } // namespace Passenger
 
 #endif /* _PASSENGER_UTILS_JSON_UTILS_H_ */

data/ext/common/agents/Base.cpp

@@ -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.
  *
@@ -1082,7 +1082,7 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 #endif /* __APPLE__ */
 
 void
-installAbortHandler() {
+installAgentAbortHandler() {
 	alternativeStackSize = MINSIGSTKSZ + 128 * 1024;
 	alternativeStack = (char *) malloc(alternativeStackSize);
 	if (alternativeStack == NULL) {
@@ -1492,7 +1492,7 @@ initializeAgent(int argc, char **argv[], const char *processName,
 		stopOnAbort = hasEnvOption("PASSENGER_STOP_ON_ABORT");
 		IGNORE_SYSCALL_RESULT(pipe(emergencyPipe1));
 		IGNORE_SYSCALL_RESULT(pipe(emergencyPipe2));
-		installAbortHandler();
+		installAgentAbortHandler();
 	}
 	oxt::initialize();
 	setup_syscall_interruption_support();
@@ -1518,43 +1518,7 @@ initializeAgent(int argc, char **argv[], const char *processName,
 				argc - argStartIndex);
 		}
 
-		ResourceLocator locator;
-		string ruby;
-
-		if (options.has("passenger_root")) {
-			string path;
-			locator = ResourceLocator(options.get("passenger_root", true));
-			ruby = options.get("default_ruby", false, DEFAULT_RUBY);
-
-			rubyLibDir    = strdup(locator.getRubyLibDir().c_str());
-			passengerRoot = strdup(options.get("passenger_root", true).c_str());
-			defaultRuby   = strdup(ruby.c_str());
-
-			#ifdef __linux__
-				path = ruby + " \"" + locator.getHelperScriptsDir() +
-					"/backtrace-sanitizer.rb\"";
-				backtraceSanitizerCommand = strdup(path.c_str());
-			#endif
-
-			path = locator.getHelperScriptsDir() + "/crash-watch.rb";
-			crashWatch = strdup(path.c_str());
-		} else {
-			shouldDumpWithCrashWatch = false;
-		}
-
-		if (backtraceSanitizerCommand == NULL) {
-			backtraceSanitizerCommand = "c++filt -n";
-			backtraceSanitizerPassProgramInfo = false;
-		}
-
-		if (preinit != NULL) {
-			preinit(options);
-		}
-		options.setDefaultInt("log_level", DEFAULT_LOG_LEVEL);
-		setLogLevel(options.getInt("log_level"));
-		if (options.has("debug_log_file")) {
-			setLogFile(options.get("debug_log_file").c_str());
-		}
+		initializeAgentOptions(options, preinit);
 	} catch (const tracable_exception &e) {
 		P_ERROR("*** ERROR: " << e.what() << "\n" << e.backtrace());
 		exit(1);
@@ -1581,4 +1545,45 @@ initializeAgent(int argc, char **argv[], const char *processName,
 	return options;
 }
 
+void
+initializeAgentOptions(VariantMap &options, PreinitializationFunc preinit) {
+	ResourceLocator locator;
+	string ruby;
+
+	if (options.has("passenger_root")) {
+		string path;
+		locator = ResourceLocator(options.get("passenger_root", true));
+		ruby = options.get("default_ruby", false, DEFAULT_RUBY);
+
+		rubyLibDir    = strdup(locator.getRubyLibDir().c_str());
+		passengerRoot = strdup(options.get("passenger_root", true).c_str());
+		defaultRuby   = strdup(ruby.c_str());
+
+		#ifdef __linux__
+			path = ruby + " \"" + locator.getHelperScriptsDir() +
+				"/backtrace-sanitizer.rb\"";
+			backtraceSanitizerCommand = strdup(path.c_str());
+		#endif
+
+		path = locator.getHelperScriptsDir() + "/crash-watch.rb";
+		crashWatch = strdup(path.c_str());
+	} else {
+		shouldDumpWithCrashWatch = false;
+	}
+
+	if (backtraceSanitizerCommand == NULL) {
+		backtraceSanitizerCommand = "c++filt -n";
+		backtraceSanitizerPassProgramInfo = false;
+	}
+
+	if (preinit != NULL) {
+		preinit(options);
+	}
+	options.setDefaultInt("log_level", DEFAULT_LOG_LEVEL);
+	setLogLevel(options.getInt("log_level"));
+	if (options.has("debug_log_file")) {
+		setLogFile(options.get("debug_log_file").c_str());
+	}
+}
+
 } // namespace Passenger

data/ext/common/agents/Base.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010, 2011, 2012 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -43,7 +43,8 @@ bool feedbackFdAvailable();
 VariantMap initializeAgent(int argc, char **argv[], const char *processName,
 	OptionParserFunc optionParser = NULL, PreinitializationFunc preinit = NULL,
 	int argStartIndex = 1);
-void installAbortHandler();
+void initializeAgentOptions(VariantMap &options, PreinitializationFunc preinit = NULL);
+void installAgentAbortHandler();
 void installDiagnosticsDumper(DiagnosticsDumper func, void *userData);
 
 }

data/ext/common/agents/HelperAgent/RequestHandler/InitRequest.cpp

@@ -415,16 +415,18 @@ setStickySessionId(Client *client, Request *req) {
 		// headers, although this is in practice extremely rare.
 		// http://stackoverflow.com/questions/16305814/are-multiple-cookie-headers-allowed-in-an-http-request
 		const LString *cookieHeader = req->headers.lookup(HTTP_COOKIE);
-		const LString *cookieName = getStickySessionCookieName(req);
-		vector< pair<StaticString, StaticString> > cookies;
-		pair<StaticString, StaticString> cookie;
-
-		parseCookieHeader(req->pool, cookieHeader, cookies);
-		foreach (cookie, cookies) {
-			if (psg_lstr_cmp(cookieName, cookie.first)) {
-				// This cookie matches the one we're looking for.
-				req->options.stickySessionId = stringToUint(cookie.second);
-				return;
+		if (cookieHeader != NULL) {
+			const LString *cookieName = getStickySessionCookieName(req);
+			vector< pair<StaticString, StaticString> > cookies;
+			pair<StaticString, StaticString> cookie;
+
+			parseCookieHeader(req->pool, cookieHeader, cookies);
+			foreach (cookie, cookies) {
+				if (psg_lstr_cmp(cookieName, cookie.first)) {
+					// This cookie matches the one we're looking for.
+					req->options.stickySessionId = stringToUint(cookie.second);
+					return;
+				}
 			}
 		}
 	}

data/ext/nginx/Configuration.c

@@ -745,7 +745,10 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->upstream_config.upstream = prev->upstream_config.upstream;
     }
 
-    if (conf->enabled) {
+    if (conf->enabled == 1 /* and not NGX_CONF_UNSET */
+     && passenger_main_conf.root_dir.len != 0
+     && clcf->handler == NULL /* no handler set by other modules */)
+    {
         clcf->handler = passenger_content_handler;
     }
 

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.0.rc2'
+  VERSION_STRING = '5.0.1'
 
   PREFERRED_NGINX_VERSION = '1.6.2'
   NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'

data/lib/phusion_passenger/common_library.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2012-2014 Phusion
+#  Copyright (c) 2012-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -412,6 +412,12 @@ COMMON_LIBRARY = CommonLibraryBuilder.new do
       ApplicationPool2/Spawner.h
       ApplicationPool2/Common.h
       ApplicationPool2/Pool.h
+      ApplicationPool2/Pool/AnalyticsCollection.h
+      ApplicationPool2/Pool/GarbageCollection.h
+      ApplicationPool2/Pool/GeneralUtils.h
+      ApplicationPool2/Pool/ProcessUtils.h
+      ApplicationPool2/Pool/Inspection.h
+      ApplicationPool2/Pool/Debug.h
       ApplicationPool2/SuperGroup.h
       ApplicationPool2/Group.h
       ApplicationPool2/Process.h

data/lib/phusion_passenger/config/restart_app_command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2014 Phusion
+#  Copyright (c) 2013-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -30,6 +30,8 @@ PhusionPassenger.require_passenger_lib 'admin_tools/instance_registry'
 PhusionPassenger.require_passenger_lib 'config/command'
 PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/json'
+PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
+PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
 
 module PhusionPassenger
   module Config
@@ -104,7 +106,7 @@ module PhusionPassenger
         super
         case @argv.size
         when 0
-          if !@options[:app_group_name]
+          if !@options[:app_group_name] && !STDIN.tty?
             abort "Please pass either an app path prefix or an app group name. " +
               "See --help for more information."
           end
@@ -124,6 +126,9 @@ module PhusionPassenger
         @groups = []
         if app_group_name = @options[:app_group_name]
           select_app_group_name_exact(app_group_name)
+        elsif @argv.empty?
+          # STDIN is guaranteed to be a TTY thanks to the check in #parse_options.
+          select_app_group_name_interactively
         else
           select_app_group_name_by_app_root_regex(@argv.first)
         end
@@ -141,6 +146,39 @@ module PhusionPassenger
         end
       end
 
+      def query_group_names
+        result = []
+        query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|
+          result << group.elements["name"].text
+        end
+        result << "Cancel"
+        result
+      end
+
+      def select_app_group_name_interactively
+        colors = PhusionPassenger::Utils::AnsiColors.new
+
+        puts "Please select the application to restart."
+        puts colors.ansi_colorize("<gray>Tip: re-run this command with --help to learn how to automate it.</gray>")
+        puts colors.ansi_colorize("<dgray>If the menu doesn't display correctly, press '!'</dgray>")
+        puts
+
+        choices = query_group_names
+        menu = PhusionPassenger::Utils::TerminalChoiceMenu.new(choices, :single_choice)
+        begin
+          index, name = menu.query
+        rescue Interrupt
+          abort
+        end
+
+        if index == choices.size - 1
+          abort
+        else
+          puts
+          select_app_group_name_exact(name)
+        end
+      end
+
       def select_app_group_name_by_app_root_regex(app_root)
         regex = /^#{Regexp.escape(app_root)}/
         query_pool_xml.elements.each("info/supergroups/supergroup/group") do |group|

data/lib/phusion_passenger/config/utils.rb

@@ -89,12 +89,10 @@ module PhusionPassenger
       def list_all_passenger_instances(instances)
         puts "The following #{PROGRAM_NAME} instances are running:"
         puts
+        printf "%-25s  %s\n", "Name", "Description"
+        puts "------------------------------------------------------------------"
         instances.each do |instance|
-          printf "%-25s  %s\n", "Name", "Description"
-          puts "------------------------------------------------------------------"
-          instances.each do |instance|
-            printf "%-25s  %s\n", instance.name, instance.server_software
-          end
+          printf "%-25s  %s\n", instance.name, instance.server_software
         end
       end
 

data/lib/phusion_passenger/utils/ansi_colors.rb

@@ -1,5 +1,5 @@
 #  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.
 #
@@ -27,6 +27,7 @@ module PhusionPassenger
     module AnsiColors
       RESET    = "\e[0m".freeze
       BOLD     = "\e[1m".freeze
+      GRAY     = "\e[38;5;248m".freeze
       DGRAY    = "\e[90m".freeze
       RED      = "\e[31m".freeze
       ORANGE   = "\e[38;5;214m".freeze
@@ -40,7 +41,7 @@ module PhusionPassenger
       extend self  # Make methods available as class methods.
 
       def self.new(type = :auto)
-        return AnsiColorsPrinter.new(type)
+        AnsiColorsPrinter.new(type)
       end
 
       def self.included(klass)
@@ -54,23 +55,25 @@ module PhusionPassenger
       def ansi_colorize(text)
         text = text.gsub(%r{<b>(.*?)</b>}m, "#{BOLD}\\1#{DEFAULT_TERMINAL_COLOR}")
         text.gsub!(%r{<dgray>(.*?)</dgray>}m, "#{BOLD}#{DGRAY}\\1#{DEFAULT_TERMINAL_COLOR}")
+        text.gsub!(%r{<gray>(.*?)</gray>}m, "#{BOLD}#{GRAY}\\1#{DEFAULT_TERMINAL_COLOR}")
         text.gsub!(%r{<red>(.*?)</red>}m, "#{BOLD}#{RED}\\1#{DEFAULT_TERMINAL_COLOR}")
         text.gsub!(%r{<orange>(.*?)</orange>}m, "#{BOLD}#{ORANGE}\\1#{DEFAULT_TERMINAL_COLOR}")
         text.gsub!(%r{<green>(.*?)</green>}m, "#{BOLD}#{GREEN}\\1#{DEFAULT_TERMINAL_COLOR}")
         text.gsub!(%r{<yellow>(.*?)</yellow>}m, "#{BOLD}#{YELLOW}\\1#{DEFAULT_TERMINAL_COLOR}")
         text.gsub!(%r{<banner>(.*?)</banner>}m, "#{BOLD}#{BLUE_BG}#{YELLOW}\\1#{DEFAULT_TERMINAL_COLOR}")
-        return text
+        text
       end
 
       def strip_color_tags(text)
         text = text.gsub(%r{<b>(.*?)</b>}m, "\\1")
         text = text.gsub(%r{<dgray>(.*?)</dgray>}m, "\\1")
+        text = text.gsub(%r{<gray>(.*?)</gray>}m, "\\1")
         text.gsub!(%r{<red>(.*?)</red>}m, "\\1")
         text.gsub!(%r{<orange>(.*?)</orange>}m, "\\1")
         text.gsub!(%r{<green>(.*?)</green>}m, "\\1")
         text.gsub!(%r{<yellow>(.*?)</yellow>}m, "\\1")
         text.gsub!(%r{<banner>(.*?)</banner>}m, "\\1")
-        return text
+        text
       end
     end
 
@@ -80,71 +83,75 @@ module PhusionPassenger
       end
 
       def reset
-        return maybe_colorize(AnsiColors::RESET)
+        maybe_colorize(AnsiColors::RESET)
       end
 
       def bold
-        return maybe_colorize(AnsiColors::BOLD)
+        maybe_colorize(AnsiColors::BOLD)
       end
 
       def dgray
-        return maybe_colorize(AnsiColors::DGRAY)
+        maybe_colorize(AnsiColors::DGRAY)
+      end
+
+      def gray
+        maybe_colorize(AnsiColors::GRAY)
       end
 
       def red
-        return maybe_colorize(AnsiColors::RED)
+        maybe_colorize(AnsiColors::RED)
       end
 
       def orange
-        return maybe_colorize(AnsiColors::ORANGE)
+        maybe_colorize(AnsiColors::ORANGE)
       end
 
       def green
-        return maybe_colorize(AnsiColors::GREEN)
+        maybe_colorize(AnsiColors::GREEN)
       end
 
       def yellow
-        return maybe_colorize(AnsiColors::YELLOW)
+        maybe_colorize(AnsiColors::YELLOW)
       end
 
       def white
-        return maybe_colorize(AnsiColors::WHITE)
+        maybe_colorize(AnsiColors::WHITE)
       end
 
       def black_bg
-        return maybe_colorize(AnsiColors::BLACK_BG)
+        maybe_colorize(AnsiColors::BLACK_BG)
       end
 
       def blue_bg
-        return maybe_colorize(AnsiColors::BLUE_BG)
+        maybe_colorize(AnsiColors::BLUE_BG)
       end
 
       def default_terminal_color
-        return maybe_colorize(AnsiColors::DEFAULT_TERMINAL_COLOR)
+        maybe_colorize(AnsiColors::DEFAULT_TERMINAL_COLOR)
       end
 
       def ansi_colorize(text)
         if should_output_color?
-          return AnsiColors.ansi_colorize(text)
+          AnsiColors.ansi_colorize(text)
         else
-          return AnsiColors.strip_color_tags(text)
+          AnsiColors.strip_color_tags(text)
         end
       end
 
     private
       def maybe_colorize(ansi_color)
         if should_output_color?
-          return ansi_color
+          ansi_color
         else
-          return ""
+          ""
         end
       end
 
       def should_output_color?
         if @enabled == :auto
-          return STDOUT.tty?
+          STDOUT.tty?
         else
-          return @enabled
+          @enabled
         end
       end
     end