passenger 4.0.49 → 4.0.50

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzZiZGQzODhkNDZjNTUwZjM2M2VlMzI2OTQ3ZGI1NDA5ZmY3NjM1Ng==
+    YjJhMzI2NDM1MTlhN2QwZDE5YmZjOTI1YTAwMWU5NjhmYjBlZTdmMg==
   data.tar.gz: !binary |-
-    NmMxNDdmNzY2MWNjYzllMDBmYzMyODUxZTIzZDA3MzY0ZjU3OTE1MQ==
+    NTEwMzNiNWM5MDlkYWUyNzE3ZTZjNWM1YThlMjg0NmE0ZTEwMGViYQ==
 SHA512:
   metadata.gz: !binary |-
-    NTBiZTUxOGE1MTRlMDUxZDljZDBhN2JjYTg3ZGFhODU3ZjM1ODZkMTUwMTcy
-    ZDQwYzFiOTIyM2JiYzcwNjI2NGYwZThhM2NhYjQzNWY3YjEyYTg0MjljMjVm
-    OWFlZGMzNmM2YjM5ODI2ODRiNzgzMmJmNGQ4ODY1ZmJmMmU3MGM=
+    ZjkwMjhmNzExYzNlNzA5ZjQ5MzA2YTQzMjNlY2I0Zjc0OWU4ZDYzNjVlNzE5
+    ZTg5NzBkZGY3NzU5NjU5ZTM0ZGM2MGU5YTg2ZjRjZmI1ZWM2MDBjNjg1ODUx
+    ZTRjNzJiYTdkZDcwNzlmYTNmNmQxNDQ0ODk3OTc0ODA1MDJiNzk=
   data.tar.gz: !binary |-
-    NzRkYjE0OTg2M2VhYjIxMWQyMmFlODJlMjRlOGU5ODgyOWM5YjliM2NkODJj
-    N2FjNWYwNjUyOGFlOGI2MTVmZGZkYjU1NTYxNzU5MjE2YzRjOGFkN2ZkM2M5
-    YTI4OTZhYTUwODgyY2UwODliMDY1YmZhZDU2ODQ3NDJiODU2MDk=
+    YzYzOTVhOWVhNTYwY2FiMDU5YTA3NzFjYWJiMjQ3MmVhNmJjNmI5NDQ3ZDY5
+    M2U2OGRmZTA4NzllYmMzN2RkM2RkOWRiZmE5ZDM0MjJhYmQ0ODg5NmYxNWFj
+    OWM1YWQ2Mjg2OTVmZDY4ZTdhZmI5YmJlMGVkNDUzNzgyZTlmZTU=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJT91guAAoJECrHRaUKISqMi8AIAKcJEymk64GyK27CR7KRYByH
-OTsizdQ5gTq2pETdjwDjAGn7T1lp1tWObakMbbOw4Fm0MU1kEMFFZg0GK0XTe2N+
-iF7T4tGP83pgUKNP3uuM4QPgfouVrRUGFNGJOsBiqIFKFTLdiBZkLDYQpOTU3+Q1
-ZIKKHbzzXoxKYdlpz+AP6OCurqrIIYGlaPmnEqafg1zP99K76HTGmQmL/j3e940q
-Sp8wPgBXpRDfv9f5oe9yRl46sCI61B+IFgubNG9ECrnTf/I1Qpe4jx7Xv65Ne6sJ
-EtHbZ5IwJyNnlIqzs7gX5lIIDlRUuA6pThkzD2zlf6em5mdDe4Yge8nn47/lMfI=
-=vGWc
+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
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJT91guAAoJECrHRaUKISqMhbwIAKnAe12hzjsoxbOFMTXuX7GE
-EGEgQeVsTOkrWTJT7cPg+dcyyUCcNf9GggVARjCRpFOaUcTvwxi+kk53GcicOUex
-FKheeJe2cX7iwrS/yScE4sECFVYfz/tE0J78yhDlRGWPUYHg/0aRkPMIEIyxEoNl
-4RuLoy12RMRRFoVa57sfZXzvui7HpGOKFkqvpo7mcKATkw8I+9bl5rAY4cSp0CBf
-RNfO3BvSRNUcV0dueiomegep+c4ANiks/w4kJ/I9rpjs5hi5Y/1jevnBZqpTjD3O
-Zhp2plPWifd2gAlasT7gzUdjg2MTnz10ejXpcgree80BcR7jAaCjwp0pQQjwxNI=
-=sAyH
+iQEcBAABAgAGBQJT/ac4AAoJECrHRaUKISqMrpEH/126KVkt90cVfXkzNBSB7GxI
+sMCmJK4iHgiTo8QDckXWXYqTGzlYvVN+90vw16aXJQadq4LZ7KEe3Nzon33ljR64
+sJLak3Yiucr+y9QFJaHzfIegD0eZID2nFRxLpUebzsEZlmfpwa9oSkezacCGupEO
+asIRMbNoEgzn4FXB9sGfNTCfVCz/xLVL2527BpZh2T/7kvyib6XtCUpW9uAQG94U
+9L1iOpKXST/gADAnYjJtTSG2TmF/rjqczDy9KgzJsTpFTImZL44ZLNw+wVvzKynt
+GvvBNSXPL3OtAN0Cbh6+fSEP6O7pp9qtMd+KKZONY8Y3jyUb9evYprxeXucYh2A=
+=7wtl
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,10 @@
+Release 4.0.50
+--------------
+
+ * Fixed a potential heap corruption bug.
+ * Added Union Station support for Rails 4.1.
+
+
 Release 4.0.49
 --------------
 

data/build/test_basics.rb

@@ -75,6 +75,7 @@ task 'test:install_deps' do
 
 		if ruby_version_int >= 190
 		    sh "cd test/stub/rails4.0 && bundle install"
+		    sh "cd test/stub/rails4.1 && bundle install"
                 end
 	end
 	if boolean_option('NODE_MODULES', default)

data/ext/common/ApplicationPool2/Options.h

@@ -76,40 +76,41 @@ class Options {
 private:
 	shared_array<char> storage;
 
-	vector<const StaticString *> getStringFields() const {
-		vector<const StaticString *> result;
+	template<typename OptionsClass, typename StaticStringClass>
+	static vector<StaticStringClass *> getStringFields(OptionsClass &options) {
+		vector<StaticStringClass *> result;
 		result.reserve(20);
 
-		result.push_back(&appRoot);
-		result.push_back(&appGroupName);
-		result.push_back(&appType);
-		result.push_back(&startCommand);
-		result.push_back(&startupFile);
-		result.push_back(&processTitle);
-
-		result.push_back(&environment);
-		result.push_back(&baseURI);
-		result.push_back(&spawnMethod);
-
-		result.push_back(&user);
-		result.push_back(&group);
-		result.push_back(&defaultUser);
-		result.push_back(&defaultGroup);
-		result.push_back(&restartDir);
-
-		result.push_back(&preexecChroot);
-		result.push_back(&postexecChroot);
-
-		result.push_back(&ruby);
-		result.push_back(&python);
-		result.push_back(&nodejs);
-		result.push_back(&loggingAgentAddress);
-		result.push_back(&loggingAgentUsername);
-		result.push_back(&loggingAgentPassword);
-		result.push_back(&groupSecret);
-		result.push_back(&hostName);
-		result.push_back(&uri);
-		result.push_back(&unionStationKey);
+		result.push_back(&options.appRoot);
+		result.push_back(&options.appGroupName);
+		result.push_back(&options.appType);
+		result.push_back(&options.startCommand);
+		result.push_back(&options.startupFile);
+		result.push_back(&options.processTitle);
+
+		result.push_back(&options.environment);
+		result.push_back(&options.baseURI);
+		result.push_back(&options.spawnMethod);
+
+		result.push_back(&options.user);
+		result.push_back(&options.group);
+		result.push_back(&options.defaultUser);
+		result.push_back(&options.defaultGroup);
+		result.push_back(&options.restartDir);
+
+		result.push_back(&options.preexecChroot);
+		result.push_back(&options.postexecChroot);
+
+		result.push_back(&options.ruby);
+		result.push_back(&options.python);
+		result.push_back(&options.nodejs);
+		result.push_back(&options.loggingAgentAddress);
+		result.push_back(&options.loggingAgentUsername);
+		result.push_back(&options.loggingAgentPassword);
+		result.push_back(&options.groupSecret);
+		result.push_back(&options.hostName);
+		result.push_back(&options.uri);
+		result.push_back(&options.unionStationKey);
 
 		return result;
 	}
@@ -478,8 +479,9 @@ public:
 	 * area.
 	 */
 	Options &persist(const Options &other) {
-		const vector<const StaticString *> strings = getStringFields();
-		const vector<const StaticString *> otherStrings = other.getStringFields();
+		vector<StaticString *> strings = getStringFields<Options, StaticString>(*this);
+		const vector<const StaticString *> otherStrings =
+			getStringFields<const Options, const StaticString>(other);
 		unsigned int i;
 		size_t otherLen = 0;
 		char *end;
@@ -501,18 +503,19 @@ public:
 
 		// Copy string fields into the internal storage area.
 		for (i = 0; i < otherStrings.size(); i++) {
-			const StaticString *str = strings[i];
+			const char *pos = end;
+			StaticString *str = strings[i];
 			const StaticString *otherStr = otherStrings[i];
 
-			// Point current object's field to the data in the
-			// internal storage area.
-			*const_cast<StaticString *>(str) = StaticString(end, otherStr->size());
-
 			// Copy over the string data.
 			memcpy(end, otherStr->c_str(), otherStr->size());
 			end += otherStr->size();
 			*end = '\0';
 			end++;
+
+			// Point current object's field to the data in the
+			// internal storage area.
+			*str = StaticString(pos, end - pos - 1);
 		}
 
 		// Copy environmentVariables names and values into the internal storage area.

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.49"
+	#define PASSENGER_VERSION "4.0.50"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/helper-scripts/classic-rails-loader.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 2013-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -159,6 +159,7 @@ module App
 	LoaderSharedHelpers.advertise_sockets(STDOUT, handler)
 	puts "!> "
 	handler.main_loop
+	handler.cleanup
 	LoaderSharedHelpers.after_handling_requests
 	
 end # module App

data/helper-scripts/classic-rails-preloader.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 2013-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -185,6 +185,7 @@ module App
 	if PreloaderSharedHelpers.run_main_loop(options) == :forked
 		handler = negotiate_spawn_command
 		handler.main_loop
+		handler.cleanup
 		LoaderSharedHelpers.after_handling_requests
 	end
 	

data/helper-scripts/node-loader.js

@@ -1,6 +1,6 @@
 /*
  *  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.
  *
@@ -25,6 +25,8 @@
 
 module.paths.unshift(__dirname + "/../node_lib");
 var EventEmitter = require('events').EventEmitter;
+var os = require('os');
+var fs = require('fs');
 var net = require('net');
 var http = require('http');
 
@@ -113,8 +115,9 @@ function configure(_options) {
 }
 
 function loadApplication() {
+	var appRoot = PhusionPassenger.options.app_root || process.cwd();
 	var startupFile = PhusionPassenger.options.startup_file || 'app.js';
-	require(PhusionPassenger.options.app_root + '/' + startupFile);
+	require(appRoot + '/' + startupFile);
 }
 
 function extractCallback(args) {
@@ -124,8 +127,21 @@ function extractCallback(args) {
 }
 
 function generateServerSocketPath() {
-	return PhusionPassenger.options.generation_dir + "/backends/"
-		+ process.pid + "." + ((Math.random() * 0xFFFFFFFF) & 0xFFFFFFF);
+	var options = PhusionPassenger.options;
+	var socketDir, socketPrefix, socketSuffix;
+
+	if (options.generation_dir) {
+		socketDir = options.generation_dir + "/backends";
+		socketPrefix = "node";
+	} else {
+		socketDir = os.tmpdir().replace(/\/$/, '');
+		socketPrefix = "PsgNodeApp";
+	}
+	socketSuffix = ((Math.random() * 0xFFFFFFFF) & 0xFFFFFFF);
+
+	var result = socketDir + "/" + socketPrefix + "." + socketSuffix.toString(36);
+	var UNIX_PATH_MAX = options.UNIX_PATH_MAX || 100;
+	return result.substr(0, UNIX_PATH_MAX);
 }
 
 function addListenerAtBeginning(emitter, event, callback) {
@@ -176,8 +192,9 @@ function installServer() {
 				}
 			}
 
+			var socketPath = PhusionPassenger.options.socket_path = generateServerSocketPath();
 			server.once('error', errorHandler);
-			server.originalListen(generateServerSocketPath(), function() {
+			server.originalListen(socketPath, function() {
 				server.removeListener('error', errorHandler);
 				doneListening(callback);
 				process.nextTick(finalizeStartup);
@@ -224,6 +241,11 @@ function finalizeStartup() {
 }
 
 function shutdown() {
+	try {
+		fs.unlinkSync(PhusionPassenger.options.socket_path);
+	} catch (e) {
+		// Ignore error.
+	}
 	if (PhusionPassenger.listeners('exit').length == 0) {
 		process.exit(0);
 	} else {

data/helper-scripts/rack-loader.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 2013-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -131,6 +131,7 @@ module App
 	LoaderSharedHelpers.advertise_sockets(STDOUT, handler)
 	puts "!> "
 	handler.main_loop
+	handler.cleanup
 	LoaderSharedHelpers.after_handling_requests
 	
 end # module App

data/helper-scripts/rack-preloader.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 20132-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -159,6 +159,7 @@ module App
 	if PreloaderSharedHelpers.run_main_loop(options) == :forked
 		handler = negotiate_spawn_command
 		handler.main_loop
+		handler.cleanup
 		LoaderSharedHelpers.after_handling_requests
 	end
 	

data/helper-scripts/wsgi-loader.py

@@ -23,6 +23,7 @@
 #  THE SOFTWARE.
 
 import sys, os, re, imp, threading, signal, traceback, socket, select, struct, logging, errno
+import tempfile
 
 options = {}
 
@@ -62,13 +63,31 @@ def load_app():
 def create_server_socket():
 	global options
 
-	filename = options['generation_dir'] + '/backends/wsgi.' + str(os.getpid())
-	s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-	try:
-		os.remove(filename)
-	except OSError:
-		pass
-	s.bind(filename)
+	UNIX_PATH_MAX = options.get('UNIX_PATH_MAX', 100)
+	if 'generation_dir' in options:
+		socket_dir = options['generation_dir'] + '/backends'
+		socket_prefix = 'wsgi'
+	else:
+		socket_dir = tempfile.gettempdir()
+		socket_prefix = 'PsgWsgiApp'
+
+	i = 0
+	while i < 128:
+		s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+		socket_suffix = format(struct.unpack('Q', os.urandom(8))[0], 'x')
+		filename = socket_dir + '/' + socket_prefix + '.' + socket_suffix
+		filename = filename[0:UNIX_PATH_MAX]
+		try:
+			s.bind(filename)
+			break
+		except socket.error as e:
+			if e.errno == errno.EADDRINUSE:
+				i += 1
+				if i == 128:
+					raise e
+			else:
+				raise e
+
 	s.listen(1000)
 	return (filename, s)
 
@@ -305,3 +324,7 @@ if __name__ == "__main__":
 	print("!> Ready")
 	advertise_sockets(socket_filename)
 	handler.main_loop()
+	try:
+		os.remove(socket_filename)
+	except OSError:
+		pass

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

data/lib/phusion_passenger/active_support3_extensions/init.rb

@@ -93,6 +93,7 @@ class UnionStationExtension < ActiveSupport::LogSubscriber
 	end
 
 	def initialize(options)
+		super()
 		install_event_preprocessor(options[:event_preprocessor]) if options[:event_preprocessor]
 	end
 	

data/lib/phusion_passenger/preloader_shared_helpers.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2011, 2012 Phusion
+#  Copyright (c) 2011-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -23,6 +23,8 @@
 #  THE SOFTWARE.
 
 require 'socket'
+require 'tmpdir'
+PhusionPassenger.require_passenger_lib 'utils'
 PhusionPassenger.require_passenger_lib 'native_support'
 
 module PhusionPassenger
@@ -44,7 +46,7 @@ module PreloaderSharedHelpers
 		end
 		return options
 	end
-	
+
 	def accept_and_process_next_client(server_socket)
 		original_pid = Process.pid
 		client = server_socket.accept
@@ -60,10 +62,10 @@ module PreloaderSharedHelpers
 			while client.readline != "\n"
 				# Do nothing.
 			end
-			
+
 			# Improve copy-on-write friendliness.
 			GC.start
-			
+
 			pid = fork
 			if pid.nil?
 				$0 = "#{$0} (forking...)"
@@ -91,15 +93,35 @@ module PreloaderSharedHelpers
 			end
 		end
 	end
-	
+
 	def run_main_loop(options)
 		$0 = "Passenger AppPreloader: #{options['app_root']}"
 		client = nil
 		original_pid = Process.pid
-		socket_filename = "#{options['generation_dir']}/backends/preloader.#{Process.pid}"
-		server = UNIXServer.new(socket_filename)
+
+		if defined?(NativeSupport)
+			unix_path_max = NativeSupport::UNIX_PATH_MAX
+		else
+			unix_path_max = options.fetch('UNIX_PATH_MAX', 100).to_i
+		end
+		if options['generation_dir']
+			socket_dir = "#{options['generation_dir']}/backends"
+			socket_prefix = "preloader"
+		else
+			socket_dir = Dir.tmpdir
+			socket_prefix = "PsgPreloader"
+		end
+
+		socket_filename = nil
+		server = nil
+		Utils.retry_at_most(128, Errno::EADDRINUSE) do
+			socket_filename = "#{socket_dir}/#{socket_prefix}.#{rand(0xFFFFFFFF).to_s(36)}"
+			socket_filename = socket_filename.slice(0, unix_path_max - 10)
+			server = UNIXServer.new(socket_filename)
+		end
 		server.close_on_exec!
-		
+		File.chmod(0600, socket_filename)
+
 		# Update the dump information just before telling the preloader that we're
 		# ready because the HelperAgent will read and memorize this information.
 		LoaderSharedHelpers.dump_all_information
@@ -107,7 +129,7 @@ module PreloaderSharedHelpers
 		puts "!> Ready"
 		puts "!> socket: unix:#{socket_filename}"
 		puts "!> "
-		
+
 		while true
 			# We call ::select just in case someone overwrites the global select()
 			# function by including ActionView::Helpers in the wrong place.