passenger 1.0.1 → 1.0.2

data/ext/passenger/native_support.c

@@ -41,32 +41,32 @@ static VALUE mNativeSupport;
 static VALUE
 send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
 	int fd;
-	struct msghdr msg;
-	struct iovec vec[1];
-	char buf[1];
-
 	struct {
-		struct cmsghdr hdr;
+		struct cmsghdr header;
 		int fd;
-	} cmsg;
+	} control;
+	struct msghdr msg;
+	struct iovec vec;
+	char dummy[1];
+
+	control.header.cmsg_len   = sizeof(control);
+	control.header.cmsg_level = SOL_SOCKET;
+	control.header.cmsg_type  = SCM_RIGHTS;
+	control.fd = NUM2INT(fd_to_send);
 
 	msg.msg_name = NULL;
 	msg.msg_namelen = 0;
-
-	/* Linux and Solaris doesn't work if msg_iov is NULL. */
-	buf[0] = '\0';
-	vec[0].iov_base = buf;
-	vec[0].iov_len = 1;
-	msg.msg_iov = vec;
+	
+	/* Linux and Solaris require msg_iov to be non-NULL.. */
+	dummy[0]       = '\0';
+	vec.iov_base   = dummy;
+	vec.iov_len    = sizeof(dummy);
+	msg.msg_iov    = &vec;
 	msg.msg_iovlen = 1;
-
-	msg.msg_control = (caddr_t)&cmsg;
-	msg.msg_controllen = CMSG_SPACE(sizeof(int));
-	msg.msg_flags = 0;
-	cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
-	cmsg.hdr.cmsg_level = SOL_SOCKET;
-	cmsg.hdr.cmsg_type = SCM_RIGHTS;
-	cmsg.fd = NUM2INT(fd_to_send);
+	
+	msg.msg_control    = (caddr_t) &control;
+	msg.msg_controllen = sizeof(control);
+	msg.msg_flags      = 0;
 	
 	if (sendmsg(NUM2INT(socket_fd), &msg, 0) == -1) {
 		rb_sys_fail("sendmsg(2)");
@@ -88,43 +88,46 @@ send_fd(VALUE self, VALUE socket_fd, VALUE fd_to_send) {
  */
 static VALUE
 recv_fd(VALUE self, VALUE socket_fd) {
-	struct msghdr msg;
-	struct iovec vec[2];
-	char buf[1];
 	struct {
-		struct cmsghdr hdr;
+		struct cmsghdr header;
 		int fd;
-	} cmsg;
+	} control;
 
-	msg.msg_name = NULL;
-	msg.msg_namelen = 0;
+	control.header.cmsg_len   = sizeof(control);
+	control.header.cmsg_level = SOL_SOCKET;
+	control.header.cmsg_type  = SCM_RIGHTS;
+	control.fd = -1;
+
+	struct msghdr msg;
+	struct iovec vec;
+	char dummy[1];
 
-	vec[0].iov_base = buf;
-	vec[0].iov_len = sizeof(buf);
-	msg.msg_iov = vec;
+	msg.msg_name    = NULL;
+	msg.msg_namelen = 0;
+	
+	dummy[0]       = '\0';
+	vec.iov_base   = dummy;
+	vec.iov_len    = sizeof(dummy);
+	msg.msg_iov    = &vec;
 	msg.msg_iovlen = 1;
 
-	msg.msg_control = (caddr_t)&cmsg;
-	msg.msg_controllen = CMSG_SPACE(sizeof(int));
-	msg.msg_flags = 0;
-	cmsg.hdr.cmsg_len = CMSG_LEN(sizeof(int));
-	cmsg.hdr.cmsg_level = SOL_SOCKET;
-	cmsg.hdr.cmsg_type = SCM_RIGHTS;
-	cmsg.fd = -1;
+	msg.msg_control    = (caddr_t) &control;
+	msg.msg_controllen = sizeof(control);
+	msg.msg_flags      = 0;
 
 	if (recvmsg(NUM2INT(socket_fd), &msg, 0) == -1) {
 		rb_sys_fail("Cannot read file descriptor with recvmsg()");
 		return Qnil;
 	}
-
-	if (msg.msg_controllen != CMSG_SPACE(sizeof(int))
-	 || cmsg.hdr.cmsg_len != CMSG_SPACE(0) + sizeof(int)
-	 || cmsg.hdr.cmsg_level != SOL_SOCKET
-	 || cmsg.hdr.cmsg_type != SCM_RIGHTS) {
+	
+	if (msg.msg_controllen        != sizeof(control)
+	 || control.header.cmsg_len   != sizeof(control)
+	 || control.header.cmsg_level != SOL_SOCKET
+	 || control.header.cmsg_type  != SCM_RIGHTS) {
 		rb_sys_fail("No valid file descriptor received.");
 		return Qnil;
 	}
-	return INT2NUM(cmsg.fd);
+	return INT2NUM(control.fd);
 }
 
 /*

data/lib/passenger/application_spawner.rb

@@ -182,6 +182,9 @@ protected
 			lower_privilege! if @lower_privilege
 			preload_application
 		rescue StandardError, ScriptError, NoMemoryError => e
+			if ENV['TESTING_PASSENGER'] == '1'
+				print_exception(self.class.to_s, e)
+			end
 			client.write('exception')
 			client.write_scalar(marshal_exception(e))
 			return
@@ -208,11 +211,14 @@ private
 		begin
 			if user.is_a?(String)
 				pw = Etc.getpwnam(user)
+				username = user
 				uid = pw.uid
 				gid = pw.gid
 			else
+				pw = Etc.getpwuid(user)
+				username = pw.name
 				uid = user
-				gid = Etc.getpwuid(uid).gid
+				gid = pw.gid
 			end
 		rescue
 			return false
@@ -220,6 +226,7 @@ private
 		if uid == ROOT_UID
 			return false
 		else
+			Process.groups = Process.initgroups(username, gid)
 			Process::Sys.setgid(gid)
 			Process::Sys.setuid(uid)
 			return true
@@ -230,9 +237,26 @@ private
 		Object.const_set(:RAILS_ROOT, @app_root)
 		if defined?(Rails::Initializer)
 			Rails::Initializer.run(:set_load_path)
+			
+			# The Rails framework is loaded at the moment.
+			# environment.rb may set ENV['RAILS_ENV']. So we re-initialize
+			# RAILS_ENV in Rails::Initializer.load_environment.
+			Rails::Initializer.class_eval do
+				def load_environment_with_passenger
+					if defined?(::RAILS_ENV)
+						Object.send(:remove_const, :RAILS_ENV)
+					end
+					Object.const_set(:RAILS_ENV, (ENV['RAILS_ENV'] || 'development').dup)
+					load_environment_without_passenger
+				end
+				
+				alias_method_chain :load_environment, :passenger
+			end
 		end
 		require 'config/environment'
-		ActionController::Base.page_cache_directory = "#{RAILS_ROOT}/public"
+		if ActionController::Base.page_cache_directory.blank?
+			ActionController::Base.page_cache_directory = "#{RAILS_ROOT}/public"
+		end
 		if defined?(ActionController::Dispatcher) \
 		   && ActionController::Dispatcher.respond_to?(:error_file_path)
 			ActionController::Dispatcher.error_file_path = "#{RAILS_ROOT}/public"
@@ -241,8 +265,10 @@ private
 			require 'dispatcher'
 		end
 		require_dependency 'application'
-		Dir.glob('app/{models,controllers,helpers}/*.rb').each do |file|
-			require_dependency normalize_path(file)
+		if GC.copy_on_write_friendly?
+			Dir.glob('app/{models,controllers,helpers}/*.rb').each do |file|
+				require_dependency normalize_path(file)
+			end
 		end
 	end
 
@@ -277,6 +303,13 @@ private
 		$0 = "Rails: #{@app_root}"
 		reader, writer = IO.pipe
 		begin
+			# Re-establish connection if a connection was established
+			# in environment.rb. This prevents us from concurrently
+			# accessing the same MySQL connection handle.
+			if defined?(::ActiveRecord::Base) && ::ActiveRecord::Base.connected?
+				::ActiveRecord::Base.establish_connection
+			end
+			
 			handler = RequestHandler.new(reader)
 			client.write(Process.pid, handler.socket_name,
 				handler.using_abstract_namespace?)

data/lib/passenger/dependencies.rb

@@ -248,7 +248,7 @@ module Dependencies # :nodoc: all
 	APR_DevHeaders = Dependency.new do |dep|
 		dep.name = "Apache Portable Runtime (APR) development headers"
 		dep.define_checker do |result|
-			result.found(!APR1_FLAGS.nil?)
+			result.found(APR_CONFIG)
 		end
 		if RUBY_PLATFORM =~ /linux/
 			case LINUX_DISTRO
@@ -259,6 +259,10 @@ module Dependencies # :nodoc: all
 			when :gentoo
 				dep.install_command = "emerge -av apr"
 			end
+		elsif RUBY_PLATFORM =~ /darwin/
+			dep.install_instructions = "Please install Apache from MacPorts, which will " <<
+				"provide APR automatically. <b>Or</b>, if you're installing against MacOS X's " <<
+				"default provided Apache, then please install the OS X Developer SDK."
 		end
 		dep.website = "http://httpd.apache.org/"
 		dep.website_comments = "APR is an integrated part of Apache."

data/lib/passenger/framework_spawner.rb

@@ -294,6 +294,8 @@ private
 			begin
 				app = spawner.spawn_application
 			rescue ApplicationSpawner::Error => e
+				spawner.stop
+				@spawners.delete(app_root)
 				client.write('exception')
 				client.write_scalar(marshal_exception(e))
 				return

data/lib/passenger/platform_info.rb

@@ -120,27 +120,40 @@ private
 		end
 	end
 	
-	def self.determine_apr1_info
-		flags = nil
-		libs = nil
-		if find_command('pkg-config')
-			flags = `pkg-config --cflags apr-1 apr-util-1 2>/dev/null`.strip
-			libs = `pkg-config --libs apr-1 apr-util-1 2>/dev/null`.strip
-		end
-		if (flags.nil? || flags.empty?) && (libs.nil? || libs.empty?)
+	def self.find_apr_config
+		if env_defined?('APR_CONFIG')
+			apr_config = ENV['APR_CONFIG']
+		elsif RUBY_PLATFORM =~ /darwin/ && HTTPD == "/usr/sbin/httpd"
+			# If we're on MacOS X, and we're compiling against the
+			# default provided Apache, then we'll want to query the
+			# correct 'apr-1-config' command. However, that command
+			# is not in $PATH by default. Instead, it lives in
+			# /Developer/SDKs/MacOSX*sdk/usr/bin.
+			sdk_dir = Dir["/Developer/SDKs/MacOSX*sdk"].sort.last
+			if sdk_dir
+				apr_config = "#{sdk_dir}/usr/bin/apr-1-config"
+				if !File.executable?(apr_config)
+					apr_config = nil
+				end
+			end
+		else
 			apr_config = find_command('apr-1-config')
 			if apr_config.nil?
 				apr_config = find_command('apr-config')
 			end
-			if apr_config.nil?
-				return nil
-			else
-				flags = `#{apr_config} --cppflags --includes`.strip
-				libs = `#{apr_config} --link-ld`.strip
-			end
 		end
-		flags.gsub!(/-O\d? /, '')
-		return [flags, libs]
+		return apr_config
+	end
+	
+	def self.determine_apr_info
+		if APR_CONFIG.nil?
+			return nil
+		else
+			flags = `#{APR_CONFIG} --cppflags --includes`.strip
+			libs = `#{APR_CONFIG} --link-ld`.strip
+			flags.gsub!(/-O\d? /, '')
+			return [flags, libs]
+		end
 	end
 	
 	def self.determine_multi_arch_flags
@@ -231,11 +244,13 @@ public
 	APACHE2CTL = find_apache2ctl
 	# The absolute path to the Apache binary (that is, 'httpd', 'httpd2', 'apache' or 'apache2').
 	HTTPD = find_httpd
+	# The absolute path to the 'apr-config' or 'apr-1-config' executable.
+	APR_CONFIG = find_apr_config
 	
 	# The C compiler flags that are necessary to compile an Apache module.
 	APXS2_FLAGS = determine_apxs2_flags
 	# The C compiler flags that are necessary for programs that use APR.
-	APR1_FLAGS, APR1_LIBS = determine_apr1_info
+	APR_FLAGS, APR_LIBS = determine_apr_info
 	
 	# The C compiler flags that are necessary for building binaries in the same architecture(s) as Apache.
 	MULTI_ARCH_FLAGS = determine_multi_arch_flags

data/lib/passenger/request_handler.rb

@@ -97,12 +97,17 @@ class RequestHandler
 	DEFAULT = 'DEFAULT' # :nodoc:
 	CONTENT_LENGTH = 'CONTENT_LENGTH' # :nodoc:
 	HTTP_CONTENT_LENGTH = 'HTTP_CONTENT_LENGTH' # :nodoc:
+	X_POWERED_BY = 'X-Powered-By'
 	
 	NINJA_PATCHING_LOCK = Mutex.new
 	@@ninja_patched_action_controller = false
 	
 	File.read("#{File.dirname(__FILE__)}/../../Rakefile") =~ /^PACKAGE_VERSION = "(.*)"$/
 	PASSENGER_VERSION = $1
+	PASSENGER_HEADER = "Phusion Passenger (mod_rails) #{PASSENGER_VERSION}"
+	if File.exist?("#{File.dirname(__FILE__)}/../../enterprisey.txt")
+		PASSENGER_HEADER << ", Enterprise Edition"
+	end
 	
 	# The name of the socket on which the request handler accepts
 	# new connections. This is either a Unix socket filename, or
@@ -136,7 +141,7 @@ class RequestHandler
 					alias passenger_orig_perform_action perform_action
 					
 					def perform_action(*whatever)
-						headers["X-Powered-By"] = "Phusion Passenger (mod_rails) #{PASSENGER_VERSION}"
+						headers[X_POWERED_BY] = PASSENGER_HEADER
 						passenger_orig_perform_action(*whatever)
 					end
 				end
@@ -273,6 +278,10 @@ private
 		def write(block)
 			@io.write(block)
 		end
+		
+		def <<(block)
+			@io.write(block)
+		end
 	end
 	
 	def process_request(socket)

data/lib/passenger/spawn_manager.rb

@@ -106,14 +106,19 @@ class SpawnManager < AbstractServer
 				spawner.start
 				@spawners[key] = spawner
 			end
-		end
-		
-		spawner.time = Time.now
-		if spawner.is_a?(FrameworkSpawner)
-			return spawner.spawn_application(app_root, lower_privilege,
-				lowest_user)
-		else
-			return spawner.spawn_application
+			spawner.time = Time.now
+			begin
+				if spawner.is_a?(FrameworkSpawner)
+					return spawner.spawn_application(app_root, lower_privilege,
+						lowest_user)
+				else
+					return spawner.spawn_application
+				end
+			rescue AbstractServer::ServerError
+				spawner.stop
+				@spawners.delete(key)
+				raise
+			end
 		end
 	end
 	
@@ -242,6 +247,7 @@ private
 	end
 	
 	def send_error_page(channel, template_name, options = {})
+		options["enterprisey"] = File.exist?("#{File.dirname(__FILE__)}/../../enterprisey.txt")
 		data = HTMLTemplate.new(template_name, options).result
 		channel.write('error_page')
 		channel.write_scalar(data)

data/lib/passenger/templates/error_layout.html.erb

@@ -14,7 +14,7 @@
 
 	<div id="site_container">
 		<div id="site_header">
-			<ul class="corporate_identity">
+			<ul class="corporate_identity <% if @enterprisey %>enterprise_edition<% end %>">
 				<li class="logo"><a href="http://www.modrails.com"><span>Phusion Passenger</span></a></li>
 			</ul>
 		</div>
@@ -28,7 +28,7 @@
 			   text. Thank you.
 			-->
 			<div class="container">
-				Powered by <a href="http://www.modrails.com/">Phusion Passenger</a>,
+				Powered by <a href="http://www.modrails.com/">Phusion Passenger</a><% if @enterprisey %> (Enterprise Edition)<% end %>,
 				<tt>mod_rails</tt> for Apache.
 			</div>
 		</div>

data/test/CxxTestMain.cpp

@@ -14,6 +14,7 @@ int main() {
 	tut::runner.get().set_callback(&reporter);
 	signal(SIGPIPE, SIG_IGN);
 	setenv("RAILS_ENV", "production", 1);
+	setenv("TESTING_PASSENGER", "1", 1);
 	try {
 		tut::runner.get().run_tests();
 	} catch (const std::exception &ex) {

data/test/MessageChannelTest.cpp

@@ -17,7 +17,9 @@ namespace tut {
 		int p[2];
 
 		MessageChannelTest() {
-			pipe(p);
+			if (pipe(p) != 0) {
+				throw SystemException("Cannot create a pipe", errno);
+			}
 			reader = MessageChannel(p[0]);
 			writer = MessageChannel(p[1]);
 		}

data/test/application_spawner_spec.rb

@@ -6,6 +6,8 @@ require 'spawner_privilege_lowering_spec'
 require 'spawner_error_handling_spec'
 include Passenger
 
+# TODO: write unit test which checks whether setting ENV['RAILS_ENV'] in environment.rb is respected (issue #6)
+
 describe ApplicationSpawner do
 	before :all do
 		ENV['RAILS_ENV'] = 'production'

data/test/framework_spawner_spec.rb

@@ -6,6 +6,8 @@ require 'spawner_privilege_lowering_spec'
 require 'spawner_error_handling_spec'
 include Passenger
 
+# TODO: test whether FrameworkSpawner restarts ApplicationSpawner if it crashed
+
 describe FrameworkSpawner do
 	before :all do
 		ENV['RAILS_ENV'] = 'production'

data/test/integration_tests.rb

@@ -11,6 +11,7 @@ require 'passenger/platform_info'
 include PlatformInfo
 
 # TODO: test the 'RailsUserSwitching' and 'RailsDefaultUser' option.
+# TODO: test custom page caching directory
 
 shared_examples_for "MyCook(tm) beta" do
 	it "should be possible to fetch static assets" do