Imported Upstream version 2.1.1.20080309

.gitignore

@@ -1,23 +1,26 @@
 references
 scgi_demo
-test*.rb
+/test*.rb
 
 *.o
 *.so
+*.bundle
 *.pyc
 ext/apache2/*.la
 ext/apache2/*.lo
 ext/apache2/*.slo
 ext/apache2/.libs
 ext/apache2/ApplicationPoolServerExecutable
-ext/passenger/Makefile
-ext/boost/src/*.a
+ext/phusion_passenger/Makefile
+ext/*.a
 doc/rdoc
 doc/cxxapi
 doc/*.html
+test/test.log
 test/Apache2ModuleTests
 test/config.yml
 test/coverage
+test/oxt/oxt_test_main
 test/stub/railsapp/app/controllers/bar_controller.rb
 test/stub/*/log/*
 test/stub/apache2/*.log

DEVELOPERS.TXT

@@ -5,7 +5,7 @@
 The tests need the following software installed:
 
 * All the usual Phusion Passenger dependencies.
-* Ruby on Rails >= 2.0.1
+* Ruby on Rails 2.0.1 (*exactly* 2.0.1)
 * rspec >= 1.1.2
 * mime-types >= 1.15
 
@@ -27,9 +27,9 @@ Run the following command to compile everything:
 == Directory structure
 
 The most important directories are:
-[ lib/passenger ]
+[ lib/phusion_passenger ]
   The source code for the spawn server, which is written in Ruby.
-[ ext/passenger ]
+[ ext/phusion_passenger ]
   Native extensions for Ruby, used by the spawn server.
 [ ext/apache2 ]
   The Phusion Passenger Apache 2 module (mod_passenger).
@@ -48,7 +48,13 @@ Less important directories:
 [ lib/rake ]
   Rake tasks.
 [ ext/boost ]
-  A vendor copy of the Boost C++ library (www.boost.org).
+  A stripped-down and customized version of the Boost C++ library
+  (www.boost.org).
+[ ext/oxt ]
+  The "OS eXtensions for boosT" library, which provides various important
+  functionality necessary for writing robust server software. It provides
+  things like support for interruptable system calls and portable backtraces
+  for C++. Boost was modified to make use of the functionality provided by OXT.
 [ benchmark ]
   Benchmark tools.
 [ misc ]

LICENSE

@@ -2,7 +2,7 @@ Phusion Passenger is licensed under the GNU General Public License (GPL)
 version 2, and *only* version 2 (i.e. not version 3 or any later versions).
 
 In addition to the GNU General Public License v2 licensing terms, we explicitly
-grand you the permission to run any application on top of Phusion Passenger,
+grant you the permission to run any application on top of Phusion Passenger,
 regardless of the application's own licensing terms. The application will not
 be bound to the terms of the GPL in any way. That is, the GPL only applies to
 Phusion Passenger itself, and not to applications that are run through Phusion