passenger 3.0.0.pre1 → 3.0.0.pre2

data/ext/common/Constants.h

@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.0.0.pre1"
+#define PASSENGER_VERSION "3.0.0.pre2"
 
 #define FEEDBACK_FD 3
 

data/ext/common/ResourceLocator.h

@@ -74,7 +74,7 @@ public:
 		if (nativelyPackaged) {
 			return "/usr/share/phusion-passenger/certificates";
 		} else {
-			return root + "/misc/certificates";
+			return root + "/misc";
 		}
 	}
 };

data/ext/common/Utils/MemZeroGuard.h

@@ -76,7 +76,7 @@ public:
 	 */
 	MemZeroGuard(string &str) {
 		this->data = NULL;
-		this->size = NULL;
+		this->size = 0;
 		this->str  = &str;
 	}
 	

data/ext/phusion_passenger/native_support.c

@@ -472,7 +472,7 @@ f_generic_writev(VALUE fd, VALUE *array_of_components, unsigned int count) {
 	vector_offset = 0;
 	for (i = 0; i < count; i++) {
 		components = array_of_components[i];
-		for (j = 0; j < RARRAY_LEN(components); j++) {
+		for (j = 0; j < (unsigned int) RARRAY_LEN(components); j++) {
 			str = rb_ary_entry(components, j);
 			str = rb_obj_as_string(str);
 			total_size += (unsigned int) RSTRING_LEN(str);

data/lib/phusion_passenger.rb

@@ -25,7 +25,7 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.0.pre1'
+	VERSION_STRING = '3.0.0.pre2'
 	
 	PREFERRED_NGINX_VERSION = '0.7.67'
 	PREFERRED_PCRE_VERSION  = '8.02'
@@ -92,7 +92,7 @@ module PhusionPassenger
 		# Location of the Apache 2 module.
 		APACHE2_MODULE     = File.join(SOURCE_ROOT, "ext", "apache2", "mod_passenger.so")
 	else
-		SOURCE_ROOT        = NATIVELY_PACKAGED_SOURCE_DIR
+		SOURCE_ROOT        = NATIVELY_PACKAGED_SOURCE_ROOT
 		NATIVE_SUPPORT_DIR = NATIVELY_PACKAGED_NATIVE_SUPPORT_DIR
 		DOCDIR             = NATIVELY_PACKAGED_DOCDIR
 		AGENTS_DIR         = NATIVELY_PACKAGED_AGENTS_DIR

data/lib/phusion_passenger/abstract_installer.rb

@@ -226,7 +226,7 @@ private
 		if PlatformInfo.find_command("wget")
 			return sh("wget", "-O", output, url)
 		else
-			return sh("curl", url, "-L", "-o", output)
+			return sh("curl", url, "-f", "-L", "-o", output)
 		end
 	end
 end

data/lib/phusion_passenger/platform_info/apache.rb

@@ -165,6 +165,9 @@ module PlatformInfo
 		flags = ["-fPIC"]
 		if compiler_supports_visibility_flag?
 			flags << "-fvisibility=hidden -DVISIBILITY_ATTRIBUTE_SUPPORTED"
+			if compiler_visibility_flag_generates_warnings?
+				flags << "-Wno-attributes"
+			end
 		end
 		if with_apr_flags
 			flags << apr_flags

data/lib/phusion_passenger/platform_info/binary_compatibility.rb

@@ -34,7 +34,9 @@ module PlatformInfo
 	# be running on a different architectural mode than the default one.
 	def self.cpu_architecture
 		result = `uname -p`.strip
-		if result == "unknown"
+		# On some systems 'uname -p' returns something like
+		# 'Intel(R) Pentium(R) M processor 1400MHz'.
+		if result == "unknown" || result =~ / /
 			result = `uname -m`.strip
 		end
 		return result

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -26,11 +26,34 @@ require 'phusion_passenger/platform_info'
 module PhusionPassenger
 
 module PlatformInfo
+	def self.cc
+		return ENV['CC'] || "gcc"
+	end
+	
+	def self.cxx
+		return ENV['CXX'] || "g++"
+	end
+	
 	def self.compiler_supports_visibility_flag?
 		return try_compile(:c, '', '-fvisibility=hidden')
 	end
 	memoize :compiler_supports_visibility_flag?, true
 	
+	# 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
+	# This appears to be a bug in older g++ versions:
+	# http://gcc.gnu.org/ml/gcc-patches/2006-07/msg00861.html
+	# Warnings should be suppressed with -Wno-attributes.
+	def self.compiler_visibility_flag_generates_warnings?
+		if `#{cxx} -v 2>&1` =~ /gcc version (.*?)/
+			return $1 <= "4.1.2"
+		else
+			return false
+		end
+	end
+	memoize :compiler_visibility_flag_generates_warnings?, true
+	
 	# Compiler flags that should be used for compiling every C/C++ program,
 	# for portability reasons. These flags should be specified as last
 	# when invoking the compiler.
@@ -131,9 +154,9 @@ module PlatformInfo
 private
 	def self.try_compile(language, source, flags = nil)
 		if language == :c
-			compiler = 'gcc'
+			compiler = cc
 		elsif language == :cxx
-			compiler = 'g++'
+			compiler = cxx
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -27,6 +27,15 @@ require 'phusion_passenger/platform_info'
 module PhusionPassenger
 
 module PlatformInfo
+	# Store original $GEM_HOME value so that even if the app customizes
+	# $GEM_HOME we can still work with the original value.
+	gem_home = ENV['GEM_HOME']
+	if gem_home
+		gem_home = gem_home.strip.freeze
+		gem_home = nil if gem_home.empty?
+	end
+	GEM_HOME = gem_home
+	
 	if defined?(::RUBY_ENGINE)
 		RUBY_ENGINE = ::RUBY_ENGINE
 	else
@@ -37,23 +46,26 @@ module PlatformInfo
 	# In case of RVM this function will return the path to the RVM wrapper script
 	# that executes the current Ruby interpreter in the currently active gem set.
 	def self.ruby_command
-		@@ruby_command ||= begin
-			filename = ruby_executable
-			if filename =~ %r{(.*)/.rvm/rubies/(.+?)/bin/(.+)}
-				home = $1
-				name = $2
-				exename = $3
-				if !ENV['rvm_gemset_name'].to_s.empty?
-					name << "@#{ENV['rvm_gemset_name']}"
-				end
-				new_filename = "#{home}/.rvm/wrappers/#{name}/#{exename}"
-				if File.exist?(new_filename)
-					filename = new_filename
-				end
+		if in_rvm?
+			name = rvm_ruby_string
+			dir = rvm_path
+			if name && dir
+				return "#{dir}/wrappers/#{name}/ruby"
+			else
+				# Something's wrong with the user's RVM installation.
+				# Raise an error so that the user knows this instead of
+				# having things fail randomly later on.
+				# 'name' is guaranteed to be non-nil because rvm_ruby_string
+				# already raises an exception on error.
+				raise "Your RVM installation appears to be broken: the RVM " +
+					"path cannot be found. Please fix your RVM installation " +
+					"or contact the RVM developers for support."
 			end
-			filename
+		else
+			return ruby_executable
 		end
 	end
+	memoize :ruby_command
 	
 	# Returns the full path to the current Ruby interpreter's executable file.
 	# This might not be the actual correct command to use for invoking the Ruby
@@ -122,6 +134,68 @@ module PlatformInfo
 		return Config::CONFIG['bindir'].include?('/.rvm/')
 	end
 	
+	# If the current Ruby interpreter is managed by RVM, returns the
+	# directory in which RVM places its working files. Otherwise returns
+	# nil.
+	def self.rvm_path
+		if in_rvm?
+			[ENV['rvm_path'], "~/.rvm", "/usr/local/rvm"].each do |path|
+				next if path.nil?
+				path = File.expand_path(path)
+				return path if File.directory?(path)
+			end
+		end
+		return nil
+	end
+	memoize :rvm_path
+	
+	# If the current Ruby interpreter is managed by RVM, returns the
+	# RVM name which identifies the current Ruby interpreter plus the
+	# currently active gemset, e.g. something like this:
+	# "ruby-1.9.2-p0@mygemset"
+	#
+	# Returns nil otherwise.
+	def self.rvm_ruby_string
+		if in_rvm?
+			# RVM used to export the necessary information through
+			# environment variables, but doesn't always do that anymore
+			# in the latest versions in order to fight env var pollution.
+			# Scanning $LOAD_PATH seems to be the only way to obtain
+			# the information.
+			
+			# Getting the RVM name of the Ruby interpreter ("ruby-1.9.2")
+			# isn't so hard, we can extract it from the #ruby_executable
+			# string. Getting the gemset name is a bit harder, so let's
+			# try various strategies...
+			
+			# $GEM_HOME usually contains the gem set name.
+			if GEM_HOME && GEM_HOME.include?("rvm/gems/")
+				return File.basename(GEM_HOME)
+			end
+			
+			# User somehow managed to nuke $GEM_HOME. Extract info
+			# from $LOAD_PATH.
+			matching_path = $LOAD_PATH.find_all do |item|
+				item.include?("rvm/gems/")
+			end
+			if matching_path
+				subpath = matching_path.to_s.gsub(/^.*rvm\/gems\//, '')
+				result = subpath.split('/').first
+				return result if result
+			end
+			
+			# On Ruby 1.9, $LOAD_PATH does not contain any gem paths until
+			# at least one gem has been required so the above can fail.
+			# We're out of options now, we can't detect the gem set.
+			# Raise an exception so that the user knows what's going on
+			# instead of having things fail in obscure ways later.
+			raise "Unable to autodetect the currently active RVM gem " +
+				"set name. Please contact this program's author for support."
+		end
+		return nil
+	end
+	memoize :rvm_ruby_string
+	
 	# Returns either 'sudo' or 'rvmsudo' depending on whether the current
 	# Ruby interpreter is managed by RVM.
 	def self.ruby_sudo_command

data/lib/phusion_passenger/templates/standalone/config.erb

@@ -1,8 +1,8 @@
 master_process on;
 worker_processes 1;
 daemon on;
-error_log <%= @options[:log_file] %>;
-pid <%= @options[:pid_file] %>;
+error_log '<%= @options[:log_file] %>';
+pid '<%= @options[:pid_file] %>';
 <% if @options[:user] %>user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;<% end %>
 
 events {
@@ -10,11 +10,11 @@ events {
 }
 
 http {
-    include <%= nginx_dir %>/conf/mime.types;
-    client_body_temp_path <%= @temp_dir %>/client;
-    proxy_temp_path <%= @temp_dir %>/proxy;
+    include '<%= nginx_dir %>/conf/mime.types';
+    client_body_temp_path '<%= @temp_dir %>/client';
+    proxy_temp_path '<%= @temp_dir %>/proxy';
     passenger_ruby <%= PlatformInfo.ruby_command %>;
-    passenger_root <%= passenger_root %>;
+    passenger_root '<%= passenger_root %>';
     passenger_abort_on_startup_error on;
     passenger_user_switching off;
     passenger_max_pool_size <%= @options[:max_pool_size] %>;
@@ -35,14 +35,14 @@ http {
     # Default server entry.
     server {
         listen <%= nginx_listen_address %>;
-        root <%= LIBDIR %>/phusion_passenger/templates/standalone_default_root;
+        root '<%= LIBDIR %>/phusion_passenger/templates/standalone_default_root';
     }
     <% end %>
 
     <% if @options[:ping_port] %>
     server {
         listen <%= nginx_listen_address(true) %>;
-        root <%= LIBDIR %>/phusion_passenger/templates/standalone_default_root;
+        root '<%= LIBDIR %>/phusion_passenger/templates/standalone_default_root';
     }
     <% end %>
     
@@ -50,20 +50,13 @@ http {
     server {
         listen <%= @options[:address] %>:<%= @options[:port] %>;
         server_name <%= app[:server_names].join(' ') %>;
-        root <%= app[:root] %>/public;
+        root '<%= app[:root] %>/public';
         passenger_enabled on;
         rails_env <%= app[:env] %>;
         passenger_spawn_method <%= app[:spawn_method] %>;
         <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %>
         <% if app[:analytics] %>passenger_analytics on;<% end %>
         <% if app[:debugger] %>passenger_debugger on;<% end %>
-        <%
-        # The following is to make Tower Top work. In Phusion Passenger Standalone we don't
-        # care about inter-app security because it's meant for simple use cases; we
-        # don't even support user switching. People who care about inter-app security
-        # should just use Phusion Passenger for Apache or Nginx.
-        %>
-        passenger_app_rights inspect_basic_info;
     }
     <% end %>
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: -1876988208
+  hash: -1876988207
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - pre1
-  version: 3.0.0.pre1
+  - pre2
+  version: 3.0.0.pre2
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +02:00
+date: 2010-09-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -735,6 +735,168 @@ files:
 - doc/images/spawn_server_architecture.svg
 - doc/images/typical_isolated_web_application.png
 - doc/images/typical_isolated_web_application.svg
+- doc/rdoc/classes/ConditionVariable.html
+- doc/rdoc/classes/Exception.html
+- doc/rdoc/classes/GC.html
+- doc/rdoc/classes/IO.html
+- doc/rdoc/classes/PhusionPassenger/AbstractInstaller.html
+- doc/rdoc/classes/PhusionPassenger/AbstractRequestHandler.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/InvalidPassword.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerAlreadyStarted.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerError.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerNotStarted.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer/UnknownMessage.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServer.html
+- doc/rdoc/classes/PhusionPassenger/AbstractServerCollection.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats/Process.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/CorruptedDirectoryError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/GenerationsAbsentError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Group.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Process.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/RoleDeniedError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/StaleDirectoryError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Stats.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/UnsupportedGenerationStructureVersionError.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance.html
+- doc/rdoc/classes/PhusionPassenger/AdminTools.html
+- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/Log.html
+- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/SharedData.html
+- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger.html
+- doc/rdoc/classes/PhusionPassenger/AppInitError.html
+- doc/rdoc/classes/PhusionPassenger/AppProcess.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner/Error.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/CGIFixed.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner/Error.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails/RequestHandler.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRails.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions/AnalyticsLogging.html
+- doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions.html
+- doc/rdoc/classes/PhusionPassenger/ConsoleTextTemplate.html
+- doc/rdoc/classes/PhusionPassenger/DebugLogging.html
+- doc/rdoc/classes/PhusionPassenger/FrameworkInitError.html
+- doc/rdoc/classes/PhusionPassenger/HTMLTemplate.html
+- doc/rdoc/classes/PhusionPassenger/InitializationError.html
+- doc/rdoc/classes/PhusionPassenger/InvalidPath.html
+- doc/rdoc/classes/PhusionPassenger/MessageChannel/InvalidHashError.html
+- doc/rdoc/classes/PhusionPassenger/MessageChannel.html
+- doc/rdoc/classes/PhusionPassenger/MessageClient.html
+- doc/rdoc/classes/PhusionPassenger/NativeSupport/FileSystemWatcher.html
+- doc/rdoc/classes/PhusionPassenger/NativeSupport.html
+- doc/rdoc/classes/PhusionPassenger/Packaging.html
+- doc/rdoc/classes/PhusionPassenger/PlatformInfo.html
+- doc/rdoc/classes/PhusionPassenger/Plugin.html
+- doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner/Error.html
+- doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner.html
+- doc/rdoc/classes/PhusionPassenger/Rack/RequestHandler.html
+- doc/rdoc/classes/PhusionPassenger/Rack.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ACExtension.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ASBenchmarkableExtension.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ExceptionLogger.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging.html
+- doc/rdoc/classes/PhusionPassenger/Rails3Extensions.html
+- doc/rdoc/classes/PhusionPassenger/SpawnManager.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/AppFinder.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/Command.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile/DisallowedContextError.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/HelpCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/Main.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/PackageRuntimeCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/RuntimeInstaller.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/StartCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/StatusCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/StopCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/Utils.html
+- doc/rdoc/classes/PhusionPassenger/Standalone/VersionCommand.html
+- doc/rdoc/classes/PhusionPassenger/Standalone.html
+- doc/rdoc/classes/PhusionPassenger/UnknownError.html
+- doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/DirInfo.html
+- doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/FileInfo.html
+- doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher.html
+- doc/rdoc/classes/PhusionPassenger/Utils/HostsFileParser.html
+- doc/rdoc/classes/PhusionPassenger/Utils/PseudoIO.html
+- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput/Tempfile.html
+- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput.html
+- doc/rdoc/classes/PhusionPassenger/Utils/UnseekableSocket.html
+- doc/rdoc/classes/PhusionPassenger/Utils.html
+- doc/rdoc/classes/PhusionPassenger/VersionNotFound.html
+- doc/rdoc/classes/PhusionPassenger/WSGI/ApplicationSpawner.html
+- doc/rdoc/classes/PhusionPassenger/WSGI.html
+- doc/rdoc/classes/PhusionPassenger.html
+- doc/rdoc/classes/Process.html
+- doc/rdoc/classes/Signal.html
+- doc/rdoc/created.rid
+- doc/rdoc/files/DEVELOPERS_TXT.html
+- doc/rdoc/files/ext/phusion_passenger/native_support_c.html
+- doc/rdoc/files/lib/phusion_passenger/abstract_installer_rb.html
+- doc/rdoc/files/lib/phusion_passenger/abstract_request_handler_rb.html
+- doc/rdoc/files/lib/phusion_passenger/abstract_server_collection_rb.html
+- doc/rdoc/files/lib/phusion_passenger/abstract_server_rb.html
+- doc/rdoc/files/lib/phusion_passenger/admin_tools/memory_stats_rb.html
+- doc/rdoc/files/lib/phusion_passenger/admin_tools/server_instance_rb.html
+- doc/rdoc/files/lib/phusion_passenger/admin_tools_rb.html
+- doc/rdoc/files/lib/phusion_passenger/analytics_logger_rb.html
+- doc/rdoc/files/lib/phusion_passenger/app_process_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails/application_spawner_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails/cgi_fixed_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails/framework_spawner_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails/request_handler_rb.html
+- doc/rdoc/files/lib/phusion_passenger/classic_rails_extensions/init_rb.html
+- doc/rdoc/files/lib/phusion_passenger/console_text_template_rb.html
+- doc/rdoc/files/lib/phusion_passenger/constants_rb.html
+- doc/rdoc/files/lib/phusion_passenger/debug_logging_rb.html
+- doc/rdoc/files/lib/phusion_passenger/dependencies_rb.html
+- doc/rdoc/files/lib/phusion_passenger/exceptions_rb.html
+- doc/rdoc/files/lib/phusion_passenger/html_template_rb.html
+- doc/rdoc/files/lib/phusion_passenger/message_channel_rb.html
+- doc/rdoc/files/lib/phusion_passenger/message_client_rb.html
+- doc/rdoc/files/lib/phusion_passenger/native_support_rb.html
+- doc/rdoc/files/lib/phusion_passenger/packaging_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/apache_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/binary_compatibility_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/compiler_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/curl_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/documentation_tools_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/linux_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/operating_system_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/ruby_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info/zlib_rb.html
+- doc/rdoc/files/lib/phusion_passenger/platform_info_rb.html
+- doc/rdoc/files/lib/phusion_passenger/plugin_rb.html
+- doc/rdoc/files/lib/phusion_passenger/public_api_rb.html
+- doc/rdoc/files/lib/phusion_passenger/rack/application_spawner_rb.html
+- doc/rdoc/files/lib/phusion_passenger/rack/request_handler_rb.html
+- doc/rdoc/files/lib/phusion_passenger/rails3_extensions/init_rb.html
+- doc/rdoc/files/lib/phusion_passenger/simple_benchmarking_rb.html
+- doc/rdoc/files/lib/phusion_passenger/spawn_manager_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/app_finder_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/config_file_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/help_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/main_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/package_runtime_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/runtime_installer_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/start_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/status_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/stop_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/utils_rb.html
+- doc/rdoc/files/lib/phusion_passenger/standalone/version_command_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/file_system_watcher_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/hosts_file_parser_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/rewindable_input_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/tmpdir_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils/unseekable_socket_rb.html
+- doc/rdoc/files/lib/phusion_passenger/utils_rb.html
+- doc/rdoc/files/lib/phusion_passenger/wsgi/application_spawner_rb.html
+- doc/rdoc/files/README.html
+- doc/rdoc/fr_class_index.html
+- doc/rdoc/fr_file_index.html
+- doc/rdoc/fr_method_index.html
+- doc/rdoc/index.html
+- doc/rdoc/rdoc-style.css
 - doc/Security of user switching support.html
 - doc/Security of user switching support.txt
 - doc/template/horo.rb
@@ -772,7 +934,6 @@ files:
 - ext/common/LoggingAgent/Main.cpp
 - ext/common/Utils/Base64.cpp
 - ext/common/Utils/CachedFileStat.cpp
-- ext/common/Utils/foo.cpp
 - ext/common/Utils/IOUtils.cpp
 - ext/common/Utils/MD5.cpp
 - ext/common/Utils/StrIntUtils.cpp