passenger 2.0.6 → 2.1.2

data/test/stub/apache2/httpd.conf.erb

@@ -11,9 +11,6 @@ Listen 127.0.0.1:<%= @port %>
 <% if !has_builtin_module?('mod_log_config.c') %>
 	LoadModule log_config_module "<%= modules_dir %>/mod_log_config.so"
 <% end %>
-<% if !has_builtin_module?('mod_mime.c') && has_module?('mod_unique_id.so') %>
-	LoadModule unique_id_module "<%= modules_dir %>/mod_unique_id.so"
-<% end %>
 <% if !has_builtin_module?('mod_mime.c') %>
 	LoadModule mime_module "<%= modules_dir %>/mod_mime.so"
 <% end %>
@@ -29,7 +26,7 @@ Listen 127.0.0.1:<%= @port %>
 LoadModule passenger_module "<%= @mod_passenger %>"
 
 PassengerRoot "<%= @passenger_root %>"
-PassengerRuby "<%= RUBY %>"
+PassengerRuby "<%= PlatformInfo::RUBY %>"
 RailsEnv production
 RackEnv production
 <% for line in @extra %>
@@ -61,7 +58,7 @@ DocumentRoot "<%= @server_root %>"
 
 LockFile  <%= @server_root %>/httpd.lock
 PidFile   <%= @server_root %>/httpd.pid
-ErrorLog  <%= @server_root %>/errors.log
+ErrorLog  <%= @passenger_root %>/test/test.log
 CustomLog <%= @server_root %>/access.log combined
 
 <% if !vhosts.empty? %>
@@ -71,6 +68,7 @@ CustomLog <%= @server_root %>/access.log combined
 	<VirtualHost *:<%= @port %>>
 		ServerName <%= vhost.domain %>
 		DocumentRoot "<%= vhost.document_root %>"
+		AllowEncodedSlashes On
 		<% for line in vhost.additional_configs %>
 			<%= line %>
 		<% end %>

data/test/stub/message_channel.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
-require 'passenger/message_channel'
+require 'phusion_passenger/message_channel'
 
-include Passenger
+include PhusionPassenger
 reader = MessageChannel.new(STDIN)
 writer = MessageChannel.new(STDOUT)
 writer.write(*(reader.read << "!!"))

data/test/stub/message_channel_2.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
-require 'passenger/message_channel'
+require 'phusion_passenger/message_channel'
 
-include Passenger
+include PhusionPassenger
 reader = MessageChannel.new(STDIN)
 writer = MessageChannel.new(STDOUT)
 writer.write_scalar(reader.read_scalar << "!!")

data/test/stub/message_channel_3.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../ext"
-require 'passenger/message_channel'
-require 'passenger/utils'
+require 'phusion_passenger/message_channel'
+require 'phusion_passenger/utils'
 
-include Passenger
+include PhusionPassenger
 channel = MessageChannel.new(IO.new(3))
 channel.write(*channel.read)
 channel.write_scalar(channel.read_scalar)

data/test/stub/rails_apps/foobar/app/controllers/foo_controller.rb

@@ -10,4 +10,12 @@ class FooController < ActionController::Base
 	def backtrace
 		render :text => caller.join("\n")
 	end
+	
+	def sleep_until_exists
+		File.open("#{RAILS_ROOT}/waiting_#{params[:name]}", 'w')
+		while !File.exist?("#{RAILS_ROOT}/#{params[:name]}")
+			sleep 0.1
+		end
+		render :nothing => true
+	end
 end

data/test/stub/rails_apps/foobar/config/environments/development.rb

@@ -12,7 +12,6 @@ config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
 config.action_view.debug_rjs                         = true
 config.action_controller.perform_caching             = false
-config.action_view.cache_template_extensions         = false
 
 # Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
+config.action_mailer.raise_delivery_errors = false

data/test/stub/rails_apps/mycook/app/controllers/welcome_controller.rb

@@ -18,7 +18,7 @@ class WelcomeController < ApplicationController
 	end
 	
 	def in_passenger
-		render :text => !!defined?(Passenger::SpawnManager)
+		render :text => !!defined?(IN_PHUSION_PASSENGER)
 	end
 	
 	def rails_env
@@ -29,7 +29,27 @@ class WelcomeController < ApplicationController
 		render :text => caller.join("\n")
 	end
 	
+	def passenger_name
+		render :text => Passenger.new.name
+	end
+	
 	def terminate
 		exit!
 	end
+
+	def show_id
+		render :text => params[:id]
+	end
+
+	def request_uri
+		render :text => request.request_uri
+	end
+	
+	def sleep_until_exists
+		File.open("#{RAILS_ROOT}/waiting_#{params[:name]}", 'w')
+		while !File.exist?("#{RAILS_ROOT}/#{params[:name]}")
+			sleep 0.1
+		end
+		render :nothing => true
+	end
 end

data/test/stub/rails_apps/mycook/sites/some.site/public/uploads.html

@@ -0,0 +1,26 @@
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8">
+	<title>MyCook&trade; beta</title>
+	<style type="text/css">
+	body {
+		background: url('/images/cookbook.gif?1204293900');
+	}
+	
+	#content {
+		margin-top: 2em;
+		margin-left: 20%;
+		margin-right: 20%;
+		padding: 1em;
+		border: solid 5px orange;
+		background: white;
+	}
+	</style>
+</head>
+
+<body>
+	<div id="content">
+		This is the cached version of some.site/public/uploads.
+	</div>
+</body>
+</html>

data/test/stub/rails_apps/mycook/sites/some.site/public/welcome/cached.html

@@ -0,0 +1,26 @@
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8">
+	<title>MyCook&trade; beta</title>
+	<style type="text/css">
+	body {
+		background: url('/images/cookbook.gif?1204293900');
+	}
+	
+	#content {
+		margin-top: 2em;
+		margin-left: 20%;
+		margin-right: 20%;
+		padding: 1em;
+		border: solid 5px orange;
+		background: white;
+	}
+	</style>
+</head>
+
+<body>
+	<div id="content">
+		This is the cached version of some.site/public/welcome/cached.
+	</div>
+</body>
+</html>

data/test/stub/railsapp/app/controllers/bar_controller_2.rb

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

data/test/stub/railsapp/app/controllers/foo_controller.rb

@@ -2,4 +2,8 @@ class FooController < ActionController::Base
 	def new
 		render :text => 'hello world'
 	end
+
+	def pid
+		render :text => Process.pid.to_s
+	end
 end

data/test/stub/spawn_server.rb

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../ext"
-require 'passenger/spawn_manager'
+require 'phusion_passenger/spawn_manager'
 
-include Passenger
+include PhusionPassenger
 class SpawnManager
-	def handle_spawn_application(app_root, lower_privilege, lowest_user, environment,
-				spawn_method, app_type)
+	def handle_spawn_application(*options)
 		client.write('ok')
 		client.write(1234, "/tmp/nonexistant.socket", false)
 		client.send_io(STDERR)

data/test/support/apache2_controller.rb

@@ -1,9 +1,45 @@
 require 'erb'
 require 'fileutils'
-require 'passenger/platform_info'
+require 'phusion_passenger/platform_info'
 
+# A class for starting, stopping and restarting Apache, and for manipulating
+# its configuration file. This is used by the integration tests.
+#
+# Before a test begins, the test instructs Apache2Controller to create an Apache
+# configuration folder, which contains an Apache configuration file and other
+# configuration resources that Apache needs. The Apache configuration file is
+# created from a template (see Apache2Controller::STUB_DIR).
+# The test can define configuration customizations. For example, it can tell
+# Apache2Controller to add configuration options, virtual host definitions, etc.
+#
+# After the configuration folder has been created, Apache2Controller will start
+# Apache. After Apache has been started, the test will be run. Apache2Controller
+# will stop Apache after the test is done.
+#
+# Apache2Controller ensures that starting, stopping and restarting are not prone
+# to race conditions. For example, it ensures that when #start returns, Apache
+# really is listening on its server socket instead of still initializing.
+#
+# == Usage
+#
+# Suppose that you want to test a hypothetical "AlwaysPrintHelloWorld"
+# Apache configuration option. Then you can write the following test:
+#
+#   apache = Apache2Controller.new
+#   
+#   # Add a configuration option to the configuration file.
+#   apache << "AlwaysPrintHelloWorld on"
+#   
+#   # Write configuration file and start Apache with that configuration file.
+#   apache.start
+#   
+#   begin
+#       response_body = http_get("http://localhost:#{apache.port}/some/url")
+#       response_body.should == "hello world!"
+#   ensure
+#       apache.stop
+#   end
 class Apache2Controller
-	include PlatformInfo
 	STUB_DIR = File.expand_path(File.dirname(__FILE__) + "/../stub/apache2")
 	
 	class VHost
@@ -41,6 +77,11 @@ class Apache2Controller
 		end
 	end
 	
+	# Create an Apache configuration folder and start Apache on that
+	# configuration folder. This method does not return until Apache
+	# has done initializing.
+	#
+	# If Apache is already started, this this method will stop Apache first.
 	def start
 		if running?
 			stop
@@ -55,7 +96,7 @@ class Apache2Controller
 		write_config_file
 		FileUtils.cp("#{STUB_DIR}/mime.types", @server_root)
 		
-		if !system(HTTPD, "-f", "#{@server_root}/httpd.conf", "-k", "start")
+		if !system(PlatformInfo.httpd, "-f", "#{@server_root}/httpd.conf", "-k", "start")
 			raise "Could not start an Apache server."
 		end
 		
@@ -87,11 +128,15 @@ class Apache2Controller
 	
 	def graceful_restart
 		write_config_file
-		if !system(HTTPD, "-f", "#{@server_root}/httpd.conf", "-k", "graceful")
+		if !system(PlatformInfo.httpd, "-f", "#{@server_root}/httpd.conf", "-k", "graceful")
 			raise "Cannot restart Apache."
 		end
 	end
 	
+	# Stop Apache and delete its configuration folder. This method waits
+	# until Apache is done with its shutdown procedure.
+	#
+	# This method does nothing if Apache is already stopped.
 	def stop
 		pid_file = "#{@server_root}/httpd.pid"
 		if File.exist?(pid_file)
@@ -132,14 +177,18 @@ class Apache2Controller
 		end
 	end
 	
-	def add_vhost(domain, document_root)
+	# Define a virtual host configuration block for the Apache configuration
+	# file.
+	def set_vhost(domain, document_root)
 		vhost = VHost.new(domain, document_root)
 		if block_given?
 			yield vhost
 		end
+		vhosts.reject! {|host| host.domain == domain}
 		vhosts << vhost
 	end
 	
+	# Checks whether this Apache instance is running.
 	def running?
 		if File.exist?("#{@server_root}/httpd.pid")
 			pid = File.read("#{@server_root}/httpd.pid").strip
@@ -156,6 +205,7 @@ class Apache2Controller
 		end
 	end
 	
+	# Defines a configuration snippet to be added to the Apache configuration file.
 	def <<(line)
 		@extra << line
 	end
@@ -173,11 +223,11 @@ private
 	end
 	
 	def modules_dir
-		@@modules_dir ||= `#{APXS2} -q LIBEXECDIR`.strip
+		@@modules_dir ||= `#{PlatformInfo.apxs2} -q LIBEXECDIR`.strip
 	end
 	
 	def builtin_modules
-		@@builtin_modules ||= `#{HTTPD} -l`.split("\n").grep(/\.c$/).map do |line|
+		@@builtin_modules ||= `#{PlatformInfo.httpd} -l`.split("\n").grep(/\.c$/).map do |line|
 			line.strip
 		end
 	end

data/test/support/tut.h

@@ -42,6 +42,21 @@
 #include <winbase.h>
 #endif
 
+#ifdef __SOLARIS9__
+// Solaris 9 only has putenv, not setenv.
+static int setenv(const char *name, const char *value, int override) {
+    int ret;
+    char *s = (char*)malloc(strlen(name) + strlen(value) + 2);
+    s[0] = 0;
+    strcpy(s, name);
+    strcpy(s, "=");
+    strcpy(s, value);
+    ret = putenv(s);
+    free(s);
+    return ret;
+}
+#endif
+
 #define DEFINE_TEST_GROUP(name) \
 	using namespace tut; \
 	typedef test_group<name> factory; \

data/vendor/README

@@ -0,0 +1,12 @@
+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
+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.
+
+Rack is backwards-compatible so there shouldn't be any problems.