passenger 2.2.1 → 2.2.2

data/test/CxxTestMain.cpp

@@ -88,19 +88,19 @@ parseOptions(int argc, char *argv[]) {
  * Creates a Phusion Passenger temp dir at the beginning, and deletes it
  * at program exit.
  */
-struct TempDirGuard {
-	TempDirGuard() {
+struct TempDirSetup {
+	TempDirSetup() {
 		char command[1024];
 		
-		Passenger::createPassengerTempDir(Passenger::getSystemTempDir(),
-			geteuid() == 0, "nobody", geteuid(), getgid());
+		Passenger::createPassengerTempDir("", geteuid() == 0,
+			"nobody", geteuid(), getgid());
 		
 		snprintf(command, sizeof(command), "chmod -R u=rwx,g=rwx,o=rwx \"%s\"",
 			Passenger::getPassengerTempDir().c_str());
 		system(command);
 	}
 	
-	~TempDirGuard() {
+	~TempDirSetup() {
 		Passenger::removeDirTree(Passenger::getPassengerTempDir());
 	}
 };
@@ -117,7 +117,7 @@ main(int argc, char *argv[]) {
 	allGroups = tut::runner.get().list_groups();
 	parseOptions(argc, argv);
 	
-	TempDirGuard tg;
+	TempDirSetup ts;
 	
 	try {
 		bool all_ok = true;

data/test/HttpStatusExtractorTest.cpp

@@ -178,4 +178,21 @@ namespace tut {
 		ensure_equals(ex.getStatusLine(), "202 Blabla\r\n");
 		ensure_equals(ex.getBuffer(), string(data) + data2);
 	}
+	
+	TEST_METHOD(11) {
+		// If the status in the HTTP data doesn't contain a status text,
+		// then the status text is added.
+		const char data[] = "Status: 200\r\n\r\n";
+		ensure(ex.feed(data, sizeof(data) - 1));
+		ensure_equals(ex.getStatusLine(), "200 OK\r\n");
+	}
+	
+	TEST_METHOD(12) {
+		// If the status in the HTTP data doesn't contain a status text,
+		// and the status code is not recognized, then the status text
+		// "Unknown Status Code" is added.
+		const char data[] = "Status: 999\r\n\r\n";
+		ensure(ex.feed(data, sizeof(data) - 1));
+		ensure_equals(ex.getStatusLine(), "999 Unknown Status Code\r\n");
+	}
 }

data/test/StandardApplicationPoolTest.cpp

@@ -1,8 +1,10 @@
 #include "tut.h"
+#include "support/Support.h"
 #include "StandardApplicationPool.h"
 #include "Utils.h"
 
 using namespace Passenger;
+using namespace Test;
 
 namespace tut {
 	struct StandardApplicationPoolTest {

data/test/UtilsTest.cpp

@@ -17,28 +17,19 @@ namespace tut {
 	struct UtilsTest {
 		vector<string> output;
 		string oldPath;
-		char *oldInstanceTempDir;
+		string oldPassengerTempDir;
 		
 		UtilsTest() {
 			oldPath = getenv("PATH");
-			oldInstanceTempDir = getenv("PASSENGER_INSTANCE_TEMP_DIR");
-			if (oldInstanceTempDir != NULL) {
-				oldInstanceTempDir = strdup(oldInstanceTempDir);
-			}
-			
+			oldPassengerTempDir = getPassengerTempDir();
+			setPassengerTempDir("");
 			unsetenv("TMPDIR");
-			unsetenv("PASSENGER_INSTANCE_TEMP_DIR");
 		}
 		
 		~UtilsTest() {
 			setenv("PATH", oldPath.c_str(), 1);
 			unsetenv("TMPDIR");
-			if (oldInstanceTempDir == NULL) {
-				unsetenv("PASSENGER_INSTANCE_TEMP_DIR");
-			} else {
-				setenv("PASSENGER_INSTANCE_TEMP_DIR", oldInstanceTempDir, 1);
-				free(oldInstanceTempDir);
-			}
+			setPassengerTempDir(oldPassengerTempDir);
 		}
 	};
 	
@@ -168,31 +159,29 @@ namespace tut {
 	}
 	
 	TEST_METHOD(16) {
-		// It caches the result into the PASSENGER_INSTANCE_TEMP_DIR environment variable.
-		char dir[128];
+		// It returns the cached value if it's not the empty string.
+		setPassengerTempDir("/foo");
+		ensure_equals(getPassengerTempDir(), "/foo");
+		
+		setPassengerTempDir("/bar");
+		ensure_equals(getPassengerTempDir(), "/bar");
 		
+		char dir[128];
 		snprintf(dir, sizeof(dir), "/tmp/passenger.%lu", (unsigned long) getpid());
-		getPassengerTempDir();
-		ensure_equals(getenv("PASSENGER_INSTANCE_TEMP_DIR"), string(dir));
+		setPassengerTempDir("");
+		ensure_equals(getPassengerTempDir(), dir);
 	}
 	
 	TEST_METHOD(17) {
-		// It returns the value of the PASSENGER_INSTANCE_TEMP_DIR environment
-		// variable if it's not NULL and not an empty string.
-		setenv("PASSENGER_INSTANCE_TEMP_DIR", "/foo", 1);
-		ensure_equals(getPassengerTempDir(), "/foo");
-	}
-	
-	TEST_METHOD(18) {
-		// It does not use query the PASSENGER_INSTANCE_TEMP_DIR environment variable if bypassCache is true.
+		// It does not use query the cached value if bypassCache is true.
 		char dir[128];
 		
-		setenv("PASSENGER_INSTANCE_TEMP_DIR", "/foo", 1);
+		setPassengerTempDir("/foo");
 		snprintf(dir, sizeof(dir), "/tmp/passenger.%lu", (unsigned long) getpid());
 		ensure_equals(getPassengerTempDir(true), dir);
 	}
 	
-	TEST_METHOD(19) {
+	TEST_METHOD(18) {
 		// It uses the systemTempDir argument if it's not the empty string.
 		char dir[128];
 		
@@ -205,7 +194,7 @@ namespace tut {
 	
 	struct TemporarilySetInstanceTempDir {
 		TemporarilySetInstanceTempDir() {
-			setenv("PASSENGER_INSTANCE_TEMP_DIR", "utils_test.tmp", 1);
+			setPassengerTempDir("utils_test.tmp");
 			mkdir("utils_test.tmp", S_IRWXU);
 			mkdir(BufferedUpload::getDir().c_str(), S_IRWXU);
 		}

data/test/ruby/abstract_request_handler_spec.rb

@@ -8,8 +8,8 @@ include PhusionPassenger
 
 describe AbstractRequestHandler do
 	before :each do
-		@old_instance_temp_dir = ENV['PASSENGER_INSTANCE_TEMP_DIR']
-		ENV['PASSENGER_INSTANCE_TEMP_DIR'] = "abstract_request_handler_spec.tmp"
+		@old_passenger_tmpdir = Utils.passenger_tmpdir
+		Utils.passenger_tmpdir = "abstract_request_handler_spec.tmp"
 		@owner_pipe = IO.pipe
 		@request_handler = AbstractRequestHandler.new(@owner_pipe[1])
 		def @request_handler.process_request(*args)
@@ -20,11 +20,7 @@ describe AbstractRequestHandler do
 	after :each do
 		@request_handler.cleanup
 		@owner_pipe[0].close rescue nil
-		if @old_instance_temp_dir
-			ENV['PASSENGER_INSTANCE_TEMP_DIR'] = @old_instance_temp_dir
-		else
-			ENV.delete('PASSENGER_INSTANCE_TEMP_DIR')
-		end
+		Utils.passenger_tmpdir = @old_passenger_tmpdir
 		FileUtils.rm_rf("abstract_request_handler_spec.tmp")
 	end
 	

data/test/ruby/utils_spec.rb

@@ -11,57 +11,62 @@ describe Utils do
 	
 	specify "#close_all_io_objects_for_fds closes all IO objects that are associated with the given file descriptors" do
 		filename = "#{Dir.tmpdir}/passenger_test.#{Process.pid}.txt"
+		puts "#{$$}: 1"
 		begin
 			pid = fork do
 				begin
+					puts "#{$$}: 2"
 					a, b = IO.pipe
+					puts "#{$$}: 3"
 					close_all_io_objects_for_fds([0, 1, 2])
+					puts "#{$$}: 4"
 					File.open(filename, "w") do |f|
 						f.write("#{a.closed?}, #{b.closed?}")
 					end
+					puts "#{$$}: 5"
 				rescue Exception => e
 					print_exception("utils_spec", e)
 				ensure
+					puts "#{$$}: 6"
 					exit!
 				end
 			end
+			puts "#{$$}: 6"
 			Process.waitpid(pid) rescue nil
+			puts "#{$$}: 7"
 			File.read(filename).should == "true, true"
 		ensure
+			puts "#{$$}: 8"
 			File.unlink(filename) rescue nil
 		end
 	end
 	
 	describe "#passenger_tmpdir" do
 		before :each do
-			@old_instance_temp_dir = ENV['PASSENGER_INSTANCE_TEMP_DIR']
-			ENV.delete('PASSENGER_INSTANCE_TEMP_DIR')
+			@old_passenger_tmpdir = Utils.passenger_tmpdir
+			Utils.passenger_tmpdir = nil
 		end
 		
 		after :each do
-			if @old_instance_temp_dir
-				ENV['PASSENGER_INSTANCE_TEMP_DIR'] = @old_instance_temp_dir
-			else
-				ENV.delete('PASSENGER_INSTANCE_TEMP_DIR')
-			end
+			Utils.passenger_tmpdir = @old_passenger_tmpdir
 		end
 		
-		it "returns a directory under Dir.tmpdir if ENV['PASSENGER_INSTANCE_TEMP_DIR'] is nil" do
+		it "returns a directory under Dir.tmpdir if Utils.passenger_tmpdir is nil" do
 			File.dirname(passenger_tmpdir(false)).should == Dir.tmpdir
 		end
 		
-		it "returns a directory under Dir.tmpdir if ENV['PASSENGER_INSTANCE_TEMP_DIR'] is an empty string" do
-			ENV['PASSENGER_INSTANCE_TEMP_DIR'] = ''
+		it "returns a directory under Dir.tmpdir if Utils.passenger_tmpdir is an empty string" do
+			Utils.passenger_tmpdir = ''
 			File.dirname(passenger_tmpdir(false)).should == Dir.tmpdir
 		end
 		
-		it "returns ENV['PASSENGER_INSTANCE_TEMP_DIR'] if it's set" do
-			ENV['PASSENGER_INSTANCE_TEMP_DIR'] = '/foo'
+		it "returns Utils.passenger_tmpdir if it's set" do
+			Utils.passenger_tmpdir = '/foo'
 			passenger_tmpdir(false).should == '/foo'
 		end
 		
 		it "creates the directory if it doesn't exist, if the 'create' argument is true" do
-			ENV['PASSENGER_INSTANCE_TEMP_DIR'] = 'utils_spec.tmp'
+			Utils.passenger_tmpdir = 'utils_spec.tmp'
 			passenger_tmpdir
 			begin
 				File.directory?('utils_spec.tmp').should be_true

data/test/ruby/wsgi/application_spawner_spec.rb

@@ -10,21 +10,17 @@ describe PhusionPassenger::WSGI::ApplicationSpawner do
 	include PhusionPassenger::Utils
 	
 	before :each do
-		@old_instance_temp_dir = ENV['PASSENGER_INSTANCE_TEMP_DIR']
-		ENV['PASSENGER_INSTANCE_TEMP_DIR'] = "#{Dir.tmpdir}/wsgi_test.tmp"
+		@old_passenger_tmpdir = Utils.passenger_tmpdir
+		Utils.passenger_tmpdir = "#{Dir.tmpdir}/wsgi_test.tmp"
 		@stub = setup_stub('wsgi')
 		File.unlink("#{@stub.app_root}/passenger_wsgi.pyc") rescue nil
 	end
 	
 	after :each do
 		@stub.destroy
-		FileUtils.chmod_R(0700, ENV['PASSENGER_INSTANCE_TEMP_DIR'])
-		FileUtils.rm_rf(ENV['PASSENGER_INSTANCE_TEMP_DIR'])
-		if @old_instance_temp_dir
-			ENV['PASSENGER_INSTANCE_TEMP_DIR'] = @old_instance_temp_dir
-		else
-			ENV.delete('PASSENGER_INSTANCE_TEMP_DIR')
-		end
+		FileUtils.chmod_R(0700, Utils.passenger_tmpdir)
+		FileUtils.rm_rf(Utils.passenger_tmpdir)
+		Utils.passenger_tmpdir = @old_passenger_tmpdir
 	end
 	
 	it "can spawn our stub application" do

data/test/stub/railsapp/app/controllers/bar_controller_1.txt

@@ -0,0 +1,5 @@
+class BarController < ApplicationController
+	def index
+		render :text => 'bar 1!'
+	end
+end

data/test/support/Support.h

@@ -13,6 +13,10 @@ namespace Test {
 
 using namespace std;
 
+/**
+ * Class which creates a temporary directory of the given name, and deletes
+ * it upon destruction.
+ */
 class TempDir {
 private:
 	string name;
@@ -35,6 +39,22 @@ public:
 	}
 };
 
+/**
+ * Class which deletes the given file upon destruction.
+ */
+class DeleteFileEventually {
+private:
+	string filename;
+public:
+	DeleteFileEventually(const string &filename) {
+		this->filename = filename;
+	}
+	
+	DeleteFileEventually() {
+		unlink(filename.c_str());
+	}
+};
+
 } // namespace Test
 
 #endif /* _TEST_SUPPORT_H_ */

data/test/support/config.rb

@@ -11,3 +11,16 @@ rescue Errno::ENOENT
 		"test/config.yml, and edit it."
 	exit 1
 end
+
+require 'fileutils'
+require 'phusion_passenger/utils'
+
+# Calculate location of the temp dir and cache it.
+PhusionPassenger::Utils.passenger_tmpdir
+
+Spec::Runner.configure do |config|
+	config.append_after do
+		FileUtils.chmod_R(0777, PhusionPassenger::Utils.passenger_tmpdir);
+		FileUtils.rm_rf(PhusionPassenger::Utils.passenger_tmpdir)
+	end
+end

data/vendor/README

@@ -1,12 +1,13 @@
 You might be wondering why the Rack library is vendored, and why we don't
 just depend on the Rack gem. The reason for this is because there are broken
 applications out there that have a hard dependency on rack == 0.4.0 (the
-latest version of Rack is 0.9.1 at the time of writing). If Passenger
+latest version of Rack is 1.0.0 at the time of writing). If Passenger
 depends on the Rack gem, then the application will crash with a gem version
 conflict error upon executing 'gem "rack", "=0.4.0"'.
 
 To fix this conflict, we vendor Rack. When we load our vendored Rack library,
 it won't be registered as a gem, so no RubyGems version conflict exception
-will be raised.
+will be raised. This vendored version is commit 884770528a3, slightly older
+than the 1.0.0 release.
 
-Rack is backwards-compatible so there shouldn't be any problems.
+Rack is mostly backwards-compatible so there shouldn't be any problems.

data/vendor/{rack-0.9.1 → rack-1.0.0-git}/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2007 Christian Neukirchen <purl.org/net/chneukirchen>
+Copyright (c) 2007, 2008, 2009 Christian Neukirchen <purl.org/net/chneukirchen>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/vendor/{rack-0.9.1 → rack-1.0.0-git}/README

@@ -9,6 +9,24 @@ middleware) into a single method call.
 The exact details of this are described in the Rack specification,
 which all Rack applications should conform to.
 
+== Specification changes in this release
+
+With Rack 1.0, the Rack specification (found in SPEC) changed in the
+following backward-incompatible ways.  This was done to properly
+support Ruby 1.9 and to deprecate some problematic techniques:
+
+* Rack::VERSION has been pushed to [1,0].
+* Header values must be Strings now, split on "\n".
+* rack.input must be rewindable and support reading into a buffer,
+  wrap with Rack::RewindableInput if it isn't.
+* Content-Length can be missing, in this case chunked transfer
+  encoding is used.
+* Bodies can now additionally respond to #to_path with a filename to
+  be served.
+* String bodies are deprecated and will not work with Ruby 1.9, use an
+  Array with a single String instead.
+* rack.session is now specified.
+
 == Supported web servers
 
 The included *handlers* connect all kinds of web servers to Rack:
@@ -25,7 +43,8 @@ The included *handlers* connect all kinds of web servers to Rack:
 These web servers include Rack handlers in their distributions:
 * Ebb
 * Fuzed
-* Phusion Passenger (which is mod_rack for Apache)
+* Phusion Passenger (which is mod_rack for Apache and for nginx)
+* Unicorn
 
 Any valid Rack app will run the same on all these handlers, without
 changing anything.
@@ -36,6 +55,7 @@ The included *adapters* connect Rack with existing Ruby web frameworks:
 * Camping
 
 These frameworks include Rack adapters in their distributions:
+* Camping
 * Coset
 * Halcyon
 * Mack
@@ -44,13 +64,15 @@ These frameworks include Rack adapters in their distributions:
 * Racktools::SimpleApplication
 * Ramaze
 * Ruby on Rails
+* Rum
 * Sinatra
 * Sin
 * Vintage
 * Waves
+* Wee
 
 Current links to these projects can be found at
-http://ramaze.net/#other-frameworks
+http://wiki.ramaze.net/Home#other-frameworks
 
 == Available middleware
 
@@ -140,10 +162,11 @@ installation and test-spec.
 To run the test suite completely, you need:
 
   * camping
-  * mongrel
   * fcgi
-  * ruby-openid
   * memcache-client
+  * mongrel
+  * ruby-openid
+  * thin
 
 The full set of tests test FCGI access with lighttpd (on port
 9203) so you will need lighttpd installed as well as the FCGI
@@ -227,6 +250,28 @@ run on port 11211) and memcache-client installed.
 * January 9th, 2009: Sixth public release 0.9.1.
   * Fix directory traversal exploits in Rack::File and Rack::Directory.
 
+* April 25th, 2009: Seventh public release 1.0.0.
+  * SPEC change: Rack::VERSION has been pushed to [1,0].
+  * SPEC change: header values must be Strings now, split on "\n".
+  * SPEC change: Content-Length can be missing, in this case chunked transfer
+    encoding is used.
+  * SPEC change: rack.input must be rewindable and support reading into
+    a buffer, wrap with Rack::RewindableInput if it isn't.
+  * SPEC change: rack.session is now specified.
+  * SPEC change: Bodies can now additionally respond to #to_path with
+    a filename to be served.
+  * NOTE: String bodies break in 1.9, use an Array consisting of a
+    single String instead.
+  * New middleware Rack::Lock.
+  * New middleware Rack::ContentType.
+  * Rack::Reloader has been rewritten.
+  * Major update to Rack::Auth::OpenID.
+  * Support for nested parameter parsing in Rack::Response.
+  * Support for redirects in Rack::Response.
+  * HttpOnly cookie support in Rack::Response.
+  * The Rakefile has been rewritten.
+  * Many bugfixes and small improvements.
+
 == Contact
 
 Please mail bugs, suggestions and patches to
@@ -237,7 +282,7 @@ Mailing list archives are available at
 
 There is a bug tracker at <http://rack.lighthouseapp.com/>.
 
-Git repository (patches rebased on master are most welcome):
+Git repository (send Git patches to the mailing list):
 * http://github.com/rack/rack
 * http://git.vuxu.org/cgi-bin/gitweb.cgi?p=rack.git
 
@@ -262,8 +307,10 @@ would like to thank:
 * Luc Heinrich for the Cookie sessions, the static file handler and bugfixes.
 * Armin Ronacher, for the logo and racktools.
 * Aredridel, Ben Alpert, Dan Kubb, Daniel Roethlisberger, Matt Todd,
-  Tom Robinson, and Phil Hagelberg for bug fixing and other
-  improvements.
+  Tom Robinson, Phil Hagelberg, and S. Brent Faulkner for bug fixing
+  and other improvements.
+* Brian Candler, for Rack::ContentType.
+* Graham Batty, for improved handler loading.
 * Stephen Bannasch, for bug reports and documentation.
 * Gary Wright, for proposing a better Rack::Response interface.
 * Jonathan Buch, for improvements regarding Rack::Response.