0
@@ -8,7 +8,7 @@ ext/apache2/*.la
0
 ext/apache2/*.lo
0
 ext/apache2/*.slo
0
 ext/apache2/.libs
0
-ext/mod_rails/Makefile
0
+ext/passenger/Makefile
0
 ext/boost/src/*.a
0
 doc/rdoc
0
 doc/cxxapi

0
@@ -5,7 +5,7 @@ require 'rake/rdoctask'
0
 require 'rake/gempackagetask'
0
 require 'rake/extensions'
0
 require 'rake/cplusplus'
0
-require 'mod_rails/platform_info'
0
+require 'passenger/platform_info'
0
 
0
 ##### Configuration
0
 
0
@@ -39,7 +39,7 @@ task :clobber
0
 
0
 ##### Ruby C extension
0
 
0
-subdir 'ext/mod_rails' do
0
+subdir 'ext/passenger' do
0
   task :native_support => ["native_support.#{LIBEXT}"]
0
   
0
   file 'Makefile' => 'extconf.rb' do
0
@@ -271,7 +271,7 @@ end
0
 Rake::RDocTask.new do |rd|
0
   rd.main = "README"
0
   rd.rdoc_dir = "doc/rdoc"
0
-	rd.rdoc_files.include("README", "lib/mod_rails/*.rb", "lib/rake/extensions.rb", "ext/mod_rails/*.c")
0
+	rd.rdoc_files.include("README", "lib/passenger/*.rb", "lib/rake/extensions.rb", "ext/passenger/*.c")
0
   rd.template = "./doc/template/horo"
0
   rd.title = "Passenger Ruby API"
0
   rd.options << "-S" << "-N" << "-p" << "-H"
0
@@ -292,7 +292,7 @@ spec = Gem::Specification.new do |s|
0
   s.add_dependency 'fastthread', '>= 1.0.1'
0
   s.add_dependency 'rspec', '>= 1.1.2'
0
   s.add_dependency 'rails', '>= 1.2.0'
0
-	s.extensions << 'ext/mod_rails/extconf.rb'
0
+	s.extensions << 'ext/passenger/extconf.rb'
0
   s.files = FileList[
0
     'Rakefile',
0
     'README',
0
@@ -307,7 +307,7 @@ spec = Gem::Specification.new do |s|
0
     'ext/apache2/*.{cpp,h,c}',
0
     'ext/boost/*.{hpp,TXT}',
0
     'ext/boost/**/*.{hpp,cpp,pl,inl}',
0
-		'ext/mod_rails/*.{c,rb}',
0
+		'ext/passenger/*.{c,rb}',
0
     'benchmark/*.{cpp,rb}',
0
     'test/*.{rb,cpp,example}',
0
     'test/support/*',
0
@@ -360,10 +360,10 @@ task :sloccount do
0
     end
0
     sh "sloccount", *Dir[
0
       "#{tmpdir}/*",
0
-			"lib/mod_rails/*",
0
+			"lib/passenger/*",
0
       "lib/rake/{cplusplus,extensions}.rb",
0
       "ext/apache2",
0
-			"ext/mod_rails/*.c",
0
+			"ext/passenger/*.c",
0
       "test/*.{cpp,rb}",
0
       "test/support/*.rb",
0
       "test/stub/*.rb",

0
@@ -3,7 +3,7 @@ PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
0
 PASSENGER_WEBSITE = "http://passenger.phusion.nl/"
0
 PHUSION_WEBSITE = "www.phusion.nl"
0
 $LOAD_PATH.unshift("#{PASSENGER_ROOT}/lib")
0
-require 'mod_rails/platform_info'
0
+require 'passenger/platform_info'
0
 Dir.chdir(PASSENGER_ROOT)
0
 include PlatformInfo
0
 

0
@@ -1,7 +1,7 @@
0
 #!/usr/bin/env ruby
0
 require 'pathname'
0
 $LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib"))
0
-require 'mod_rails/spawn_manager'
0
+require 'passenger/spawn_manager'
0
 
0
 $0 = "Passenger spawn server"
0
 spawn_manager = Passenger::SpawnManager.new

0
@@ -2,7 +2,7 @@
0
 #define _PASSENGER_DUMMY_SPAWN_MANAGER_H_
0
 
0
 // TODO: make this path not hardcoded
0
-#define DUMMY_REQUEST_HANDLER_EXECUTABLE "/home/hongli/Projects/mod_rails/benchmark/DummyRequestHandler"
0
+#define DUMMY_REQUEST_HANDLER_EXECUTABLE "/home/hongli/Projects/passenger/benchmark/DummyRequestHandler"
0
 
0
 #include <string>
0
 

0
@@ -315,13 +315,13 @@ public:
0
     const char *railsDir = determineRailsDir(r, railsBaseURI);
0
     if (railsDir == NULL) {
0
       ap_set_content_type(r, "text/html; charset=UTF-8");
0
-			ap_rputs("<h1>mod_rails error #1</h1>\n", r);
0
+			ap_rputs("<h1>Passenger error #1</h1>\n", r);
0
       ap_rputs("Cannot determine the location of the Rails application's \"public\" directory.", r);
0
       return OK;
0
     } else if (!verifyRailsDir(r->pool, railsDir)) {
0
       ap_set_content_type(r, "text/html; charset=UTF-8");
0
-			ap_rputs("<h1>mod_rails error #2</h1>\n", r);
0
-			ap_rputs("mod_rails thinks that the Rails application's \"public\" directory is \"", r);
0
+			ap_rputs("<h1>Passenger error #2</h1>\n", r);
0
+			ap_rputs("Passenger thinks that the Rails application's \"public\" directory is \"", r);
0
       ap_rputs(ap_escape_html(r->pool, railsDir), r);
0
       ap_rputs("\", but it doesn't seem to be valid.", r);
0
       return OK;
0
@@ -402,7 +402,7 @@ public:
0
          *
0
          * Incidentally, this also disables mod_rewrite. That is a
0
          * good thing because the default Rails .htaccess file
0
-				 * interferes with mod_rails anyway (it delegates requests
0
+				 * interferes with Passenger anyway (it delegates requests
0
          * to the CGI script dispatch.cgi).
0
          */
0
         return OK;

0
@@ -1,7 +1,7 @@
0
 require 'socket'
0
 require 'timeout'
0
-require 'mod_rails/message_channel'
0
-require 'mod_rails/utils'
0
+require 'passenger/message_channel'
0
+require 'passenger/utils'
0
 module Passenger
0
 
0
 # An abstract base class for a server, with the following properties:

0
@@ -1,9 +1,9 @@
0
 require 'socket'
0
 require 'etc'
0
-require 'mod_rails/abstract_server'
0
-require 'mod_rails/application'
0
-require 'mod_rails/utils'
0
-require 'mod_rails/request_handler'
0
+require 'passenger/abstract_server'
0
+require 'passenger/application'
0
+require 'passenger/utils'
0
+require 'passenger/request_handler'
0
 module Passenger
0
 
0
 # Raised when an ApplicationSpawner, FrameworkSpawner or SpawnManager is

0
@@ -1,9 +1,9 @@
0
 require 'rubygems'
0
 require 'socket'
0
 require 'pathname'
0
-require 'mod_rails/abstract_server'
0
-require 'mod_rails/application_spawner'
0
-require 'mod_rails/utils'
0
+require 'passenger/abstract_server'
0
+require 'passenger/application_spawner'
0
+require 'passenger/utils'
0
 module Passenger
0
 
0
 # TODO: check whether Rails version is supported

0
@@ -1,4 +1,4 @@
0
-require 'mod_rails/utils'
0
+require 'passenger/utils'
0
 module Passenger
0
 
0
 # This class provides convenience methods for:

0
@@ -1,8 +1,8 @@
0
 require 'socket'
0
 require 'base64'
0
-require 'mod_rails/message_channel'
0
-require 'mod_rails/cgi_fixed'
0
-require 'mod_rails/utils'
0
+require 'passenger/message_channel'
0
+require 'passenger/cgi_fixed'
0
+require 'passenger/utils'
0
 
0
 module Passenger
0
 

0
@@ -1,8 +1,8 @@
0
-require 'mod_rails/abstract_server'
0
-require 'mod_rails/framework_spawner'
0
-require 'mod_rails/application'
0
-require 'mod_rails/message_channel'
0
-require 'mod_rails/utils'
0
+require 'passenger/abstract_server'
0
+require 'passenger/framework_spawner'
0
+require 'passenger/application'
0
+require 'passenger/message_channel'
0
+require 'passenger/utils'
0
 module Passenger
0
 
0
 class SpawnManager < AbstractServer

0
@@ -4,7 +4,7 @@ require 'etc'
0
 require 'thread'
0
 require 'fastthread'
0
 require 'timeout'
0
-require File.expand_path("#{File.dirname(__FILE__)}/../../ext/mod_rails/native_support.so")
0
+require File.expand_path("#{File.dirname(__FILE__)}/../../ext/passenger/native_support.so")
0
 
0
 module Passenger
0
 

0
@@ -1,5 +1,5 @@
0
 require 'support/config'
0
-require 'mod_rails/application_spawner'
0
+require 'passenger/application_spawner'
0
 require 'minimal_spawner_spec'
0
 require 'spawn_server_spec'
0
 require 'spawner_privilege_lowering_spec'

0
@@ -1,5 +1,5 @@
0
 require 'support/config'
0
-require 'mod_rails/application'
0
+require 'passenger/application'
0
 include Passenger
0
 
0
 describe Application do

0
@@ -1,5 +1,5 @@
0
 require 'support/config'
0
-require 'mod_rails/framework_spawner'
0
+require 'passenger/framework_spawner'
0
 require 'minimal_spawner_spec'
0
 require 'spawn_server_spec'
0
 require 'spawner_privilege_lowering_spec'

0
@@ -4,7 +4,7 @@ require 'resolv'
0
 require 'timeout'
0
 require 'support/config'
0
 require 'support/apache2_config_writer'
0
-require 'mod_rails/platform_info'
0
+require 'passenger/platform_info'
0
 
0
 include PlatformInfo
0
 

0
@@ -1,7 +1,7 @@
0
 require 'socket'
0
 require 'support/config'
0
-require 'mod_rails/message_channel'
0
-require 'mod_rails/utils'
0
+require 'passenger/message_channel'
0
+require 'passenger/utils'
0
 include Passenger
0
 
0
 describe MessageChannel do

0
@@ -1,7 +1,7 @@
0
 require 'support/config'
0
-require 'mod_rails/spawn_manager'
0
-require 'mod_rails/message_channel'
0
-require 'mod_rails/utils'
0
+require 'passenger/spawn_manager'
0
+require 'passenger/message_channel'
0
+require 'passenger/utils'
0
 require 'abstract_server_spec'
0
 require 'minimal_spawner_spec'
0
 require 'spawner_privilege_lowering_spec'

0
@@ -1,6 +1,6 @@
0
 #!/usr/bin/env ruby
0
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
0
-require 'mod_rails/message_channel'
0
+require 'passenger/message_channel'
0
 
0
 include Passenger
0
 reader = MessageChannel.new(STDIN)

0
@@ -1,6 +1,6 @@
0
 #!/usr/bin/env ruby
0
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
0
-require 'mod_rails/message_channel'
0
+require 'passenger/message_channel'
0
 
0
 include Passenger
0
 reader = MessageChannel.new(STDIN)

0
@@ -1,6 +1,6 @@
0
 #!/usr/bin/env ruby
0
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
0
-require 'mod_rails/message_channel'
0
+require 'passenger/message_channel'
0
 
0
 include Passenger
0
 channel = MessageChannel.new(IO.new(3))

0
@@ -1,6 +1,6 @@
0
 #!/usr/bin/env ruby
0
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
0
-require 'mod_rails/spawn_manager'
0
+require 'passenger/spawn_manager'
0
 
0
 include Passenger
0
 class SpawnManager

0
@@ -1,5 +1,5 @@
0
 require 'erb'
0
-require 'mod_rails/platform_info'
0
+require 'passenger/platform_info'
0
 
0
 class Apache2ConfigWriter
0
   include PlatformInfo