passenger 4.0.50 → 4.0.51

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjJhMzI2NDM1MTlhN2QwZDE5YmZjOTI1YTAwMWU5NjhmYjBlZTdmMg==
+    NjAyOTQ3MzJjNGQxYzczZmQ4MWFjZWVkMjAxYWZhYTliZWNjM2QzZg==
   data.tar.gz: !binary |-
-    NTEwMzNiNWM5MDlkYWUyNzE3ZTZjNWM1YThlMjg0NmE0ZTEwMGViYQ==
+    MzcxYWNhMjI3YmZlMzQxOTU4ZWQ2ZTFhZTZkZGEyMWI5OTE3NzQzYg==
 SHA512:
   metadata.gz: !binary |-
-    ZjkwMjhmNzExYzNlNzA5ZjQ5MzA2YTQzMjNlY2I0Zjc0OWU4ZDYzNjVlNzE5
-    ZTg5NzBkZGY3NzU5NjU5ZTM0ZGM2MGU5YTg2ZjRjZmI1ZWM2MDBjNjg1ODUx
-    ZTRjNzJiYTdkZDcwNzlmYTNmNmQxNDQ0ODk3OTc0ODA1MDJiNzk=
+    NGQ2OTMyNTc5NmRhMDI5MDgzNWQ3NWU3MDZkNDM3NWQxODdhYzliNjJiZTdl
+    ZWVhZWU2NmI5ZTdlYTY0YjRhOGZmMDAxNzBjZWRjZGFiMzcyODEyNTg3ZWFj
+    ZTkxMGNhNjg0MmMyOTcxNmI2MTM1ZjQ2NmU5YTcxNWU0ODU1ZWY=
   data.tar.gz: !binary |-
-    YzYzOTVhOWVhNTYwY2FiMDU5YTA3NzFjYWJiMjQ3MmVhNmJjNmI5NDQ3ZDY5
-    M2U2OGRmZTA4NzllYmMzN2RkM2RkOWRiZmE5ZDM0MjJhYmQ0ODg5NmYxNWFj
-    OWM1YWQ2Mjg2OTVmZDY4ZTdhZmI5YmJlMGVkNDUzNzgyZTlmZTU=
+    MDY3NGZiYzA2ZmY0MmZkOTJjMmFiYjc4ZjRiMmQ5YzkxNjU2MDU3OGI3NzVh
+    MGE3MTNiMDYwZWI5YmQ1NjNhOGRhZTE1YWVjYTdjZWE5ZjNlYWI3YjBhNmU5
+    YzRkYzIxNWVjMjI0NGJhN2I1YTJmNzhkMzU5YjQ2NzM0MWIxNTU=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJT/ac4AAoJECrHRaUKISqMyBQIAI3940hdxJ7dL8kC+He5qLhk
-RCpmZBZhmANL97OOVslpi3ZSMDE4lUsvn/oPD0T+zO1doaoxsus1CFaorT1vfzB9
-30MEMVXWUMMQ22aWSsWyTmtPL+0HUMRlAmVvgUFW8m27//irl8sIBXA2cFiIHhk+
-8b1OV1wlr6UEkqXmw2XKTyb6+rH9nU3Qhj1VZKsg/7kDCp9R7rNgxn7MuK0+JRUD
-BfDmuovFnkhj+XssXbBGiTg1+n7/Ywie23uY+tmGNKE84S5ZA593BwJPJ8CzahHf
-MKXpCKbr8fWA841sr/4M5BgoCiu4K+5b9VMwvU/K4YMR+pxk+doze9/rBoJara8=
-=/3iD
+iQEcBAABAgAGBQJUIqZfAAoJECrHRaUKISqMSdwH/isfT389hMGZxdtsYMVsPjEt
+Xzz1Kb9FdcDjfTofJftUKvHA8Hb2GLSbzAFUfrkZ3RH8uMbi0BabTC+lCigVbD/w
+wD+es6VaTsbuWKB5ZnM3tLPUXqq8x+q1iaqQPfaR4CFRkKHjjyjx37eHv5T5jSRZ
+ByGpcK9+EJrgVnDNFrNfasK4HftWAuNJx628V0Lg41Z85NbymUeJSZRBzCbT8NZE
+gVpxc1XzrHTgCKfeEDiRFdAi1vg4t2/KoL5lqMtDtSbb0p/Mmnx4b9drGjHVWYY+
+CbpjTVxFnEaWm57ph0y9kzOyHJpCoRvBiUsxUqs+rOi8WIrDXoFcEmGV5IO7VuA=
+=UqIJ
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJT/ac4AAoJECrHRaUKISqMrpEH/126KVkt90cVfXkzNBSB7GxI
-sMCmJK4iHgiTo8QDckXWXYqTGzlYvVN+90vw16aXJQadq4LZ7KEe3Nzon33ljR64
-sJLak3Yiucr+y9QFJaHzfIegD0eZID2nFRxLpUebzsEZlmfpwa9oSkezacCGupEO
-asIRMbNoEgzn4FXB9sGfNTCfVCz/xLVL2527BpZh2T/7kvyib6XtCUpW9uAQG94U
-9L1iOpKXST/gADAnYjJtTSG2TmF/rjqczDy9KgzJsTpFTImZL44ZLNw+wVvzKynt
-GvvBNSXPL3OtAN0Cbh6+fSEP6O7pp9qtMd+KKZONY8Y3jyUb9evYprxeXucYh2A=
-=7wtl
+iQEcBAABAgAGBQJUIqZfAAoJECrHRaUKISqMXh4IAI+HkapDaCYEng9NQJ/pN/+D
+4tvtP587LbTtXjefnwWOCABt/hpnMIrwMqYVSr+PpzFaKkUUduC5OOjeIj61Qcwv
+W3Ozpgc3S6o0mml3fRaT1duXGVA8raR4d1+Qc9hx7miMy1CVV9EzY6u8uIc4bfiA
+O4dh1i8h4qp6XMRBgGciw/st9VykiclUkZWKmQQdvNQRRfhAkhBcOMOMg6J9ElOO
+SAlkH1/hMQtt1QXkML9fJK94atBovyWcmX9TwV6UyWOECfpNAS6iLZ9kWZHcCSjz
+qTgaCna1TXBaAxGmYXXsYdKx+YUuix4WHOBNPjiJ6JmZV8XemoI1AgJBbJKDj2A=
+=Z4ow
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,16 @@
+Release 4.0.51
+--------------
+
+ * Fixed a null termination bug when autodetecting application types.
+ * Node.js apps can now also trigger the inverse port binding mechanism by passing `'/passenger'` as argument. This was introduced in order to be able to support the Hapi.js framework. Please read http://stackoverflow.com/questions/20645231/phusion-passenger-error-http-server-listen-was-called-more-than-once/20645549 for more information regarding Hapi.js support.
+ * It is now possible to abort Node.js WebSocket connections upon application restart. Please refer to https://github.com/phusion/passenger/wiki/Phusion-Passenger:-Node.js-tutorial#restarting_apps_that_serve_long_running_connections for more information. Closes GH-1200.
+ * Passenger Standalone no longer automatically resolves symlinks in its paths.
+ * `passenger-config system-metrics` no longer crashes when the system clock is set to a time in the past. Closes GH-1276.
+ * `passenger-status`, `passenger-memory-stats`, `passenger-install-apache2-module` and `passenger-install-nginx-module` no longer output ANSI color codes by default when STDOUT is not a TTY. Closes GH-487.
+ * `passenger-install-nginx-module --auto` is now all that's necessary to make it fully non-interactive. It is no longer necessary to provide all the answers through command line parameters. Closes GH-852.
+ * Minor contribution by Alessandro Lenzen.
+
+
 Release 4.0.50
 --------------
 

data/CONTRIBUTORS

@@ -1,5 +1,6 @@
 _why
 Adam Duke
+Alessandro Lenzen
 Alex Osborne
 Alex Tomlins
 Aman Gupta
@@ -31,7 +32,9 @@ Hongli Lai (Phusion)
 Ian Ehlert
 isaac
 Isaac Reuben
+J Smith
 J.W. Koelewijn
+Jacob Elder
 Jacob Harris
 James Miller
 Jan Berkel

data/bin/passenger-install-apache2-module

@@ -843,6 +843,9 @@ parser = OptionParser.new do |opts|
 	#		"#{indent}create backups of the existing files.") do
 	#	options[:backup_config] = false
 	#end
+	opts.on("--force-colors", "Display colors even if stdout is not a TTY") do
+		options[:colorize] = true
+	end
 	opts.on("--snippet", "Show just the Apache config snippet.") do
 		options[:snippet] = true
 	end

data/bin/passenger-install-nginx-module

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -241,6 +241,9 @@ private
 		elsif @nginx_source_dir
 			puts "<b>=> Proceeding with choice 2.</b>"
 			return false
+		elsif @auto
+			puts "<b>=> Proceeding with choice 1.</b>"
+			return true
 		else
 			choice = prompt("Enter your choice (1 or 2) or press Ctrl-C to abort") do |input|
 				if input == "1" || input == "2"
@@ -337,6 +340,9 @@ private
 		if @prefix
 			puts "<b>=> #{@prefix}</b>"
 			return @prefix
+		elsif @auto
+			puts "<b>=> /opt/nginx</b>"
+			return "/opt/nginx"
 		else
 			prefix = prompt("Please specify a prefix directory [/opt/nginx]") do |input|
 				if input.empty? || input =~ %r(/)
@@ -414,6 +420,9 @@ private
 					puts "<b>=> #{extra_args}</b>"
 				end
 				return extra_args
+			elsif @auto
+				puts "<b>=> No extra configure flags.</b>"
+				return ""
 			else
 				extra_args = prompt "Extra arguments to pass to configure script"
 			
@@ -624,6 +633,9 @@ parser = OptionParser.new do |opts|
 			"#{indent}'ruby,python,nodejs,meteor')") do |value|
 		options[:languages] = value.split(",")
 	end
+	opts.on("--force-colors", "Display colors even if stdout is not a TTY") do
+		options[:colorize] = true
+	end
 end
 begin
 	parser.parse!

data/bin/passenger-memory-stats

@@ -36,21 +36,16 @@ PhusionPassenger.locate_directories
 PhusionPassenger.require_passenger_lib 'platform_info'
 PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 PhusionPassenger.require_passenger_lib 'admin_tools/memory_stats'
+PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 
 include PhusionPassenger
 
-# ANSI color codes
-RESET   = "\e[0m"
-BOLD    = "\e[1m"
-WHITE   = "\e[37m"
-YELLOW  = "\e[33m"
-BLUE_BG = "\e[44m"
-
 # Container for tabular data.
 class Table
-	def initialize(column_names)
+	def initialize(column_names, colors)
 		@column_names = column_names
 		@rows = []
+		@colors = colors
 	end
 	
 	def add_row(values)
@@ -90,19 +85,19 @@ class Table
 				left_bar_size = free_space / 2
 				right_bar_size = free_space - left_bar_size
 			end
-			result = "#{BLUE_BG}#{BOLD}#{YELLOW}\n"
+			result = "#{@colors.blue_bg}#{@colors.bold}#{@colors.yellow}\n"
 			result << "#{"-" * left_bar_size} #{title} #{"-" * right_bar_size}\n"
 			if !@rows.empty?
-				result << WHITE
+				result << @colors.white
 				result << header
 			end
 		else
 			result = header.dup
 		end
 		if @rows.empty?
-			result << RESET
+			result << @colors.reset
 		else
-			result << ("-" * header.size) << "#{RESET}\n"
+			result << ("-" * header.size) << "#{@colors.reset}\n"
 			@rows.each do |row|
 				result << sprintf(format_string, *row).rstrip << "\n"
 			end
@@ -114,6 +109,7 @@ end
 class App
 	def initialize
 		@stats = AdminTools::MemoryStats.new
+		@colors = Utils::AnsiColors.new
 	end
 	
 	def start
@@ -122,7 +118,7 @@ class App
 		if @stats.apache_processes
 			print_process_list("Apache processes", @stats.apache_processes)
 		else
-			puts "#{BLUE_BG}#{BOLD}#{YELLOW}------------- Apache processes -------------#{RESET}\n"
+			puts "#{@colors.blue_bg}#{@colors.bold}#{@colors.yellow}------------- Apache processes -------------#{@colors.reset}\n"
 			STDERR.puts "*** WARNING: The Apache executable cannot be found."
 			STDERR.puts "Please set the APXS2 environment variable to your 'apxs2' " <<
 				"executable's filename, or set the HTTPD environment variable " <<
@@ -138,14 +134,14 @@ class App
 		if @stats.platform_provides_private_dirty_rss_information? &&
 		   Process.euid != 0 &&
 		   @stats.root_privileges_required_for_private_dirty_rss?
-			puts "*** WARNING: Please run this tool with #{BOLD}#{PlatformInfo.ruby_sudo_command}#{RESET}. Otherwise the " <<
+			puts "*** WARNING: Please run this tool with #{@colors.bold}#{PlatformInfo.ruby_sudo_command}#{@colors.reset}. Otherwise the " <<
 				"private dirty RSS (a reliable metric for real memory usage) of processes cannot be determined."
 		end
 	end
 	
 private
 	def print_process_list(title, processes, options = {})
-		table = Table.new(%w{PID PPID VMSize Private Resident Name})
+		table = Table.new(%w{PID PPID VMSize Private Resident Name}, @colors)
 		table.add_rows(processes)
 		if options.has_key?(:show_ppid) && !options[:show_ppid]
 			table.remove_column('PPID')

data/bin/passenger-status

@@ -41,7 +41,7 @@ require 'optparse'
 include PhusionPassenger::AdminTools
 include PhusionPassenger::Utils::AnsiColors
 
-DEFAULT_OPTIONS = { :show => 'pool' }.freeze
+DEFAULT_OPTIONS = { :show => 'pool', :color => STDOUT.tty? }.freeze
 
 
 ##### Show status command #####
@@ -93,7 +93,7 @@ def show_status(server_instance, options)
 	when 'pool'
 		client = server_instance.connect(:role => :passenger_status)
 		begin
-			puts client.pool_status(:verbose => options[:verbose], :colorize => true)
+			puts client.pool_status(:verbose => options[:verbose], :colorize => options[:color])
 		rescue SystemCallError => e
 			STDERR.puts "*** ERROR: Cannot query status for Phusion Passenger instance #{server_instance.pid}:"
 			STDERR.puts e.to_s
@@ -231,6 +231,9 @@ def create_option_parser(options)
 				options[:show] = what
 			end
 		end
+		opts.on("--force-colors", "Display colors even if stdout is not a TTY") do
+			options[:color] = true
+		end
 		opts.on("--verbose", "-v", "Show verbose information.") do
 			options[:verbose] = true
 		end

data/doc/Users guide Apache.txt

@@ -1705,7 +1705,7 @@ to implement it like that:
   which web applications to pre-start. It's probably not completely impossible
   to obtain such a list, but this brings us to the following point;
 - Users expect things like 'mod_env' to work even in combination with Phusion
-  Passenger. For example some people put ``SetEnv PATH=....'' in their virtual
+  Passenger. For example some people put ``SetEnv PATH ....'' in their virtual
   host block and they expect the web application to pick that environment variable
   up when it's started. Information like this is stored in module-specific
   locations that Phusion Passenger cannot access directly. Even if the previous

data/doc/Users guide Nginx.idmap.txt

@@ -230,13 +230,15 @@
 
 8.6.8. passenger_pass_header <header name>	=>	passenger-pass-header-header-name--1cg31je
 
-8.6.9. passenger_buffer_response <on|off>	=>	passenger-buffer-response
+8.6.9. passenger_ignore_headers <header names…>	=>	passenger-ignore-headers-header-names--12zg5oh
 
-8.6.10. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
+8.6.10. passenger_buffer_response <on|off>	=>	passenger-buffer-response
 
-8.6.11. passenger_buffers	=>	passenger-busy-buffers
+8.6.11. passenger_buffer_size	=>	passenger-buffer-size-1jfkq87
 
-8.6.12. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
+8.6.12. passenger_buffers	=>	passenger-busy-buffers
+
+8.6.13. passenger_busy_buffer_size	=>	passenger-busy-buffer-size-124sj61
 
 8.7. Logging and debugging options	=>	logging-and-debugging-options-14e91ni
 

data/doc/Users guide Nginx.txt

@@ -1854,6 +1854,16 @@ location / {
 }
 ------------------------------
 
+This option may occur in the following places:
+
+ * In the 'http' configuration block.
+ * In a 'server' configuration block.
+ * In a 'location' configuration block.
+ * In an 'if' configuration scope.
+
+==== passenger_ignore_headers <header names...> ====
+Disables processing of certain response header fields from the application, similar to how 'proxy_ignore_headers' works.
+
 This option may occur in the following places:
 
  * In the 'http' configuration block.

data/ext/common/ApplicationPool2/AppTypes.h

@@ -107,6 +107,7 @@ private:
 		pos = appendData(pos, end, appRoot);
 		pos = appendData(pos, end, "/");
 		pos = appendData(pos, end, name);
+		pos = appendData(pos, end, "\0", 1);
 		if (OXT_UNLIKELY(pos == end)) {
 			TRACE_POINT();
 			throw RuntimeException("Not enough buffer space");

data/ext/common/ApplicationPool2/Spawner.h

@@ -1205,6 +1205,16 @@ protected:
 				fflush(stderr);
 				_exit(1);
 			}
+
+			ret = chdir("/");
+			if (ret == -1) {
+				int e = errno;
+				fprintf(stderr, "Cannot chdir(\"/\") inside chroot: %s (errno=%d)\n",
+					strerror(e),
+					e);
+				fflush(stderr);
+				_exit(1);
+			}
 		}
 	}
 

data/ext/common/Constants.h

@@ -90,7 +90,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.50"
+	#define PASSENGER_VERSION "4.0.51"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/Logging.cpp

@@ -24,6 +24,7 @@
  */
 #include <iomanip>
 #include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
 #include <unistd.h>
 #include <Logging.h>
@@ -36,6 +37,7 @@ namespace Passenger {
 int _logLevel = 0;
 int _logOutput = STDERR_FILENO;
 static bool printAppOutputAsDebuggingMessages = false;
+AssertionFailureInfo lastAssertionFailure;
 
 int
 getLogLevel() {
@@ -108,6 +110,15 @@ _writeLogEntry(const std::string &str) {
 	_writeLogEntry(StaticString(str));
 }
 
+const char *
+_strdupStringStream(const std::stringstream &stream) {
+	string str = stream.str();
+	char *buf = (char *) malloc(str.size() + 1);
+	memcpy(buf, str.data(), str.size());
+	buf[str.size()] = '\0';
+	return buf;
+}
+
 static void
 realPrintAppOutput(char *buf, unsigned int bufSize,
 	const char *pidStr, unsigned int pidStrLen,

data/ext/common/Logging.h

@@ -56,14 +56,25 @@ using namespace oxt;
 
 /********** Debug logging facilities **********/
 
+struct AssertionFailureInfo {
+	const char *filename;
+	const char *function; // May be NULL.
+	const char *expression;
+	unsigned int line;
+};
+
 extern int _logLevel;
 extern int _logOutput;
 
+// If assert() or similar fails, we attempt to store its information here.
+extern AssertionFailureInfo lastAssertionFailure;
+
 int getLogLevel();
 void setLogLevel(int value);
 bool setDebugFile(const char *logFile = NULL);
 void _prepareLogEntry(std::stringstream &sstream, const char *file, unsigned int line);
 void _writeLogEntry(const std::string &str);
+const char *_strdupStringStream(const std::stringstream &stream);
 
 
 enum PassengerLogLevel {
@@ -145,22 +156,44 @@ void printAppOutput(pid_t pid, const char *channelName, const char *message, uns
  */
 void setPrintAppOutputAsDebuggingMessages(bool enabled);
 
-
 /** Print a [BUG] error message and abort with a stack trace. */
 #define P_BUG(expr) \
 	do { \
 		TRACE_POINT(); \
-		P_CRITICAL("[BUG] " << expr); \
+		const char *_exprStr; \
+		std::stringstream sstream; \
+		sstream << expr; \
+		_exprStr = Passenger::_strdupStringStream(sstream); \
+		Passenger::lastAssertionFailure.filename = __FILE__; \
+		Passenger::lastAssertionFailure.line = __LINE__; \
+		Passenger::lastAssertionFailure.function = __PRETTY_FUNCTION__; \
+		Passenger::lastAssertionFailure.expression = _exprStr; \
+		P_CRITICAL("[BUG] " << _exprStr); \
 		abort(); \
 	} while (false)
 
 #define P_BUG_UTP(expr) \
 	do { \
 		UPDATE_TRACE_POINT(); \
-		P_CRITICAL("[BUG] " << expr); \
+		const char *_exprStr; \
+		std::stringstream sstream; \
+		sstream << expr; \
+		_exprStr = Passenger::_strdupStringStream(sstream); \
+		Passenger::lastAssertionFailure.filename = __FILE__; \
+		Passenger::lastAssertionFailure.line = __LINE__; \
+		Passenger::lastAssertionFailure.function = __PRETTY_FUNCTION__; \
+		Passenger::lastAssertionFailure.expression = _exprStr; \
+		P_CRITICAL("[BUG] " << _exprStr); \
 		abort(); \
 	} while (false)
 
+#define P_ASSERT_EQ(value, expected) \
+	do { \
+		if (OXT_UNLIKELY(value != expected)) { \
+			P_BUG("Expected " << #value << " to be " << expected << ", got " << value); \
+		} \
+	} while (false)
+
 
 class NotExpectingExceptions {
 private:

data/ext/common/Utils/SpeedMeter.h

@@ -156,6 +156,14 @@ private:
 		}
 	}
 
+	void resetOnClockSkew(unsigned long long timestamp) {
+		if (getLastSample().timestamp > timestamp) {
+			for (unsigned int i = 0; i < maxSamples; i++) {
+				samples[i] = Sample();
+			}
+		}
+	}
+
 public:
 	SpeedMeter()
 		: start(0),
@@ -168,8 +176,7 @@ public:
 		}
 
 		const Sample &lastSample = getLastSample();
-		// Timestamp must be larger than that of previous sample.
-		assert(lastSample.timestamp <= timestamp);
+		resetOnClockSkew(timestamp);
 
 		if (lastSample.timestamp <= timestamp - minAge) {
 			Sample &nextSample = samples[(start + count) % maxSamples];
@@ -235,7 +242,7 @@ public:
 		return numeric_limits<ValueType>::max();
 	}
 
-	#if 1
+	#if 0
 		void debug() const {
 			const unsigned long long timeThreshold = getTimeThreshold();
 

data/ext/common/agents/Base.cpp

@@ -121,14 +121,6 @@ static void *customDiagnosticsDumperUserData;
 static int emergencyPipe1[2] = { -1, -1 };
 static int emergencyPipe2[2] = { -1, -1 };
 
-// If assert() failed, its information is stored here.
-static struct {
-	const char *filename;
-	const char *function; // May be NULL.
-	const char *expression;
-	unsigned int line;
-} lastAssertionFailure;
-
 
 static void
 ignoreSigpipe() {

data/helper-scripts/node-loader.js

@@ -29,6 +29,7 @@ var os = require('os');
 var fs = require('fs');
 var net = require('net');
 var http = require('http');
+var util = require('util');
 
 var LineReader = require('phusion_passenger/line_reader').LineReader;
 
@@ -197,7 +198,7 @@ function installServer() {
 			server.originalListen(socketPath, function() {
 				server.removeListener('error', errorHandler);
 				doneListening(callback);
-				process.nextTick(finalizeStartup);
+				process.nextTick(installControlServer);
 			});
 		}
 
@@ -221,7 +222,7 @@ function installServer() {
 }
 
 function listenAndMaybeInstall(port) {
-	if (port === 'passenger') {
+	if (port === 'passenger' || port == '/passenger') {
 		if (!PhusionPassenger._appInstalled) {
 			return installServer.apply(this, arguments);
 		} else {
@@ -232,20 +233,112 @@ function listenAndMaybeInstall(port) {
 	}
 }
 
+function installControlServer() {
+	var server = net.createServer(onNewClient);
+	var listenTries = 0;
+
+	doListen();
+
+	function onNewClient(client) {
+		client.on('error', function(e) {
+			console.trace(e);
+		});
+		readNextMessageHeader(client);
+	}
+
+	function readNextMessageHeader(client) {
+		client.once('readable', onReadable);
+
+		function onReadable() {
+			var size = client.read(2);
+			if (size !== null) {
+				readNextMessageBody(client, size.readUInt16BE(0));
+			} else {
+				client.once('readable', onReadable);
+			}
+		}
+	}
+
+	function readNextMessageBody(client, size) {
+		client.once('readable', onReadable);
+
+		function onReadable() {
+			var body = client.read(size);
+			if (body !== null) {
+				var args = body.toString('binary').split("\0");
+				args.pop();
+				handleMessage(client, args);
+			} else {
+				client.once('readable', onReadable);
+			}
+		}
+	}
+
+	function handleMessage(client, args) {
+		if (args[0] == 'abort_long_running_connections') {
+			shutdown();
+			client.end();
+		} else {
+			console.error("Invalid control message: " + util.inspect(args));
+			readNextMessageHeader(client);
+		}
+	}
+
+	function doListen() {
+		function errorHandler(error) {
+			if (error.errno == 'EADDRINUSE') {
+				if (listenTries == 100) {
+					server.emit('error', new Error(
+						'Phusion Passenger could not find suitable socket address to bind the control server on'));
+				} else {
+					// Try again with another socket path.
+					listenTries++;
+					doListen();
+				}
+			} else {
+				server.emit('error', error);
+			}
+		}
+
+		var socketPath = PhusionPassenger.options.control_socket_path =
+			generateServerSocketPath();
+		server.once('error', errorHandler);
+		server.listen(socketPath, function() {
+			server.removeListener('error', errorHandler);
+			process.nextTick(finalizeStartup);
+		});
+	}
+}
+
 function finalizeStartup() {
 	process.stdout.write("!> Ready\n");
 	process.stdout.write("!> socket: main;unix:" +
 		PhusionPassenger._server.address() +
 		";http_session;0\n");
+	if (process.env['_PASSENGER_NODE_CONTROL_SERVER']) {
+		process.stdout.write("!> socket: control;unix:" +
+			PhusionPassenger.options.control_socket_path +
+			";control;0\n");
+	}
 	process.stdout.write("!> \n");
 }
 
 function shutdown() {
+	if (PhusionPassenger.shutting_down) {
+		return;
+	}
+
+	PhusionPassenger.shutting_down = true;
 	try {
 		fs.unlinkSync(PhusionPassenger.options.socket_path);
 	} catch (e) {
 		// Ignore error.
 	}
+	try {
+		fs.unlinkSync(PhusionPassenger.options.control_socket_path);
+	} catch (e) {
+		// Ignore error.
+	}
 	if (PhusionPassenger.listeners('exit').length == 0) {
 		process.exit(0);
 	} else {

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 = '4.0.50'
+	VERSION_STRING = '4.0.51'
 
 	PREFERRED_NGINX_VERSION = '1.6.1'
 	NGINX_SHA256_CHECKSUM = 'f5cfe682a1aeef4602c2ca705402d5049b748f946563f41d8256c18674836067'

data/lib/phusion_passenger/abstract_installer.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -60,11 +60,12 @@ class AbstractInstaller
 		@stdout = STDOUT
 		@stderr = STDERR
 		@auto   = !STDIN.tty?
+		@colors = Utils::AnsiColors.new(options[:colorize] || :auto)
 		options.each_pair do |key, value|
 			instance_variable_set(:"@#{key}", value)
 		end
 	end
-	
+
 	# Start the installation by calling the #install! method.
 	def run
 		before_install
@@ -91,11 +92,11 @@ class AbstractInstaller
 protected
 	class Abort < StandardError
 	end
-	
+
 	class CommandError < Abort
 	end
-	
-	
+
+
 	def interactive?
 		return !@auto
 	end
@@ -103,18 +104,18 @@ protected
 	def non_interactive?
 		return !interactive?
 	end
-	
-	
+
+
 	def before_install
 		if STDOUT.respond_to?(:set_encoding)
 			STDOUT.set_encoding("UTF-8")
 		end
-		STDOUT.write(Utils::AnsiColors::DEFAULT_TERMINAL_COLOR)
+		STDOUT.write(@colors.default_terminal_color)
 		STDOUT.flush
 	end
-	
+
 	def after_install
-		STDOUT.write(Utils::AnsiColors::RESET)
+		STDOUT.write(@colors.reset)
 		STDOUT.flush
 	end
 
@@ -125,16 +126,16 @@ protected
 	def users_guide_url
 		return INDEX_DOC_URL
 	end
-	
+
 	def dependencies
 		return [[], []]
 	end
-	
+
 	def check_dependencies(show_new_screen = true)
 		new_screen if show_new_screen
 		puts "<banner>Checking for required software...</banner>"
 		puts
-		
+
 		PhusionPassenger.require_passenger_lib 'platform_info/depcheck'
 		specs, ids = dependencies
 		runner = PlatformInfo::Depcheck::ConsoleRunner.new
@@ -267,8 +268,8 @@ protected
 			raise e
 		end
 	end
-	
-	
+
+
 	def use_stderr
 		old_stdout = @stdout
 		begin
@@ -278,15 +279,15 @@ protected
 			@stdout = old_stdout
 		end
 	end
-	
+
 	def print(text)
-		@stdout.write(Utils::AnsiColors.ansi_colorize(text))
+		@stdout.write(@colors.ansi_colorize(text))
 		@stdout.flush
 	end
-	
+
 	def puts(text = nil)
 		if text
-			@stdout.puts(Utils::AnsiColors.ansi_colorize(text.to_s))
+			@stdout.puts(@colors.ansi_colorize(text.to_s))
 		else
 			@stdout.puts
 		end
@@ -294,34 +295,35 @@ protected
 	end
 
 	def puts_error(text)
-		@stderr.puts(Utils::AnsiColors.ansi_colorize("<red>#{text}</red>"))
+		@stderr.puts(@colors.ansi_colorize("<red>#{text}</red>"))
 		@stderr.flush
 	end
-	
+
 	def render_template(name, options = {})
+		options.merge!(:colors => @colors)
 		puts ConsoleTextTemplate.new({ :file => name }, options).result
 	end
-	
+
 	def new_screen
 		puts
 		line
 		puts
 	end
-	
+
 	def line
 		puts "--------------------------------------------"
 	end
-	
+
 	def prompt(message, default_value = nil)
 		done = false
 		while !done
 			print "#{message}: "
-			
+
 			if non_interactive? && default_value
 				puts default_value
 				return default_value
 			end
-			
+
 			begin
 				result = STDIN.readline
 			rescue EOFError
@@ -343,7 +345,7 @@ protected
 	rescue Interrupt
 		raise Abort
 	end
-	
+
 	def prompt_confirmation(message)
 		result = prompt("#{message} [y/n]") do |value|
 			if value.downcase == 'y' || value.downcase == 'n'
@@ -380,8 +382,8 @@ protected
 	def home_dir
 		Etc.getpwuid(Process.uid).dir
 	end
-	
-	
+
+
 	def sh(*args)
 		puts "# #{args.join(' ')}"
 		result = system(*args)
@@ -393,14 +395,14 @@ protected
 			return false
 		end
 	end
-	
+
 	def sh!(*args)
 		if !sh(*args)
 			puts_error "*** Command failed: #{args.join(' ')}"
 			raise CommandError
 		end
 	end
-	
+
 	def rake(*args)
 		PhusionPassenger.require_passenger_lib 'platform_info/ruby'
 		if !PlatformInfo.rake_command
@@ -418,7 +420,7 @@ protected
 		end
 		sh!("#{PlatformInfo.rake_command} #{args.join(' ')}")
 	end
-	
+
 	def download(url, output, options = {})
 		options[:logger] ||= begin
 			logger = Logger.new(STDOUT)

data/lib/phusion_passenger/console_text_template.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -36,19 +36,20 @@ class ConsoleTextTemplate
 		else
 			data = input[:text]
 		end
-		@template = ERB.new(Utils::AnsiColors.ansi_colorize(data),
+		@colors = options[:colors] || AnsiColors.new
+		@template = ERB.new(@colors.ansi_colorize(data),
 			nil, '-', '@buffer')
 		@template.filename = filename if filename
 		options.each_pair do |name, value|
 			self[name] = value
 		end
 	end
-	
+
 	def []=(name, value)
 		instance_variable_set("@#{name}".to_sym, value)
 		return self
 	end
-	
+
 	def result
 		return @template.result(binding)
 	end

data/lib/phusion_passenger/platform_info/depcheck_specs/libs.rb

@@ -78,8 +78,10 @@ define 'libcurl-dev' do
 		if release =~ /release 4/
 			# http://code.google.com/p/phusion-passenger/issues/detail?id=554
 			yum_install "curl-devel zlib-devel e2fsprogs-devel krb5-devel libidn-devel"
-		else
+		elsif release =~ /release 5/
 			yum_install "curl-devel"
+		else
+			yum_install "libcurl-devel"
 		end
 	end
 end

data/lib/phusion_passenger/standalone/app_finder.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -20,12 +20,15 @@
 #  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.
+PhusionPassenger.require_passenger_lib 'standalone/utils'
 PhusionPassenger.require_passenger_lib 'utils/file_system_watcher'
 
 module PhusionPassenger
 module Standalone
 
 class AppFinder
+	include Standalone::Utils
+
 	attr_accessor :dirs
 	attr_reader :apps
 
@@ -130,9 +133,9 @@ private
 
 	def find_app_root
 		if @dirs.empty?
-			return File.expand_path(".")
+			return absolute_path(".")
 		else
-			return File.expand_path(@dirs[0])
+			return absolute_path(@dirs[0])
 		end
 	end
 

data/lib/phusion_passenger/standalone/command.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -185,19 +185,19 @@ private
 		end
 		if @args.empty?
 			if AppFinder.looks_like_app_directory?(".")
-				@options[:pid_file] ||= File.expand_path("tmp/pids/#{pid_basename}")
-				@options[:log_file] ||= File.expand_path("log/#{log_basename}")
+				@options[:pid_file] ||= absolute_path("tmp/pids/#{pid_basename}")
+				@options[:log_file] ||= absolute_path("log/#{log_basename}")
 				if create_subdirs
 					ensure_directory_exists(File.dirname(@options[:pid_file]))
 					ensure_directory_exists(File.dirname(@options[:log_file]))
 				end
 			else
-				@options[:pid_file] ||= File.expand_path(pid_basename)
-				@options[:log_file] ||= File.expand_path(log_basename)
+				@options[:pid_file] ||= absolute_path(pid_basename)
+				@options[:log_file] ||= absolute_path(log_basename)
 			end
 		else
-			@options[:pid_file] ||= File.expand_path(File.join(@args[0], pid_basename))
-			@options[:log_file] ||= File.expand_path(File.join(@args[0], log_basename))
+			@options[:pid_file] ||= absolute_path(File.join(@args[0], pid_basename))
+			@options[:log_file] ||= absolute_path(File.join(@args[0], log_basename))
 		end
 	end
 

data/lib/phusion_passenger/standalone/start_command.rb

@@ -146,11 +146,11 @@ private
 			end
 			opts.on("--ssl-certificate PATH", String,
 				wrap_desc("Specify the SSL certificate path")) do |val|
-				@options[:ssl_certificate] = File.expand_path(val)
+				@options[:ssl_certificate] = absolute_path(val)
 			end
 			opts.on("--ssl-certificate-key PATH", String,
 				wrap_desc("Specify the SSL key path")) do |val|
-				@options[:ssl_certificate_key] = File.expand_path(val)
+				@options[:ssl_certificate_key] = absolute_path(val)
 			end
 			opts.on("--ssl-port PORT", Integer,
 				wrap_desc("Listen for SSL on this port, while listening for HTTP on the normal port")) do |val|
@@ -203,11 +203,11 @@ private
 			end
 			opts.on("--static-files-dir PATH", String,
 				wrap_desc("Specify the static files dir")) do |val|
-				@options[:static_files_dir] = File.expand_path(val)
+				@options[:static_files_dir] = absolute_path(val)
 			end
 			opts.on("--restart-dir PATH", String,
 				wrap_desc("Specify the restart dir")) do |val|
-				@options[:restart_dir] = File.expand_path(val)
+				@options[:restart_dir] = absolute_path(val)
 			end
 			opts.on("--friendly-error-pages",
 				wrap_desc("Turn on friendly error pages")) do
@@ -292,11 +292,11 @@ private
 			opts.on("--nginx-tarball FILENAME", String,
 				wrap_desc("If Nginx needs to be installed, then the given tarball will " +
 				          "be used instead of downloading from the Internet")) do |value|
-				@options[:nginx_tarball] = File.expand_path(value)
+				@options[:nginx_tarball] = absolute_path(value)
 			end
 			opts.on("--nginx-config-template FILENAME", String,
 				wrap_desc("The template to use for generating the Nginx config file")) do |value|
-				@options[:nginx_config_template] = File.expand_path(value)
+				@options[:nginx_config_template] = absolute_path(value)
 			end
 			opts.on("--binaries-url-root URL", String,
 				wrap_desc("If Nginx needs to be installed, then the specified URL will be " +
@@ -309,7 +309,7 @@ private
 			end
 			opts.on("--runtime-dir DIRECTORY", String,
 				wrap_desc("Directory to use for Phusion Passenger Standalone runtime files")) do |value|
-				@options[:runtime_dir] = File.expand_path(value)
+				@options[:runtime_dir] = absolute_path(value)
 			end
 			opts.on("--runtime-check-only",
 				wrap_desc("Quit after checking whether the Phusion Passenger Standalone runtime files are installed")) do
@@ -737,7 +737,7 @@ private
 
 	def nginx_listen_address(options = @options, for_ping_port = false)
 		if options[:socket_file]
-			return "unix:" + File.expand_path(options[:socket_file])
+			return "unix:" + absolute_path(options[:socket_file])
 		else
 			if for_ping_port
 				port = options[:ping_port]
@@ -750,7 +750,7 @@ private
 
 	def nginx_listen_address_with_ssl_port(options = @options)
 		if options[:socket_file]
-			return "unix:" + File.expand_path(options[:socket_file])
+			return "unix:" + absolute_path(options[:socket_file])
 		else
 			return compose_ip_and_port(options[:address], options[:ssl_port])
 		end

data/lib/phusion_passenger/standalone/utils.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -31,7 +31,7 @@ private
 			PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
 		end
 	end
-	
+
 	def runtime_version_string(nginx_version)
 		if PhusionPassenger.originally_packaged? || nginx_version != PhusionPassenger::PREFERRED_NGINX_VERSION
 			require_platform_info_binary_compatibility
@@ -40,6 +40,18 @@ private
 			return VERSION_STRING
 		end
 	end
+
+	# Dir.pwd resolves symlinks. So in turn, File.expand_path/File.absolute_path
+	# do that too. We work around that by shelling out to the `pwd` tool.
+	if File.respond_to?(:absolute_path)
+		def absolute_path(path)
+			return File.absolute_path(path, `pwd`.strip)
+		end
+	else
+		def absolute_path(path)
+			return File.expand_path(path, `pwd`.strip)
+		end
+	end
 end
 
 end

data/lib/phusion_passenger/utils/ansi_colors.rb

@@ -36,9 +36,13 @@ module AnsiColors
 	BLACK_BG = "\e[40m".freeze
 	BLUE_BG  = "\e[44m".freeze
 	DEFAULT_TERMINAL_COLOR = "#{RESET}#{WHITE}#{BLACK_BG}".freeze
-	
+
 	extend self  # Make methods available as class methods.
-	
+
+	def self.new(type = :auto)
+		return AnsiColorsPrinter.new(type)
+	end
+
 	def self.included(klass)
 		# When included into another class, make sure that Utils
 		# methods are made private.
@@ -46,7 +50,7 @@ module AnsiColors
 			klass.send(:private, method_name)
 		end
 	end
-	
+
 	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}")
@@ -70,5 +74,80 @@ module AnsiColors
 	end
 end
 
+class AnsiColorsPrinter
+	def initialize(enabled = :auto)
+		@enabled = enabled
+	end
+
+	def reset
+		return maybe_colorize(AnsiColors::RESET)
+	end
+
+	def bold
+		return maybe_colorize(AnsiColors::BOLD)
+	end
+
+	def dgray
+		return maybe_colorize(AnsiColors::DGRAY)
+	end
+
+	def red
+		return maybe_colorize(AnsiColors::RED)
+	end
+
+	def orange
+		return maybe_colorize(AnsiColors::ORANGE)
+	end
+
+	def green
+		return maybe_colorize(AnsiColors::GREEN)
+	end
+
+	def yellow
+		return maybe_colorize(AnsiColors::YELLOW)
+	end
+
+	def white
+		return maybe_colorize(AnsiColors::WHITE)
+	end
+
+	def black_bg
+		return maybe_colorize(AnsiColors::BLACK_BG)
+	end
+
+	def blue_bg
+		return maybe_colorize(AnsiColors::BLUE_BG)
+	end
+
+	def default_terminal_color
+		return maybe_colorize(AnsiColors::DEFAULT_TERMINAL_COLOR)
+	end
+
+	def ansi_colorize(text)
+		if should_output_color?
+			return AnsiColors.ansi_colorize(text)
+		else
+			return AnsiColors.strip_color_tags(text)
+		end
+	end
+
+private
+	def maybe_colorize(ansi_color)
+		if should_output_color?
+			return ansi_color
+		else
+			return ""
+		end
+	end
+
+	def should_output_color?
+		if @enabled == :auto
+			return STDOUT.tty?
+		else
+			return @enabled
+		end
+	end
+end
+
 end # module Utils
 end # module PhusionPassenger

data/test/integration_tests/standalone_tests.rb

@@ -117,7 +117,7 @@ describe "Passenger Standalone" do
 	end
 
 	describe "start command" do
-		SUPPORT_BINARIES_DOWNLOAD_MESSAGE = " --> Downloading #{PROGRAM_NAME} support binaries for your platform"
+		SUPPORT_BINARIES_DOWNLOAD_MESSAGE = "--> Downloading #{PROGRAM_NAME} support binaries for your platform"
 		NGINX_BINARY_DOWNLOAD_MESSAGE = "Downloading web helper for your platform"
 		NGINX_SOURCE_DOWNLOAD_MESSAGE = "Downloading web helper source code..."
 		COMPILING_MESSAGE = "Installing #{PROGRAM_NAME} Standalone..."
@@ -224,7 +224,7 @@ describe "Passenger Standalone" do
 						command = "passenger start " +
 							"--runtime-dir '#{@runtime_dir}' " +
 							"--binaries-url-root '#{@base_url}'"
-						
+
 						@output = `#{command} --runtime-check-only --no-compile-runtime 2>&1`
 						$?.exitstatus.should_not == 0
 						@output.should include(SUPPORT_BINARIES_DOWNLOAD_MESSAGE)
@@ -237,7 +237,7 @@ describe "Passenger Standalone" do
 						@output.should include(NGINX_SOURCE_DOWNLOAD_MESSAGE)
 						@output.should include(COMPILING_MESSAGE)
 						File.exist?("#{PhusionPassenger.source_root}/buildout").should be_false
-						
+
 						test_serving_application("#{command} --no-compile-runtime")
 						File.exist?("#{PhusionPassenger.source_root}/buildout").should be_false
 					ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.50
+  version: 4.0.51
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJT/ac4AAoJECrHRaUKISqMKgsH/iM7xF2pyeeSQgOSS8oHsCWF
-pw4m0EzF8u0ERZAGHGGCUxsKkEJZsHSKsol9auG87I3NVUZ8WumbRa7WKRkS/XHd
-lDRFe+rReIxeaF13vRlDUSMwSaVjlMwxGQgSM0WF3gRtqH6rvSmiG7O+ZADvnLag
-4cX5kNLcj3ecwMB1e6G/Q34XAsgSmXCDASeqpJBM+dHAzssbNU/Xv5Q7SFfPS0Kx
-HEU6sj6wU7TPDLjDZDi90ejdbp5/cGVl50UA5DbzYcgiqwm6F2rS4nPXc8cD1Zvv
-zE/0vmWMnYfnSkSyWnF3/yuJLhsUVgZKCUkDBQDPE0/SsEik16B69l2sfa+5oQ8=
-=M7FV
+iQEcBAABAgAGBQJUIqZfAAoJECrHRaUKISqM5OYH/iVQY/mnbiA+zU/YHv0T52F4
+zoEWHeWsZlKx6n/unBAbauVUTYK/DMUlDcNbfTVWMbH7y2ndoX+LQvWTUmHpvjsU
+f9AOtMZTLGzSYwDaROjXBkEyNekoNBTAWI7jLhAvJgyfrQw5xK+5maRadEthd12R
+eczljd7jsr/VzUZU/iwcrcxS4Ye/8UPm6OpnHNycKgsLEEJK2pB1LBnQjYW+cjdn
+Ffyse6SKEmDfX/qbO9XD6GyHv1cxcdX1wsy0HxzeRtp7EuQJHCy1WkSgfrryd+f1
+DmBMs6xnUf1wyRiZkqCACr86qSM4ajO1LQX4Ajzc79YiTjiUKwB014drhq3qm+8=
+=TO+m
 -----END PGP SIGNATURE-----