passenger 3.0.0.pre2 → 3.0.0.pre3

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -50,16 +50,37 @@ module PlatformInfo
 			name = rvm_ruby_string
 			dir = rvm_path
 			if name && dir
-				return "#{dir}/wrappers/#{name}/ruby"
+				filename = "#{dir}/wrappers/#{name}/ruby"
+				if File.exist?(filename)
+					contents = File.open(filename, 'rb') do |f|
+						f.read
+					end
+					# Old wrapper scripts reference $HOME which causes
+					# things to blow up when run by a different user.
+					if contents.include?("$HOME")
+						filename = nil
+					end
+				else
+					filename = nil
+				end
+				if filename
+					return filename
+				else
+					STDERR.puts "Your RVM wrapper scripts are too old. Please " +
+						"update them first by running 'rvm update --head && " +
+						"rvm reload && rvm repair all'."
+					exit 1
+				end
 			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 " +
+				STDERR.puts "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."
+				exit 1
 			end
 		else
 			return ruby_executable
@@ -131,7 +152,8 @@ module PlatformInfo
 	
 	# Returns whether the current Ruby interpreter is managed by RVM.
 	def self.in_rvm?
-		return Config::CONFIG['bindir'].include?('/.rvm/')
+		bindir = Config::CONFIG['bindir']
+		return bindir.include?('/.rvm/') || bindir.include?('/rvm/')
 	end
 	
 	# If the current Ruby interpreter is managed by RVM, returns the
@@ -144,8 +166,16 @@ module PlatformInfo
 				path = File.expand_path(path)
 				return path if File.directory?(path)
 			end
+			# Failure to locate the RVM path is probably caused by the
+			# user customizing $rvm_path. Older RVM versions don't
+			# export $rvm_path, making us unable to detect its value.
+			STDERR.puts "Unable to locate the RVM path. Your RVM installation " +
+				"is probably too old. Please update it with " +
+				"'rvm update --head && rvm reload && rvm repair all'."
+			exit 1
+		else
+			return nil
 		end
-		return nil
 	end
 	memoize :rvm_path
 	
@@ -189,8 +219,9 @@ module PlatformInfo
 			# 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 " +
+			STDERR.puts "Unable to autodetect the currently active RVM gem " +
 				"set name. Please contact this program's author for support."
+			exit 1
 		end
 		return nil
 	end

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -76,7 +76,7 @@ protected
 	def dependencies
 		result = [
 			Dependencies::GCC,
-			Dependencies::Make,
+			Dependencies::GnuMake,
 			Dependencies::DownloadTool,
 			Dependencies::Ruby_DevHeaders,
 			Dependencies::Ruby_OpenSSL,
@@ -427,6 +427,7 @@ private
 	end
 	
 	def install_nginx_from_source(source_dir)
+		require 'phusion_passenger/platform_info/compiler'
 		Dir.chdir(source_dir) do
 			command = "sh ./configure '--prefix=#{@nginx_dir}' --without-pcre " <<
 				"--without-http_rewrite_module " <<
@@ -437,8 +438,8 @@ private
 			end
 			
 			backlog = ""
-			total_lines = `make --dry-run`.split("\n").size
-			IO.popen("make 2>&1", "r") do |io|
+			total_lines = `#{PlatformInfo.gnu_make} --dry-run`.split("\n").size
+			IO.popen("#{PlatformInfo.gnu_make} 2>&1", "r") do |io|
 				progress = 1
 				while !io.eof?
 					line = io.readline
@@ -454,7 +455,7 @@ private
 				exit 1
 			end
 			
-			command = "make install"
+			command = "#{PlatformInfo.gnu_make} install"
 			run_command_with_throbber(command, "Copying files...") do |status_text|
 				yield(1, 1, status_text)
 			end

data/lib/phusion_passenger/utils.rb

@@ -192,9 +192,31 @@ protected
 	# This function may modify +options+. The modified options are to be
 	# passed to the request handler.
 	def prepare_app_process(startup_file, options)
+		options["app_root"] = canonicalize_path(options["app_root"])
 		Dir.chdir(options["app_root"])
 		
 		lower_privilege(startup_file, options)
+		path, is_parent = check_directory_tree_permissions(options["app_root"])
+		if path
+			username = Etc.getpwuid(Process.euid).name
+			groupname = Etc.getgrgid(Process.egid).name
+			message = "This application process is currently running as " +
+				"user '#{username}' and group '#{groupname}' and must be " +
+				"able to access its application root directory " +
+				"'#{options["app_root"]}'. "
+			if is_parent
+				message << "However the parent directory '#{path}' " +
+					"has wrong permissions, thereby preventing " +
+					"this process from accessing its application " +
+					"root directory. Please fix the permissions " +
+					"of the directory '#{path}' first."
+			else
+				message << "However this directory is not accessible " +
+					"because it has wrong permissions. Please fix " +
+					"these permissions first."
+			end
+			raise(message)
+		end
 		
 		ENV["RAILS_ENV"] = ENV["RACK_ENV"] = options["environment"]
 		
@@ -316,7 +338,7 @@ protected
 		
 		# !!! NOTE !!!
 		# If the app is using Bundler then any dependencies required past this
-		# point must be specified in the Gemfile. Like ruby-debug in debugging is on...
+		# point must be specified in the Gemfile. Like ruby-debug if debugging is on...
 		
 		if options["debugger"]
 			require 'ruby-debug'
@@ -710,6 +732,45 @@ protected
 		ENV['HOME'] = user_info.dir
 	end
 	
+	# Checks the permissions of all parent directories of +dir+ as
+	# well as +dir+ itself.
+	#
+	# +dir+ must be a canonical path.
+	#
+	# If one of the parent directories has wrong permissions, causing
+	# +dir+ to be inaccessible by the current process, then this function
+	# returns [path, true] where +path+ is the path of the top-most
+	# directory with wrong permissions.
+	# 
+	# If +dir+ itself is not executable by the current process then
+	# this function returns [dir, false].
+	#
+	# Otherwise, nil is returned.
+	def check_directory_tree_permissions(dir)
+		components = dir.split("/")
+		components.shift
+		i = 0
+		# We can't use File.readable() and friends here because they
+		# don't always work right with ACLs. Instead of we use 'real'
+		# checks.
+		while i < components.size
+			path = "/" + components[0..i].join("/")
+			begin
+				File.stat(path)
+			rescue Errno::EACCES
+				return [File.dirname(path), true]
+			end
+			i += 1
+		end
+		begin
+			Dir.chdir(dir) do
+				return nil
+			end
+		rescue Errno::EACCES
+			return [dir, false]
+		end
+	end
+	
 	# Returns a string which reports the backtraces for all threads,
 	# or if that's not supported the backtrace for the current thread.
 	def global_backtrace_report

data/test/ruby/utils_spec.rb

@@ -680,6 +680,68 @@ describe Utils do
 		end
 	end
 	
+	describe "#check_directory_tree_permissions" do
+		before :each do
+			@root = PhusionPassenger::Utils.passenger_tmpdir
+		end
+		
+		def primary_group_for(username)
+			gid = Etc.getpwnam(username).gid
+			return Etc.getgrgid(gid).name
+		end
+		
+		it "raises an error for the top-most parent directory that has wrong permissions" do
+			FileUtils.mkdir_p("#{@root}/a/b/c/d")
+			
+			when_running_as_root do
+				user = CONFIG['normal_user_1']
+				group = primary_group_for(user)
+				system("chown -R #{user} #{@root}/a")
+				system("chgrp -R #{group} #{@root}/a")
+				
+				output = run_script(%q{
+					require 'phusion_passenger/utils'
+					include PhusionPassenger::Utils
+					@root = ARGV[0]
+					lower_privilege(nil,
+						"user" => ARGV[1],
+						"group" => ARGV[2])
+					
+					File.chmod(0600, "#{@root}/a/b/c/d")
+					File.chmod(0600, "#{@root}/a/b/c")
+					File.chmod(0600, "#{@root}/a")
+					p check_directory_tree_permissions("#{@root}/a/b/c/d")
+					File.chmod(0700, "#{@root}/a")
+					p check_directory_tree_permissions("#{@root}/a/b/c/d")
+					File.chmod(0700, "#{@root}/a/b/c")
+					p check_directory_tree_permissions("#{@root}/a/b/c/d")
+					File.chmod(0700, "#{@root}/a/b/c/d")
+					p check_directory_tree_permissions("#{@root}/a/b/c/d")
+				}, @root, user, group)
+				lines = output.split("\n")
+				lines[0].should == ["#{@root}/a", true].inspect
+				lines[1].should == ["#{@root}/a/b/c", true].inspect
+				lines[2].should == ["#{@root}/a/b/c/d", false].inspect
+				lines[3].should == "nil"
+			end
+			when_not_running_as_root do
+				File.chmod(0000, "#{@root}/a/b/c/d")
+				File.chmod(0600, "#{@root}/a/b/c")
+				File.chmod(0600, "#{@root}/a")
+				check_directory_tree_permissions("#{@root}/a/b/c/d").should ==
+					["#{@root}/a", true]
+				File.chmod(0700, "#{@root}/a")
+				check_directory_tree_permissions("#{@root}/a/b/c/d").should ==
+					["#{@root}/a/b/c", true]
+				File.chmod(0700, "#{@root}/a/b/c")
+				check_directory_tree_permissions("#{@root}/a/b/c/d").should ==
+					["#{@root}/a/b/c/d", false]
+				File.chmod(0700, "#{@root}/a/b/c/d")
+				check_directory_tree_permissions("#{@root}/a/b/c/d").should be_nil
+			end
+		end
+	end
+	
 	######################
 end
 

data/test/support/test_helper.rb

@@ -255,6 +255,8 @@ module TestHelper
 		end
 	end
 	
+	alias when_running_as_root when_user_switching_possible
+	
 	def when_not_running_as_root
 		if Process.euid != 0
 			yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: -1876988207
+  hash: -1876988210
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - pre2
-  version: 3.0.0.pre2
+  - pre3
+  version: 3.0.0.pre3
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +02:00
+date: 2010-09-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -735,168 +735,6 @@ 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
@@ -1693,8 +1531,8 @@ files:
 - ext/oxt/detail/spin_lock_pthreads.hpp
 - ext/oxt/detail/tracable_exception_disabled.hpp
 - ext/oxt/detail/tracable_exception_enabled.hpp
-- ext/phusion_passenger/native_support.c
-- ext/phusion_passenger/extconf.rb
+- ext/ruby/passenger_native_support.c
+- ext/ruby/extconf.rb
 - misc/copy_boost_headers.rb
 - misc/find_owner_pipe_leaks.rb
 - misc/render_error_pages.rb