passenger 4.0.53 → 4.0.55

data/ext/common/Utils.h

@@ -205,10 +205,11 @@ string escapeForXml(const StaticString &input);
 
 /**
  * Returns the username of the user that the current process is running as.
- * If the user has no associated username, then "UID xxxx" is returned,
- * where xxxx is the current UID.
+ * If the user has no associated username, then the behavior depends on the
+ * `fallback` argument. When true, "UID xxxx" is returned, where xxxx is the
+ * current UID. When false, the empty string is returned.
  */
-string getProcessUsername();
+string getProcessUsername(bool fallback = true);
 
 /**
  * Returns either the group name for the given GID, or (if the group name

data/ext/ruby/extconf.rb

@@ -37,8 +37,10 @@ end
 have_header('alloca.h')
 have_header('ruby/version.h')
 have_header('ruby/io.h')
+have_header('ruby/thread.h')
 have_var('ruby_version')
 have_func('rb_thread_io_blocking_region')
+have_func('rb_thread_call_without_gvl')
 
 with_cflags($CFLAGS) do
 	create_makefile('passenger_native_support')

data/ext/ruby/passenger_native_support.c

@@ -36,6 +36,9 @@
 #ifdef HAVE_RUBY_VERSION_H
 	#include "ruby/version.h"
 #endif
+#ifdef HAVE_RUBY_THREAD_H
+	#include "ruby/thread.h"
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -199,11 +202,19 @@ update_group_written_info(IOVectorGroup *group, ssize_t bytes_written) {
 		int iovcnt;
 	} WritevWrapperData;
 
-	static VALUE
-	writev_wrapper(void *ptr) {
-		WritevWrapperData *data = (WritevWrapperData *) ptr;
-		return (VALUE) writev(data->filedes, data->iov, data->iovcnt);
-	}
+	#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+		static void *
+		writev_wrapper(void *ptr) {
+			WritevWrapperData *data = (WritevWrapperData *) ptr;
+			return (void *) writev(data->filedes, data->iov, data->iovcnt);
+		}
+	#else
+		static VALUE
+		writev_wrapper(void *ptr) {
+			WritevWrapperData *data = (WritevWrapperData *) ptr;
+			return (VALUE) writev(data->filedes, data->iov, data->iovcnt);
+		}
+	#endif
 #endif
 
 static VALUE
@@ -320,7 +331,10 @@ f_generic_writev(VALUE fd, VALUE *array_of_components, unsigned int count) {
 				writev_wrapper_data.filedes = fd_num;
 				writev_wrapper_data.iov     = groups[i].io_vectors;
 				writev_wrapper_data.iovcnt  = groups[i].count;
-				#ifdef HAVE_RB_THREAD_IO_BLOCKING_REGION
+				#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+					ret = (int) rb_thread_call_without_gvl(writev_wrapper,
+						&writev_wrapper_data, RUBY_UBF_IO, NULL);
+				#elif defined(HAVE_RB_THREAD_IO_BLOCKING_REGION)
 					ret = (int) rb_thread_io_blocking_region(writev_wrapper,
 						&writev_wrapper_data, fd_num);
 				#else
@@ -726,13 +740,23 @@ fs_watcher_wait_fd(VALUE _fd) {
 }
 
 #ifndef TRAP_BEG
-	static VALUE
-	fs_watcher_read_byte_from_fd_wrapper(void *_arg) {
-		FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
-		data->ret = read(data->fd, &data->byte, 1);
-		data->error = errno;
-		return Qnil;
-	}
+	#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+		static void *
+		fs_watcher_read_byte_from_fd_wrapper(void *_arg) {
+			FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
+			data->ret = read(data->fd, &data->byte, 1);
+			data->error = errno;
+			return NULL;
+		}
+	#else
+		static VALUE
+		fs_watcher_read_byte_from_fd_wrapper(void *_arg) {
+			FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
+			data->ret = read(data->fd, &data->byte, 1);
+			data->error = errno;
+			return Qnil;
+		}
+	#endif
 #endif
 
 static VALUE
@@ -743,6 +767,9 @@ fs_watcher_read_byte_from_fd(VALUE _arg) {
 		data->ret = read(data->fd, &data->byte, 1);
 		TRAP_END;
 		data->error = errno;
+	#elif defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+		rb_thread_call_without_gvl2(fs_watcher_read_byte_from_fd_wrapper,
+			data, RUBY_UBF_IO, NULL);
 	#elif defined(HAVE_RB_THREAD_IO_BLOCKING_REGION)
 		rb_thread_io_blocking_region(fs_watcher_read_byte_from_fd_wrapper,
 			data, data->fd);

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.53'
+	VERSION_STRING = '4.0.55'
 
 	PREFERRED_NGINX_VERSION = '1.6.2'
 	NGINX_SHA256_CHECKSUM = 'b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18'

data/lib/phusion_passenger/packaging.rb

@@ -37,16 +37,17 @@ module Packaging
 	# Files that must be generated before packaging.
 	PREGENERATED_FILES = [
 		'ext/common/Constants.h',
-		'doc/Packaging.html'
+		'doc/Packaging.html',
+		'doc/CloudLicensingConfiguration.html'
 	] + ASCII_DOCS
-	
+
 	USER_EXECUTABLES = [
 		'passenger',
 		'passenger-install-apache2-module',
 		'passenger-install-nginx-module',
 		'passenger-config'
 	]
-	
+
 	SUPER_USER_EXECUTABLES = [
 		'passenger-status',
 		'passenger-memory-stats'
@@ -62,7 +63,7 @@ module Packaging
 		'passenger-install-apache2-module',
 		'passenger-install-nginx-module'
 	]
-	
+
 	# A list of globs which match all files that should be packaged
 	# in the Phusion Passenger gem or tarball.
 	GLOB = [
@@ -129,7 +130,7 @@ module Packaging
 		'test/stub/**/*',
 		'test/stub/**/.*'
 	]
-	
+
 	EXCLUDE_GLOB = [
 		'**/.DS_Store',
 		'packaging/*/.git',

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -34,14 +34,14 @@ module PlatformInfo
 	def self.os_name
 		if rb_config['target_os'] =~ /darwin/ && (sw_vers = find_command('sw_vers'))
 			return "macosx"
-		elsif rb_config['target_os'] == "linux-"
+		elsif rb_config['target_os'] =~ /^linux-/
 			return "linux"
 		else
 			return rb_config['target_os']
 		end
 	end
 	memoize :os_name
-	
+
 	# The current platform's shared library extension ('so' on most Unices).
 	def self.library_extension
 		if os_name == "macosx"
@@ -50,7 +50,7 @@ module PlatformInfo
 			return "so"
 		end
 	end
-	
+
 	# Returns the `uname` command, or nil if `uname` cannot be found.
 	# In addition to looking for `uname` in `PATH`, this method also looks
 	# for `uname` in /bin and /usr/bin, just in case the user didn't
@@ -129,7 +129,7 @@ module PlatformInfo
 			elsif arch == "amd64"
 				arch = "x86_64"
 			end
-			
+
 			if arch == "x86"
 				# Most x86 operating systems nowadays are probably running on
 				# a CPU that supports both x86 and x86_64, but we're not gonna
@@ -146,7 +146,7 @@ module PlatformInfo
 		end
 	end
 	memoize :cpu_architectures, true
-	
+
 	# Returns whether the OS's main CPU architecture supports the
 	# x86/x86_64 sfence instruction.
 	def self.supports_sfence_instruction?
@@ -161,7 +161,7 @@ module PlatformInfo
 			}))
 	end
 	memoize :supports_sfence_instruction?, true
-	
+
 	# Returns whether the OS's main CPU architecture supports the
 	# x86/x86_64 lfence instruction.
 	def self.supports_lfence_instruction?

data/lib/phusion_passenger/utils.rb

@@ -169,6 +169,7 @@ module Utils
 				if thread_name = thread[:name]
 					thread_name = "(#{thread_name})"
 				end
+				stack ||= ["(empty)"]
 				output << ("-" * 60) << "\n"
 				output << "# Thread: #{thread.inspect}#{thread_name}, "
 				if thread == Thread.main

data/test/integration_tests/native_packaging_spec.rb

@@ -62,7 +62,11 @@ when "deb"
 	APACHE2_MODULE_PATH = "/usr/lib/apache2/modules/mod_passenger.so"
 	SUPPORTS_COMPILING_APACHE_MODULE = false
 
-	APXS2 = "/usr/bin/apxs2"
+	if `lsb_release -r -s`.strip <= '12.04'
+		APXS2 = "/usr/bin/apxs2"
+	else
+		APXS2 = "/usr/bin/apxs"
+	end
 	APACHE2 = "/usr/sbin/apache2"
 	APACHE2CTL = "/usr/sbin/apache2ctl"
 	APACHE_CONFIG_FILE = "/etc/apache2/apache2.conf"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.53
+  version: 4.0.55
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -143,6 +143,8 @@ files:
 - dev/vagrant/nginx_start
 - dev/vagrant/provision.sh
 - dev/vagrant/sudoers.conf
+- doc/CloudLicensingConfiguration.html
+- doc/CloudLicensingConfiguration.txt.md
 - doc/CodingTipsAndPitfalls.md
 - doc/DebuggingAndStressTesting.md
 - doc/Design and Architecture.html
@@ -165,6 +167,7 @@ files:
 - doc/Users guide.html
 - doc/Users guide.txt
 - doc/images/by_sa.png
+- doc/images/cloud_licensing_batch_job.png
 - doc/images/code_walkthrough.jpg
 - doc/images/direct_spawning.png
 - doc/images/direct_spawning.svg
@@ -213,6 +216,7 @@ files:
 - doc/images/startup_sequence.png
 - doc/images/typical_isolated_web_application.png
 - doc/images/typical_isolated_web_application.svg
+- doc/templates/bootstrap.config.json
 - doc/templates/bootstrap.min.css
 - doc/templates/markdown.html.erb
 - doc/users_guide_snippets/alternative_for_flying_passenger.txt

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJUK9cjAAoJECrHRaUKISqMRTgIAKJVJG6YhhvH+p0wfTavrjXs
-sQ3ovOKf3NchudkMC24B0D88I4hvYCsFPmA9ltllpnh95IJu9ffDL3jp5Pb/vh+E
-dWpEojuzw03gaob9JYNMVij3V7yKfSznGQwjOgpcz1/dSwGElOoZdSMsL0OHJRXl
-k+d9c6PpiJqn1wdmIIez91zeENFuxcc9qlTPJWFGgQvaztnV78Av0KBO6d46ohRt
-fon/+sj4BVpsg3kvj5Z/dzegCHd1FX6LTvNrnrfcFf+IR1ky1XhS+NPM6AZbUnsf
-WlszF70EnEgxBCZDtpiUlJKBg16P7XSAVE5dyzM082jvZeBs1t5ZJzEmCNCwDhM=
-=R6Mx
+iQEcBAABAgAGBQJUiwJyAAoJECrHRaUKISqMAsYIAJrctJZvwWdk61VIysNIQdBa
+8Rt8kvfFvCyUQzXn2CiofyhLT66lhJxnP76b+Y6rbLTPJvYQNwdK+gqpSO1PqSkh
+PFm4rT68dzYh1UfRJL+KRuciz8U/gREpNEg10gxeHU+jwvKLlgnrmxXVLKVMhmvX
+B26++RExwF/7pasctr8QOe6EecTM5ccWwy7/Cl+qt3Y7W3rM6KZqtZWAvvCNfq0w
+Q0z487MHplF3tPy+HSfPJrcBaUBHw5Bda0pMXsNOjj62Kz9j7MARIdzyCjArayma
+1OXtXfO7nt1rNKs527P1Umf46xToZZOnP278rrMivgSbKOTylZnfV8VxC0e2tng=
+=/7tV
 -----END PGP SIGNATURE-----