passenger 3.0.9 → 3.0.10

data/lib/phusion_passenger/platform_info.rb

@@ -334,6 +334,15 @@ public
 		end
 	end
 	private_class_method :try_compile_and_run
+
+	def self.rb_config
+		if defined?(::RbConfig)
+			return ::RbConfig::CONFIG
+		else
+			return ::Config::CONFIG
+		end
+	end
+	private_class_method :rb_config
 end
 
 end # module PhusionPassenger

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -61,6 +61,11 @@ module PlatformInfo
 	end
 	memoize :compiler_supports_wno_attributes_flag?, true
 	
+	def self.compiler_supports_wno_missing_field_initializers_flag?
+		return try_compile(:c, '', '-Wno-missing-field-initializers')
+	end
+	memoize :compiler_supports_wno_missing_field_initializers_flag?
+	
 	# Returns whether compiling C++ with -fvisibility=hidden might result
 	# in tons of useless warnings, like this:
 	# http://code.google.com/p/phusion-passenger/issues/detail?id=526

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -30,7 +30,7 @@ module PlatformInfo
 	# Returns the operating system's name. This name is in lowercase and contains no spaces,
 	# and thus is suitable to be used in some kind of ID. E.g. "linux", "macosx".
 	def self.os_name
-		if Config::CONFIG['target_os'] =~ /darwin/ && (sw_vers = find_command('sw_vers'))
+		if rb_config['target_os'] =~ /darwin/ && (sw_vers = find_command('sw_vers'))
 			return "macosx"
 		else
 			return RUBY_PLATFORM.sub(/.*?-/, '')

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -93,7 +93,7 @@ module PlatformInfo
 	# interpreter; use ruby_command instead.
 	def self.ruby_executable
 		@@ruby_executable ||=
-			Config::CONFIG['bindir'] + '/' + Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT']
+			rb_config['bindir'] + '/' + rb_config['RUBY_INSTALL_NAME'] + rb_config['EXEEXT']
 	end
 	
 	# Returns whether the Ruby interpreter supports process forking.
@@ -103,7 +103,7 @@ module PlatformInfo
 		return Process.respond_to?(:fork) &&
 			RUBY_ENGINE != "jruby" &&
 			RUBY_ENGINE != "macruby" &&
-			Config::CONFIG['target_os'] !~ /mswin|windows|mingw/
+			rb_config['target_os'] !~ /mswin|windows|mingw/
 	end
 	
 	# Returns the correct 'gem' command for this Ruby interpreter.
@@ -152,7 +152,7 @@ module PlatformInfo
 	
 	# Returns whether the current Ruby interpreter is managed by RVM.
 	def self.in_rvm?
-		bindir = Config::CONFIG['bindir']
+		bindir = rb_config['bindir']
 		return bindir.include?('/.rvm/') || bindir.include?('/rvm/')
 	end
 	
@@ -246,7 +246,7 @@ module PlatformInfo
 	def self.locate_ruby_tool(name)
 		result = locate_ruby_tool_by_basename(name)
 		if !result
-			exeext = Config::CONFIG['EXEEXT']
+			exeext = rb_config['EXEEXT']
 			exeext = nil if exeext.empty?
 			if exeext
 				result = locate_ruby_tool_by_basename("#{name}#{exeext}")
@@ -324,7 +324,7 @@ private
 	#
 	#   transform_according_to_ruby_exec_format("rake")    => "jrake", "rake1.8", etc
 	def self.transform_according_to_ruby_exec_format(name)
-		install_name = Config::CONFIG['RUBY_INSTALL_NAME']
+		install_name = rb_config['RUBY_INSTALL_NAME']
 		if install_name.include?('ruby')
 			format = install_name.sub('ruby', '%s')
 			return sprintf(format, name)

data/lib/phusion_passenger/rack/application_spawner.rb

@@ -1,3 +1,4 @@
+# encoding: binary
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2010 Phusion
 #
@@ -151,7 +152,7 @@ protected
 	# Overrided method.
 	def initialize_server # :nodoc:
 		report_app_init_status(MessageChannel.new(@owner_socket)) do
-			$0 = "Passenger ApplicationSpawner: #{@app_root}"
+			$0 = "Passenger ApplicationSpawner: #{@options['app_group_name']}"
 			prepare_app_process('config.ru', @options)
 			@app = self.class.send(:load_rack_app)
 			after_loading_app_code(@options)
@@ -189,7 +190,7 @@ private
 
 	def self.start_request_handler(channel, app, forked, options)
 		app_root = options["app_root"]
-		$0 = "Rack: #{app_root}"
+		$0 = "Rack: #{options['app_group_name']}"
 		reader, writer = IO.pipe
 		begin
 			reader.close_on_exec!
@@ -218,7 +219,9 @@ private
 		# Rails apps explicitly specify a Rack version as dependency.
 		require 'rack'
 		rackup_file = ENV["RACKUP_FILE"] || "config.ru"
-		rackup_code = ::File.read(rackup_file)
+		rackup_code = ::File.open(rackup_file, 'rb') do |f|
+			f.read
+		end
 		eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, rackup_file)
 	end
 	private_class_method :load_rack_app

data/lib/phusion_passenger/utils.rb

@@ -330,7 +330,7 @@ protected
 		# attempt to un-require RubyGems, so here we put Phusion Passenger back
 		# into the load path. This must be done before loading the app's startup
 		# file because the app might require() Phusion Passenger files.
-		if $LOAD_PATH.first != LIBDIR
+		if !$LOAD_PATH.include?(LIBDIR)
 			$LOAD_PATH.unshift(LIBDIR)
 			$LOAD_PATH.uniq!
 		end
@@ -359,7 +359,7 @@ protected
 		# load path after setting up Bundler, the app itself might also
 		# remove Phusion Passenger from the load path for whatever reason,
 		# so here we restore the load path again.
-		if $LOAD_PATH.first != LIBDIR
+		if !$LOAD_PATH.include?(LIBDIR)
 			$LOAD_PATH.unshift(LIBDIR)
 			$LOAD_PATH.uniq!
 		end

data/lib/phusion_passenger/wsgi/application_spawner.rb

@@ -70,7 +70,7 @@ class ApplicationSpawner
 
 private
 	def run(channel, options)
-		$0 = "WSGI: #{options['app_root']}"
+		$0 = "WSGI: #{options['app_group_name']}"
 		prepare_app_process("passenger_wsgi.py", options)
 		ENV['WSGI_ENV'] = options['environment']
 		

data/resources/mime.types

@@ -8,6 +8,7 @@ types {
     application/x-javascript              js;
     application/atom+xml                  atom;
     application/rss+xml                   rss;
+    text/cache-manifest                   manifest appcache;
 
     text/mathml                           mml;
     text/plain                            txt;
@@ -57,6 +58,7 @@ types {
     application/octet-stream              eot;
     application/octet-stream              iso img;
     application/octet-stream              msi msp msm;
+    application/octet-stream              gem;
 
     audio/midi                            mid midi kar;
     audio/mpeg                            mp3;

data/test/cxx/LoggingTest.cpp

@@ -1,7 +1,8 @@
 #include "TestSupport.h"
-#include "Logging.h"
-#include "MessageClient.h"
-#include "LoggingAgent/LoggingServer.h"
+#include <Logging.h>
+#include <MessageClient.h>
+#include <LoggingAgent/LoggingServer.h>
+#include <Utils/MessageIO.h>
 
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
@@ -565,9 +566,8 @@ namespace tut {
 		log.reset();
 		
 		vector<string> args;
-		MessageChannel channel(logger->getConnection());
-		channel.write("flush", NULL);
-		ensure(channel.read(args));
+		writeArrayMessage(logger->getConnection(), "flush", NULL);
+		ensure(readArrayMessage(logger->getConnection(), args));
 		ensure_equals(args.size(), 1u);
 		ensure_equals(args[0], "ok");
 		
@@ -591,13 +591,11 @@ namespace tut {
 		log2->message("message 2");
 		log2.reset();
 		
-		MessageChannel channel(logger->getConnection());
-		channel.write("flush", NULL);
-		ensure(channel.read(args));
+		writeArrayMessage(logger->getConnection(), "flush", NULL);
+		ensure(readArrayMessage(logger->getConnection(), args));
 		
-		channel = MessageChannel(logger2->getConnection());
-		channel.write("flush", NULL);
-		ensure(channel.read(args));
+		writeArrayMessage(logger2->getConnection(), "flush", NULL);
+		ensure(readArrayMessage(logger2->getConnection(), args));
 		
 		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt";
 		struct stat buf;

data/test/cxx/MessageIOTest.cpp

@@ -155,7 +155,7 @@ namespace tut {
 	/***** Test readArrayMessage() and writeArrayMessage() *****/
 	
 	TEST_METHOD(20) {
-		// They work.
+		// Test <= 10 arguments.
 		writeArrayMessage(pipes[1], "ab", "cd", "efg", NULL);
 		writeArrayMessage(pipes[1], "ab", "cd", "efh", NULL);
 		
@@ -182,6 +182,56 @@ namespace tut {
 	}
 	
 	TEST_METHOD(21) {
+		// Test > 10 arguments.
+		writeArrayMessage(pipes[1], "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "a", "b", NULL);
+		writeArrayMessage(pipes[1], "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", NULL);
+		
+		unsigned char buf[26];
+		readExact(pipes[0], buf, 26);
+		ensure_equals(buf[0], 0u);
+		ensure_equals(buf[1], 24u);
+		ensure_equals(buf[2], '1');
+		ensure_equals(buf[3], '\0');
+		ensure_equals(buf[4], '2');
+		ensure_equals(buf[5], '\0');
+		ensure_equals(buf[6], '3');
+		ensure_equals(buf[7], '\0');
+		ensure_equals(buf[8], '4');
+		ensure_equals(buf[9], '\0');
+		ensure_equals(buf[10], '5');
+		ensure_equals(buf[11], '\0');
+		ensure_equals(buf[12], '6');
+		ensure_equals(buf[13], '\0');
+		ensure_equals(buf[14], '7');
+		ensure_equals(buf[15], '\0');
+		ensure_equals(buf[16], '8');
+		ensure_equals(buf[17], '\0');
+		ensure_equals(buf[18], '9');
+		ensure_equals(buf[19], '\0');
+		ensure_equals(buf[20], '0');
+		ensure_equals(buf[21], '\0');
+		ensure_equals(buf[22], 'a');
+		ensure_equals(buf[23], '\0');
+		ensure_equals(buf[24], 'b');
+		ensure_equals(buf[25], '\0');
+		
+		vector<string> args = readArrayMessage(pipes[0]);
+		ensure_equals(args.size(), 12u);
+		ensure_equals(args[0], "c");
+		ensure_equals(args[1], "d");
+		ensure_equals(args[2], "e");
+		ensure_equals(args[3], "f");
+		ensure_equals(args[4], "g");
+		ensure_equals(args[5], "h");
+		ensure_equals(args[6], "i");
+		ensure_equals(args[7], "j");
+		ensure_equals(args[8], "k");
+		ensure_equals(args[9], "l");
+		ensure_equals(args[10], "m");
+		ensure_equals(args[11], "n");
+	}
+	
+	TEST_METHOD(22) {
 		// readArrayMessage() throws EOFException on premature EOF.
 		writeExact(pipes[1], "\x00");
 		pipes[1].close();
@@ -201,7 +251,7 @@ namespace tut {
 		}
 	}
 	
-	TEST_METHOD(22) {
+	TEST_METHOD(23) {
 		// Test timeout.
 		unsigned long long timeout = 30000;
 		unsigned long long startTime = SystemTime::getUsec();
@@ -228,7 +278,7 @@ namespace tut {
 		}
 	}
 	
-	/***** Test readArrayMessage() and writeArrayMessage() *****/
+	/***** Test readScalarMessage() and writeScalarMessage() *****/
 	
 	TEST_METHOD(30) {
 		// They work.

data/test/cxx/MessageReadersWritersTest.cpp

@@ -1,5 +1,7 @@
 #include "TestSupport.h"
-#include "MessageReadersWriters.h"
+#include <MessageReadersWriters.h>
+#include <cstdlib>
+#include <alloca.h>
 
 using namespace Passenger;
 using namespace std;
@@ -382,7 +384,8 @@ namespace tut {
 	TEST_METHOD(34) {
 		// generate() works.
 		StaticString args[] = { "ab", "cde" };
-		StaticString out[ArrayMessage::outputSize(2)];
+		StaticString *out = (StaticString *)
+			alloca(ArrayMessage::outputSize(2) * sizeof(StaticString));
 		char buf[sizeof(uint16_t)];
 		ArrayMessage::generate(args, 2, buf, out, ArrayMessage::outputSize(2));
 		

data/test/cxx/MessageServerTest.cpp

@@ -42,6 +42,7 @@ namespace tut {
 			if (serverThread != NULL) {
 				serverThread->interrupt_and_join();
 			}
+			Passenger::setLogLevel(0);
 		}
 		
 		class SlowClient: public Client {
@@ -180,7 +181,8 @@ namespace tut {
 	TEST_METHOD(3) {
 		// It disconnects the client if the client does not supply a username and
 		// password within a time limit.
-		server->setLoginTimeout(40);
+		Passenger::setLogLevel(-1);
+		server->setLoginTimeout(40000);
 		
 		/* These can throw either an IOException or SystemException:
 		 * - An IOException is raised when connect() encounters EOF.

data/test/integration_tests/nginx_tests.rb

@@ -40,7 +40,6 @@ describe "Phusion Passenger for Nginx" do
 		end
 	end
 	
-	
 	describe "MyCook(tm) beta running a root URI" do
 		before :all do
 			@server = "http://1.passenger.test:#{@nginx.port}"
@@ -108,6 +107,7 @@ describe "Phusion Passenger for Nginx" do
 			@nginx.add_server do |server|
 				server[:server_name] = "passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"
+				server[:passenger_max_requests] = 3
 			end
 			@nginx.start
 		end
@@ -193,6 +193,11 @@ describe "Phusion Passenger for Nginx" do
 				server[:passenger_app_group_name] = "secondary"
 				server[:passenger_show_version_in_header] = "off"
 			end
+			@nginx.add_server do |server|
+				server[:server_name] = "2.passenger.test"
+				server[:root]        = "#{@stub.full_app_root}/public"
+				server[:passenger_max_requests] = 3
+			end
 			@nginx.start
 		end
 		
@@ -247,6 +252,14 @@ describe "Phusion Passenger for Nginx" do
 			response["X-Powered-By"].should include("Phusion Passenger")
 			response["X-Powered-By"].should_not include(PhusionPassenger::VERSION_STRING)
 		end
+		
+		it "respawns the app after handling max_requests requests" do
+			@server = "http://2.passenger.test:#{@nginx.port}/"
+			pid = get("/pid")
+			get("/pid").should == pid
+			get("/pid").should == pid
+			get("/pid").should_not == pid
+		end
 	end
 	
 	

data/test/stub/rack/config.ru

@@ -2,6 +2,8 @@ app = lambda do |env|
     if env['PATH_INFO'] == '/chunked'
         chunks = ["7\r\nchunk1\n\r\n", "7\r\nchunk2\n\r\n", "7\r\nchunk3\n\r\n", "0\r\n\r\n"]
         [200, { "Content-Type" => "text/html", "Transfer-Encoding" => "chunked" }, chunks]
+    elsif env['PATH_INFO'] == '/pid'
+        [200, { "Content-Type" => "text/html" }, [$$]]
     else
         [200, { "Content-Type" => "text/html" }, ["hello <b>world</b>"]]
     end

data/test/tut/tut.h

@@ -69,9 +69,15 @@ static int setenv(const char *name, const char *value, int override) {
 	typedef factory::object object; \
 	factory name## _group(#name)
 
-#define TEST_METHOD(i) \
-	template<> template<> \
-	void object::test<i>()
+#ifdef __clang__
+	#define TEST_METHOD(i) \
+		template<> \
+		void object::test<i>()
+#else
+	#define TEST_METHOD(i) \
+		template<> template<> \
+		void object::test<i>()
+#endif
 
 /**
  * Template Unit Tests Framework for C++.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 3
   - 0
-  - 9
-  version: 3.0.9
+  - 10
+  version: 3.0.10
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-04 00:00:00 +02:00
+date: 2011-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1076,6 +1076,7 @@ files:
 - ext/libev/ltmain.sh
 - ext/libev/missing
 - ext/libev/mkinstalldirs
+- ext/libev/config.h
 - ext/libev/ev++.h
 - ext/libev/ev.h
 - ext/libev/ev_vars.h