passenger 2.1.3 → 2.2.0

data/DEVELOPERS.TXT

@@ -8,6 +8,8 @@ The tests need the following software installed:
 * Ruby on Rails 2.0.1 (*exactly* 2.0.1)
 * rspec >= 1.1.2
 * mime-types >= 1.15
+* daemon_controller (only for running the Nginx integration test). Install
+  with: gem install FooBarWidget-daemon_controller -s http://gems.github.com
 
 The following software is optional:
 

data/INSTALL

@@ -1,4 +1,6 @@
 Please read the file README for installation instructions.
 
 If you're having trouble installing Phusion Passenger, please
-read the file 'doc/Users guide.html'.
+read the file 'doc/Users guide Apache.html' or 'doc/Users guide Nginx.html',
+depending on whether you want to install Phusion Passenger for Apache or for
+Nginx.

data/LICENSE

@@ -1,355 +1,19 @@
-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
-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
-Passenger.
-
-We also explicitly allow Apache to load the Phusion Passenger Apache module,
-without Apache or any other loaded modules needing to be released under the
-terms of the GPL.
-
-----------------------------------------------------------------------
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-
+Copyright (c) 2008, 2009 Phusion
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/NEWS

@@ -0,0 +1,3 @@
+- Passenger no longer resolves symlink anymore, so that it works properly
+  with Capistrano deployments.
+- Chuncked transfer encoding support for uploads (Apache only).

data/README

@@ -7,17 +7,24 @@ to http://www.modrails.com/ for general information.
 
 === Regular installation
 
-Run the following script as root:
+You can install either Phusion Passenger for Apache or for Nginx. Run either of
+the following programs as root:
 
  ./bin/passenger-install-apache2-module
 
+-OR-
+
+ ./bin/passenger-install-nginx-module
+
 That's it. :)
 
-For troubleshooting, configuration and tips, please read the Users Guide:
+For troubleshooting, configuration and tips, please read the corresponding
+Users Guide:
 
- doc/Users guide.html
+ doc/Users guide Apache.html
+ doc/Users guide Nginx.html
 
-This file is included in the source tarball, and may also be viewed online on
+These files are included in the source tarball, and may also be viewed online on
 our website.
 
 === Installing via a gem

data/Rakefile

@@ -19,34 +19,39 @@
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/lib")
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/misc")
 require 'rubygems'
+require 'pathname'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/extensions'
 require 'rake/cplusplus'
 require 'phusion_passenger/platform_info'
+require 'phusion_passenger/constants'
 
 verbose true
 
 ##### Configuration
 
-# Don't forget to edit Configuration.h too
-PACKAGE_VERSION = "2.1.3"
+PACKAGE_VERSION = PhusionPassenger::VERSION_STRING
 OPTIMIZE = ["yes", "on", "true"].include?(ENV['OPTIMIZE'])
 
-PlatformInfo.apxs2.nil? and raise "Could not find 'apxs' or 'apxs2'."
-PlatformInfo.apache2ctl.nil? and raise "Could not find 'apachectl' or 'apache2ctl'."
-PlatformInfo.httpd.nil? and raise "Could not find the Apache web server binary."
+include PlatformInfo
 
 CXX = "g++"
 LIBEXT = PlatformInfo.library_extension
-# _GLIBCPP__PTHREADS is for fixing Boost compilation on OpenBSD.
 if OPTIMIZE
 	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS"
 else
 	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
 end
-CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}"
-EXTRA_LDFLAGS = ""
+
+# Extra compiler flags that should always be passed to the C/C++ compiler.
+# Should be included last in the command string.
+EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}"
+
+# Extra linker flags that should always be passed to the linker.
+# Should be included last in the command string.
+EXTRA_LDFLAGS  = ""
+
 
 #### Default tasks
 
@@ -54,9 +59,9 @@ desc "Build everything"
 task :default => [
 	:native_support,
 	:apache2,
+	:nginx,
 	'test/oxt/oxt_test_main',
-	'test/Apache2ModuleTests',
-	'benchmark/DummyRequestHandler'
+	'test/CxxTests'
 ]
 
 desc "Remove compiled files"
@@ -86,294 +91,484 @@ subdir 'ext/phusion_passenger' do
 end
 
 
-##### boost::thread and OXT static library
-
-file 'ext/libboost_oxt.a' =>
-	Dir['ext/boost/src/*.cpp'] +
-	Dir['ext/boost/src/pthread/*.cpp'] +
-	Dir['ext/oxt/*.cpp'] +
-	Dir['ext/oxt/*.hpp'] +
-	Dir['ext/oxt/detail/*.hpp'] do
-	Dir.chdir('ext/boost/src') do
-		puts "### In ext/boost/src:"
-		flags = "-I../.. #{CXXFLAGS} #{PlatformInfo.apache2_module_cflags}"
-		compile_cxx "*.cpp", flags
-		# NOTE: 'compile_cxx "pthread/*.cpp", flags' doesn't work on some systems,
-		# so we do this instead.
-		Dir['pthread/*.cpp'].each do |file|
-			compile_cxx file, flags
+##### Boost and OXT static library
+
+def define_libboost_oxt_task(output_dir, extra_compiler_flags = nil)
+	output_file = "#{output_dir}/libboost_oxt.a"
+	objects_output_dir = "#{output_dir}/libboost_oxt"
+	objects_output_path = Pathname.new(objects_output_dir).expand_path
+	ext_path = Pathname.new("ext").expand_path
+	
+	file(output_file =>
+		Dir['ext/boost/src/*.cpp'] +
+		Dir['ext/boost/src/pthread/*.cpp'] +
+		Dir['ext/oxt/*.cpp'] +
+		Dir['ext/oxt/*.hpp'] +
+		Dir['ext/oxt/detail/*.hpp']
+	) do
+		sh "mkdir -p #{objects_output_dir}/boost #{objects_output_dir}/oxt"
+		
+		Dir.chdir("#{objects_output_dir}/boost") do
+			puts "### In #{objects_output_dir}/boost:"
+			current_dir = Pathname.new(".").expand_path
+			ext_dir = ext_path.relative_path_from(current_dir)
+			flags = "-I#{ext_dir} #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+			
+			# Compling "pthread/*.cpp" doesn't work on some systems,
+			# so we compile each cpp file invidually instead.
+			Dir["#{ext_dir}/boost/src/pthread/*.cpp"].each do |file|
+				compile_cxx(file, flags)
+			end
+			puts
 		end
-	end
-	Dir.chdir('ext/oxt') do
-		puts "### In ext/oxt:"
-		Dir['*.cpp'].each do |file|
-			compile_cxx file, "-I.. #{CXXFLAGS} #{PlatformInfo.apache2_module_cflags}"
+		
+		Dir.chdir("#{objects_output_dir}/oxt") do
+			puts "### In #{objects_output_dir}/oxt:"
+			current_dir = Pathname.new(".").expand_path
+			ext_dir = ext_path.relative_path_from(current_dir)
+			flags = "-I#{ext_dir} #{extra_compiler_flags} #{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+			Dir["#{ext_dir}/oxt/*.cpp"].each do |file|
+				compile_cxx(file, flags)
+			end
+			puts
 		end
+		
+		create_static_library(output_file,
+			"#{objects_output_dir}/boost/*.o " <<
+			"#{objects_output_dir}/oxt/*.o")
 	end
-	create_static_library "ext/libboost_oxt.a", "ext/boost/src/*.o ext/oxt/*.o"
-end
-
-task :clean do
-	sh "rm -f ext/libboost_oxt.a ext/boost/src/*.o ext/oxt/*.o"
+	
+	task :clean do
+		sh "rm -rf #{output_file} #{objects_output_dir}"
+	end
+	
+	return output_file
 end
 
 
-##### Apache module
-
-class APACHE2
-	CXXFLAGS = "-I.. #{CXXFLAGS} #{PlatformInfo.apache2_module_cflags}"
-	OBJECTS = {
-		'Configuration.o' => %w(Configuration.cpp Configuration.h),
-		'Bucket.o' => %w(Bucket.cpp Bucket.h),
-		'Hooks.o' => %w(Hooks.cpp Hooks.h
-				Configuration.h ApplicationPool.h ApplicationPoolServer.h
-				SpawnManager.h Exceptions.h Application.h MessageChannel.h
-				PoolOptions.h Utils.h DirectoryMapper.h FileChecker.h),
-		'Utils.o'   => %w(Utils.cpp Utils.h),
-		'Logging.o' => %w(Logging.cpp Logging.h),
-		'SystemTime.o' => %w(SystemTime.cpp SystemTime.h),
-		'CachedFileStat.o' => %w(CachedFileStat.cpp CachedFileStat.h)
-	}
+##### Static library for Passenger source files that are shared between
+##### the Apache module and the Nginx helper server.
+
+def define_common_library_task(output_dir, extra_compiler_flags = nil,
+                               with_application_pool_server_exe = false,
+                               boost_oxt_library = nil,
+                               extra_compiler_flags_for_server_exe = nil,
+                               extra_linker_flags = nil)
+	static_library = "#{output_dir}/libpassenger_common.a"
+	objects_output_dir = "#{output_dir}/libpassenger_common"
+	objects_output_path = Pathname.new(objects_output_dir).expand_path
+	ext_path = Pathname.new("ext").expand_path
+	targets = [static_library]
+	
+	file(static_library => [
+		'ext/common/Utils.h',
+		'ext/common/Utils.cpp',
+		'ext/common/Logging.h',
+		'ext/common/Logging.cpp',
+		'ext/common/SystemTime.h',
+		'ext/common/SystemTime.cpp',
+		'ext/common/CachedFileStat.h',
+		'ext/common/CachedFileStat.cpp'
+	]) do
+		sh "mkdir -p #{objects_output_dir}"
+		
+		Dir.chdir(objects_output_dir) do
+			puts "### In #{objects_output_dir}:"
+			current_dir = Pathname.new(".").expand_path
+			ext_dir = ext_path.relative_path_from(current_dir)
+			flags =  "-I#{ext_dir} -I#{ext_dir}/common #{extra_compiler_flags} "
+			flags << "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+			
+			compile_cxx("#{ext_dir}/common/Utils.cpp", flags)
+			compile_cxx("#{ext_dir}/common/Logging.cpp", flags)
+			compile_cxx("#{ext_dir}/common/SystemTime.cpp", flags)
+			compile_cxx("#{ext_dir}/common/CachedFileStat.cpp", flags)
+			
+			puts
+		end
+		
+		create_static_library(static_library, "#{objects_output_dir}/*.o")
+	end
+	
+	if with_application_pool_server_exe
+		exe_file = "#{output_dir}/ApplicationPoolServerExecutable"
+		targets << exe_file
+		
+		file(exe_file => [
+			'ext/common/ApplicationPoolServerExecutable.cpp',
+			'ext/common/ApplicationPool.h',
+			'ext/common/Application.h',
+			'ext/common/StandardApplicationPool.h',
+			'ext/common/MessageChannel.h',
+			'ext/common/SpawnManager.h',
+			'ext/common/PoolOptions.h',
+			'ext/common/FileChecker.h',
+			'ext/common/SystemTime.h',
+			'ext/common/CachedFileStat.h',
+			boost_oxt_library,
+			static_library
+		]) do
+			create_executable(exe_file,
+				"ext/common/ApplicationPoolServerExecutable.cpp",
+				"-Iext -Iext/common " <<
+				"#{extra_compiler_flags_for_server_exe} " <<
+				"#{extra_compiler_flags} " <<
+				"#{PlatformInfo.portability_cflags} " <<
+				"#{EXTRA_CXXFLAGS} " <<
+				"#{static_library} " <<
+				"#{boost_oxt_library} " <<
+				"#{extra_linker_flags} " <<
+				"#{PlatformInfo.portability_ldflags} " <<
+				EXTRA_LDFLAGS
+			)
+		end
+	end
+	
+	task :clean do
+		sh "rm -rf #{targets.join(' ')} #{objects_output_dir}"
+	end
+	
+	return targets
 end
 
-subdir 'ext/apache2' do
-	apxs_objects = APACHE2::OBJECTS.keys.join(',')
 
-	desc "Build mod_passenger Apache 2 module"
-	task :apache2 => ['mod_passenger.so', 'ApplicationPoolServerExecutable', :native_support]
-	
-	file 'mod_passenger.so' => [
-		'../libboost_oxt.a',
-		'mod_passenger.o'
-	] + APACHE2::OBJECTS.keys do
+##### Apache 2 module
+
+	APACHE2_CXXFLAGS = "-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
+		"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
+	APACHE2_INPUT_FILES = {
+		'ext/apache2/Configuration.o' => %w(
+			ext/apache2/Configuration.cpp
+			ext/apache2/Configuration.h),
+		'ext/apache2/Bucket.o' => %w(
+			ext/apache2/Bucket.cpp
+			ext/apache2/Bucket.h),
+		'ext/apache2/Hooks.o' => %w(
+			ext/apache2/Hooks.cpp
+			ext/apache2/Hooks.h
+			ext/apache2/Configuration.h
+			ext/apache2/Bucket.h
+			ext/apache2/DirectoryMapper.h
+			ext/common/ApplicationPool.h
+			ext/common/ApplicationPoolServer.h
+			ext/common/SpawnManager.h
+			ext/common/Exceptions.h
+			ext/common/Application.h
+			ext/common/MessageChannel.h
+			ext/common/PoolOptions.h
+			ext/common/Utils.h)
+	}
+	APACHE2_OBJECTS = APACHE2_INPUT_FILES.keys
+	
+	# NOTE: APACHE2_BOOST_OXT_LIBRARY is a task name, while APACHE2_COMMON_LIBRARY
+	# is an array of task names.
+	APACHE2_BOOST_OXT_LIBRARY = define_libboost_oxt_task("ext/apache2",
+		PlatformInfo.apache2_module_cflags)
+	APACHE2_COMMON_LIBRARY    = define_common_library_task("ext/apache2",
+		PlatformInfo.apache2_module_cflags,
+		true, APACHE2_BOOST_OXT_LIBRARY, nil,
+		PlatformInfo.apache2_module_ldflags)
+	
+	
+	desc "Build Apache 2 module"
+	task :apache2 => ['ext/apache2/mod_passenger.so', :native_support]
+	
+	mod_passenger_dependencies = [APACHE2_COMMON_LIBRARY,
+		APACHE2_BOOST_OXT_LIBRARY,
+		'ext/apache2/mod_passenger.o',
+		APACHE2_OBJECTS].flatten
+	file 'ext/apache2/mod_passenger.so' => mod_passenger_dependencies do
+		PlatformInfo.apxs2.nil?      and raise "Could not find 'apxs' or 'apxs2'."
+		PlatformInfo.apache2ctl.nil? and raise "Could not find 'apachectl' or 'apache2ctl'."
+		PlatformInfo.httpd.nil?      and raise "Could not find the Apache web server binary."
+		
 		# apxs totally sucks. We couldn't get it working correctly
 		# on MacOS X (it had various problems with building universal
 		# binaries), so we decided to ditch it and build/install the
 		# Apache module ourselves.
 		#
 		# Oh, and libtool sucks too. Do we even need it anymore in 2008?
-		linkflags = "../libboost_oxt.a "
-		linkflags << "#{PlatformInfo.apache2_module_cflags} "
-		linkflags << "#{PlatformInfo.apache2_module_ldflags} #{EXTRA_LDFLAGS} -lstdc++"
-		create_shared_library 'mod_passenger.so',
-			APACHE2::OBJECTS.keys.join(' ') << ' mod_passenger.o',
-			linkflags
-	end
-	
-	file 'ApplicationPoolServerExecutable' => [
-		'../libboost_oxt.a',
-		'ApplicationPoolServerExecutable.cpp',
-		'ApplicationPool.h',
-		'Application.h',
-		'StandardApplicationPool.h',
-		'FileChecker.h',
-		'MessageChannel.h',
-		'SpawnManager.h',
-		'PoolOptions.h',
-		'Utils.o',
-		'Logging.o',
-		'SystemTime.o',
-		'CachedFileStat.o'
-	] do
-		create_executable "ApplicationPoolServerExecutable",
-			'ApplicationPoolServerExecutable.cpp Utils.o Logging.o ' <<
-			'SystemTime.o CachedFileStat.o',
-			"-I.. #{CXXFLAGS} #{PlatformInfo.portability_cflags} " <<
-			"../libboost_oxt.a " <<
-			"#{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}"
-	end
-	
-	file 'mod_passenger.o' => ['mod_passenger.c'] do
-		compile_c 'mod_passenger.c', APACHE2::CXXFLAGS
-	end
-	
-	APACHE2::OBJECTS.each_pair do |target, sources|
-		file target => sources do
-			compile_cxx sources[0], APACHE2::CXXFLAGS
+		
+		sources = APACHE2_OBJECTS.join(' ')
+		sources << ' ext/apache2/mod_passenger.o'
+		
+		linkflags =
+			"#{PlatformInfo.apache2_module_cflags} " <<
+			"#{PlatformInfo.portability_cflags} " <<
+			"#{EXTRA_CXXFLAGS} " <<
+			"#{APACHE2_COMMON_LIBRARY[0]} " <<
+			"#{APACHE2_BOOST_OXT_LIBRARY} " <<
+			"#{PlatformInfo.apache2_module_ldflags} " <<
+			"#{PlatformInfo.portability_ldflags} " <<
+			"#{EXTRA_LDFLAGS} "
+		
+		create_shared_library('ext/apache2/mod_passenger.so',
+			sources, linkflags)
+	end
+
+	file 'ext/apache2/mod_passenger.o' => ['ext/apache2/mod_passenger.c'] do
+		compile_c('ext/apache2/mod_passenger.c',
+			APACHE2_CXXFLAGS +
+			" -o ext/apache2/mod_passenger.o")
+	end
+
+	APACHE2_INPUT_FILES.each_pair do |target, sources|
+		file(target => sources) do
+			object_basename = File.basename(target)
+			compile_cxx(sources[0],
+				APACHE2_CXXFLAGS +
+				" -o ext/apache2/#{object_basename}")
 		end
 	end
-	
-	task :clean => :'apache2:clean'
-	
-	desc "Remove generated files for mod_passenger Apache 2 module"
+
+	task :clean => 'apache2:clean'
+
+	# Remove generated files for the Apache 2 module
 	task 'apache2:clean' do
-		files = [APACHE2::OBJECTS.keys, %w(mod_passenger.o mod_passenger.so
-			ApplicationPoolServerExecutable)]
+		files = [APACHE2_OBJECTS, %w(ext/apache2/mod_passenger.o
+			ext/apache2/mod_passenger.so)]
 		sh("rm", "-rf", *files.flatten)
 	end
-end
+
+
+##### Nginx helper server
+
+	# NOTE: NGINX_BOOST_OXT_LIBRARY is a task name, while NGINX_COMMON_LIBRARY
+	# is an array of task names.
+	NGINX_BOOST_OXT_LIBRARY = define_libboost_oxt_task("ext/nginx")
+	NGINX_COMMON_LIBRARY    = define_common_library_task("ext/nginx")
+	
+	desc "Build Nginx helper server"
+	task :nginx => ['ext/nginx/HelperServer', :native_support]
+	
+	helper_server_dependencies = [
+		NGINX_BOOST_OXT_LIBRARY,
+		NGINX_COMMON_LIBRARY[0],
+		'ext/nginx/HelperServer.cpp',
+		'ext/nginx/ScgiRequestParser.h',
+		'ext/nginx/HttpStatusExtractor.h',
+		'ext/common/StaticString.h',
+		'ext/common/StandardApplicationPool.h'
+		]
+	file 'ext/nginx/HelperServer' => helper_server_dependencies do
+		create_executable "ext/nginx/HelperServer",
+			'ext/nginx/HelperServer.cpp',
+			"-Iext -Iext/common " <<
+			"#{PlatformInfo.portability_cflags} " <<
+			"#{EXTRA_CXXFLAGS}  " <<
+			"#{NGINX_COMMON_LIBRARY[0]} " <<
+			"#{NGINX_BOOST_OXT_LIBRARY} " <<
+			"#{PlatformInfo.portability_ldflags} " <<
+			"#{EXTRA_LDFLAGS}"
+	end
+	
+	task :clean => 'nginx:clean'
+	
+	# Remove Nginx helper server
+	task 'nginx:clean' do
+		sh("rm", "-rf", "ext/nginx/HelperServer")
+	end
 
 
 ##### Unit tests
 
-class TEST
-	CXXFLAGS = "#{::CXXFLAGS} -DTESTING_SPAWN_MANAGER -DTESTING_APPLICATION_POOL #{PlatformInfo.portability_cflags}"
-
-	AP2_FLAGS = "-I../ext/apache2 -I../ext -Isupport #{PlatformInfo.apr_flags} #{PlatformInfo.apu_flags}"
-	AP2_OBJECTS = {
-		'CxxTestMain.o' => %w(CxxTestMain.cpp),
-		'MessageChannelTest.o' => %w(MessageChannelTest.cpp
-			../ext/apache2/MessageChannel.h),
-		'SpawnManagerTest.o' => %w(SpawnManagerTest.cpp
-			../ext/apache2/SpawnManager.h
-			../ext/apache2/PoolOptions.h
-			../ext/apache2/Application.h
-			../ext/apache2/MessageChannel.h),
-		'ApplicationPoolServerTest.o' => %w(ApplicationPoolServerTest.cpp
-			../ext/apache2/ApplicationPoolServer.h
-			../ext/apache2/PoolOptions.h
-			../ext/apache2/MessageChannel.h),
-		'ApplicationPoolServer_ApplicationPoolTest.o' => %w(ApplicationPoolServer_ApplicationPoolTest.cpp
-			ApplicationPoolTest.cpp
-			../ext/apache2/ApplicationPoolServer.h
-			../ext/apache2/ApplicationPool.h
-			../ext/apache2/SpawnManager.h
-			../ext/apache2/PoolOptions.h
-			../ext/apache2/Application.h
-			../ext/apache2/MessageChannel.h),
-		'StandardApplicationPoolTest.o' => %w(StandardApplicationPoolTest.cpp
-			ApplicationPoolTest.cpp
-			../ext/apache2/ApplicationPool.h
-			../ext/apache2/StandardApplicationPool.h
-			../ext/apache2/SpawnManager.h
-			../ext/apache2/PoolOptions.h
-			../ext/apache2/Application.h
-			../ext/apache2/FileChecker.h),
-		'PoolOptionsTest.o' => %w(PoolOptionsTest.cpp ../ext/apache2/PoolOptions.h),
-		'FileCheckerTest.o' => %w(FileCheckerTest.cpp
-			../ext/apache2/FileChecker.h
-			../ext/apache2/CachedFileStat.h),
-		'SystemTimeTest.o' => %w(SystemTimeTest.cpp
-			../ext/apache2/SystemTime.h
-			../ext/apache2/SystemTime.cpp),
-		'CachedFileStatTest.o' => %w(CachedFileStatTest.cpp
-			../ext/apache2/CachedFileStat.h
-			../ext/apache2/CachedFileStat.cpp),
-		'UtilsTest.o' => %w(UtilsTest.cpp ../ext/apache2/Utils.h)
-	}
+	TEST_BOOST_OXT_LIBRARY = define_libboost_oxt_task("test")
+	TEST_COMMON_LIBRARY    = define_common_library_task("test",
+		nil, true, TEST_BOOST_OXT_LIBRARY)
+	
+	TEST_COMMON_CFLAGS = "-DTESTING_SPAWN_MANAGER -DTESTING_APPLICATION_POOL " <<
+		"#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}"
 	
-	OXT_FLAGS = "-I../../ext -I../support"
-	OXT_OBJECTS = {
+	TEST_OXT_CFLAGS = "-I../../ext -I../support #{TEST_COMMON_CFLAGS}"
+	TEST_OXT_LDFLAGS = "#{TEST_BOOST_OXT_LIBRARY} #{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}"
+	TEST_OXT_OBJECTS = {
 		'oxt_test_main.o' => %w(oxt_test_main.cpp),
 		'backtrace_test.o' => %w(backtrace_test.cpp),
 		'syscall_interruption_test.o' => %w(syscall_interruption_test.cpp)
 	}
-end
+	
+	TEST_CXX_CFLAGS = "-Iext -Iext/common -Iext/nginx -Itest/support " <<
+		"#{PlatformInfo.apr_flags} #{PlatformInfo.apu_flags} #{TEST_COMMON_CFLAGS}"
+	TEST_CXX_LDFLAGS = "#{PlatformInfo.apr_libs} #{PlatformInfo.apu_libs} " <<
+		"#{TEST_COMMON_LIBRARY[0]} #{TEST_BOOST_OXT_LIBRARY} " <<
+		"#{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}"
+	TEST_CXX_OBJECTS = {
+		'test/CxxTestMain.o' => %w(
+			test/CxxTestMain.cpp),
+		'test/MessageChannelTest.o' => %w(
+			test/MessageChannelTest.cpp
+			ext/common/MessageChannel.h),
+		'test/SpawnManagerTest.o' => %w(
+			test/SpawnManagerTest.cpp
+			ext/common/SpawnManager.h
+			ext/common/PoolOptions.h
+			ext/common/Application.h
+			ext/common/MessageChannel.h),
+		'test/ApplicationPoolServerTest.o' => %w(
+			test/ApplicationPoolServerTest.cpp
+			ext/common/ApplicationPoolServer.h
+			ext/common/PoolOptions.h
+			ext/common/MessageChannel.h),
+		'test/ApplicationPoolServer_ApplicationPoolTest.o' => %w(
+			test/ApplicationPoolServer_ApplicationPoolTest.cpp
+			test/ApplicationPoolTest.cpp
+			ext/common/ApplicationPoolServer.h
+			ext/common/ApplicationPool.h
+			ext/common/SpawnManager.h
+			ext/common/PoolOptions.h
+			ext/common/Application.h
+			ext/common/MessageChannel.h),
+		'test/StandardApplicationPoolTest.o' => %w(
+			test/StandardApplicationPoolTest.cpp
+			test/ApplicationPoolTest.cpp
+			ext/common/ApplicationPool.h
+			ext/common/StandardApplicationPool.h
+			ext/common/SpawnManager.h
+			ext/common/PoolOptions.h
+			ext/common/FileChecker.h
+			ext/common/Application.h),
+		'test/PoolOptionsTest.o' => %w(
+			test/PoolOptionsTest.cpp
+			ext/common/PoolOptions.h),
+		'test/StaticString.o' => %w(
+			test/StaticStringTest.cpp
+			ext/common/StaticString.h),
+		'test/ScgiRequestParserTest.o' => %w(
+			test/ScgiRequestParserTest.cpp
+			ext/nginx/ScgiRequestParser.h
+			ext/common/StaticString.h),
+		'test/HttpStatusExtractorTest.o' => %w(
+			test/HttpStatusExtractorTest.cpp
+			ext/nginx/HttpStatusExtractor.h),
+		'test/FileCheckerTest.o' => %w(
+			test/FileCheckerTest.cpp
+			ext/common/FileChecker.h
+			ext/common/CachedFileStat.h),
+		'test/SystemTimeTest.o' => %w(
+			test/SystemTimeTest.cpp
+			ext/common/SystemTime.h
+			ext/common/SystemTime.cpp),
+		'test/CachedFileStatTest.o' => %w(
+			test/CachedFileStatTest.cpp
+			ext/common/CachedFileStat.h
+			ext/common/CachedFileStat.cpp),
+		'test/UtilsTest.o' => %w(
+			test/UtilsTest.cpp
+			ext/common/Utils.h)
+	}
 
-subdir 'test' do
-	desc "Run all unit tests (but not integration tests)"
-	task :test => [:'test:oxt', :'test:apache2', :'test:ruby', :'test:integration']
+	desc "Run all unit tests and integration tests"
+	task :test => ['test:oxt', 'test:cxx', 'test:ruby', 'test:integration']
 	
 	desc "Run unit tests for the OXT library"
-	task 'test:oxt' => 'oxt/oxt_test_main' do
-		sh "./oxt/oxt_test_main"
+	task 'test:oxt' => 'test/oxt/oxt_test_main' do
+		sh "cd test && ./oxt/oxt_test_main"
 	end
 	
-	desc "Run unit tests for the Apache 2 module"
-	task 'test:apache2' => [
-		'Apache2ModuleTests',
-		'../ext/apache2/ApplicationPoolServerExecutable',
-		:native_support
-	] do
-		sh "./Apache2ModuleTests"
-	end
-	
-	desc "Run unit tests for the Apache 2 module in Valgrind"
-	task 'test:valgrind' => [
-		'Apache2ModuleTests',
-		'../ext/apache2/ApplicationPoolServerExecutable',
-		:native_support
-	] do
-		sh "valgrind #{ENV['ARGS']} ./Apache2ModuleTests"
+	desc "Run unit tests for the Apache 2 and Nginx C++ components"
+	task 'test:cxx' => ['test/CxxTests', :native_support] do
+		sh "cd test && ./CxxTests"
 	end
 	
 	desc "Run unit tests for the Ruby libraries"
-	task 'test:ruby' => [:native_support] do
+	task 'test:ruby' => :native_support do
 		if PlatformInfo.rspec.nil?
 			abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo::RUBY}'. Please install it."
 		else
-			ruby "#{PlatformInfo.rspec} -c -f s ruby/*.rb ruby/*/*.rb"
+			Dir.chdir("test") do
+				ruby "#{PlatformInfo.rspec} -c -f s ruby/*.rb ruby/*/*.rb"
+			end
 		end
 	end
 	
-	task 'test:rcov' => [:native_support] do
+	desc "Run coverage tests for the Ruby libraries"
+	task 'test:rcov' => :native_support do
 		if PlatformInfo.rspec.nil?
 			abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo::RUBY}'. Please install it."
 		else
-			sh "rcov", "--exclude",
-				"lib\/spec,\/spec$,_spec\.rb$,support\/,platform_info,integration_tests",
-				PlatformInfo.rspec, "--", "-c", "-f", "s",
-				*Dir["ruby/*.rb", "ruby/*/*.rb", "integration_tests.rb"]
+			Dir.chdir("test") do
+				sh "rcov", "--exclude",
+					"lib\/spec,\/spec$,_spec\.rb$,support\/,platform_info,integration_tests",
+					PlatformInfo.rspec, "--", "-c", "-f", "s",
+					*Dir["ruby/*.rb", "ruby/*/*.rb", "integration_tests.rb"]
+			end
 		end
 	end
 	
-	desc "Run integration tests"
-	task 'test:integration' => [:apache2, :native_support] do
+	desc "Run all integration tests"
+	task 'test:integration' => ['test:integration:apache2', 'test:integration:nginx'] do
+	end
+	
+	desc "Run Apache 2 integration tests"
+	task 'test:integration:apache2' => [:apache2, :native_support] do
 		if PlatformInfo.rspec.nil?
 			abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo::RUBY}'. Please install it."
 		else
-			ruby "#{PlatformInfo.rspec} -c -f s integration_tests.rb"
+			Dir.chdir("test") do
+				ruby "#{PlatformInfo.rspec} -c -f s integration_tests/apache2_tests.rb"
+			end
 		end
 	end
 	
-	file 'oxt/oxt_test_main' => TEST::OXT_OBJECTS.keys.map{ |x| "oxt/#{x}" } +
-	  ['../ext/libboost_oxt.a'] do
-		Dir.chdir('oxt') do
-			objects = TEST::OXT_OBJECTS.keys.join(' ')
-			create_executable "oxt_test_main", objects,
-				"../../ext/libboost_oxt.a " <<
-				"#{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}"
+	desc "Run Nginx integration tests"
+	task 'test:integration:nginx' => :nginx do
+		if PlatformInfo.rspec.nil?
+			abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo::RUBY}'. Please install it."
+		else
+			Dir.chdir("test") do
+				ruby "#{PlatformInfo.rspec} -c -f s integration_tests/nginx_tests.rb"
+			end
 		end
 	end
 	
-	TEST::OXT_OBJECTS.each_pair do |target, sources|
-		file "oxt/#{target}" => sources.map{ |x| "oxt/#{x}" } do
-			Dir.chdir('oxt') do
+	oxt_test_main_dependencies = TEST_OXT_OBJECTS.keys.map do |object|
+		"test/oxt/#{object}"
+	end
+	oxt_test_main_dependencies << TEST_BOOST_OXT_LIBRARY
+	file 'test/oxt/oxt_test_main' => oxt_test_main_dependencies do
+		objects = TEST_OXT_OBJECTS.keys.map{ |x| "test/oxt/#{x}" }.join(' ')
+		create_executable("test/oxt/oxt_test_main", objects, TEST_OXT_LDFLAGS)
+	end
+	
+	TEST_OXT_OBJECTS.each_pair do |target, sources|
+		file "test/oxt/#{target}" => sources.map{ |x| "test/oxt/#{x}" } do
+			Dir.chdir('test/oxt') do
 				puts "### In test/oxt:"
-				compile_cxx sources[0], "#{TEST::OXT_FLAGS} #{TEST::CXXFLAGS}"
+				compile_cxx sources[0], TEST_OXT_CFLAGS
 			end
 		end
 	end
 
-	file 'Apache2ModuleTests' => TEST::AP2_OBJECTS.keys +
-	  ['../ext/libboost_oxt.a',
-	   '../ext/apache2/Utils.o',
-	   '../ext/apache2/Logging.o',
-	   '../ext/apache2/SystemTime.o',
-	   '../ext/apache2/CachedFileStat.o'] do
-		objects = TEST::AP2_OBJECTS.keys.join(' ') <<
-			" ../ext/apache2/Utils.o" <<
-			" ../ext/apache2/Logging.o" <<
-			" ../ext/apache2/SystemTime.o " <<
-			" ../ext/apache2/CachedFileStat.o"
-		create_executable "Apache2ModuleTests", objects,
-			"#{PlatformInfo.apache2_module_ldflags} #{EXTRA_LDFLAGS} " <<
-			"../ext/libboost_oxt.a " <<
-			"-lpthread"
-	end
-	
-	TEST::AP2_OBJECTS.each_pair do |target, sources|
-		file target => sources do
-			compile_cxx sources[0], "#{TEST::AP2_FLAGS} #{TEST::CXXFLAGS}"
+	cxx_tests_dependencies = [TEST_CXX_OBJECTS.keys,
+		TEST_BOOST_OXT_LIBRARY, TEST_COMMON_LIBRARY]
+	file 'test/CxxTests' => cxx_tests_dependencies.flatten do
+		objects = TEST_CXX_OBJECTS.keys.join(' ')
+		create_executable("test/CxxTests", objects, TEST_CXX_LDFLAGS)
+	end
+	
+	TEST_CXX_OBJECTS.each_pair do |target, sources|
+		file(target => sources) do
+			compile_cxx sources[0], "-o #{target} #{TEST_CXX_CFLAGS}"
 		end
 	end
 	
-	desc "Run the restart integration test infinitely, and abort if/when it fails"
+	desc "Run the 'restart' integration test infinitely, and abort if/when it fails"
 	task 'test:restart' => [:apache2, :native_support] do
-		color_code_start = "\e[33m\e[44m\e[1m"
-		color_code_end = "\e[0m"
-		i = 1
-		while true do
-			puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
-			sh "spec -c -f s integration_tests.rb -e 'mod_passenger running in Apache 2 : MyCook(tm) beta running on root URI should support restarting via restart.txt'"
-			i += 1
+		Dir.chdir("test") do
+			color_code_start = "\e[33m\e[44m\e[1m"
+			color_code_end = "\e[0m"
+			i = 1
+			while true do
+				puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
+				sh "spec -c -f s integration_tests/apache2.rb -e 'mod_passenger running in Apache 2 : MyCook(tm) beta running on root URI should support restarting via restart.txt'"
+				i += 1
+			end
 		end
 	end
 	
 	task :clean do
-		sh "rm -f oxt/oxt_test_main oxt/*.o Apache2ModuleTests *.o"
+		sh("rm -rf test/oxt/oxt_test_main test/oxt/*.o test/CxxTests test/*.o")
 	end
-end
 
 
 ##### Documentation
@@ -381,7 +576,8 @@ end
 subdir 'doc' do
 	ASCIIDOC = 'asciidoc'
 	ASCIIDOC_FLAGS = "-a toc -a numbered -a toclevels=3 -a icons"
-	ASCII_DOCS = ['Security of user switching support', 'Users guide',
+	ASCII_DOCS = ['Security of user switching support',
+		'Users guide Apache', 'Users guide Nginx',
 		'Architectural overview']
 
 	DOXYGEN = 'doxygen'
@@ -466,13 +662,16 @@ spec = Gem::Specification.new do |s|
 		'lib/**/*.rb',
 		'lib/**/*.py',
 		'lib/phusion_passenger/templates/*',
+		'lib/phusion_passenger/templates/apache2/*',
+		'lib/phusion_passenger/templates/nginx/*',
 		'bin/*',
 		'doc/*',
 		
 		# If you're running 'rake package' for the first time, then these
 		# files don't exist yet, and so won't be matched by the above glob.
 		# So we add these filenames manually.
-		'doc/Users guide.html',
+		'doc/Users guide Apache.html',
+		'doc/Users guide Nginx.html',
 		'doc/Security of user switching support.html',
 		
 		'doc/*/*',
@@ -482,7 +681,10 @@ spec = Gem::Specification.new do |s|
 		'doc/*/*/*/*/*/*',
 		'man/*',
 		'debian/*',
+		'ext/common/*.{cpp,c,h}',
 		'ext/apache2/*.{cpp,h,c,TXT}',
+		'ext/nginx/*.{c,cpp,h}',
+		'ext/nginx/config',
 		'ext/boost/*.{hpp,TXT}',
 		'ext/boost/**/*.{hpp,cpp,pl,inl,ipp}',
 		'ext/oxt/*.hpp',
@@ -498,6 +700,7 @@ spec = Gem::Specification.new do |s|
 		'test/oxt/*.cpp',
 		'test/ruby/*',
 		'test/ruby/*/*',
+		'test/integration_tests/*',
 		'test/stub/*',
 		'test/stub/*/*',
 		'test/stub/*/*/*',
@@ -511,6 +714,7 @@ spec = Gem::Specification.new do |s|
 	s.executables = [
 		'passenger-spawn-server',
 		'passenger-install-apache2-module',
+		'passenger-install-nginx-module',
 		'passenger-config',
 		'passenger-memory-stats',
 		'passenger-make-enterprisey',
@@ -559,9 +763,6 @@ task :fakeroot => [:apache2, :native_support, :doc] do
 	sh "mkdir -p #{libdir}"
 	sh "cp -R lib/phusion_passenger #{libdir}/"
 
-	sh "mkdir -p #{fakeroot}/etc"
-	sh "echo -n '#{PACKAGE_VERSION}' > #{fakeroot}/etc/passenger_version.txt"
-	
 	sh "mkdir -p #{extdir}/phusion_passenger"
 	sh "cp -R ext/phusion_passenger/*.#{LIBEXT} #{extdir}/phusion_passenger/"
 	
@@ -623,18 +824,16 @@ task :sloccount do
 		end
 		sh "sloccount", *Dir[
 			"#{tmpdir}/*",
-			"lib/phusion_passenger/*",
+			"lib/phusion_passenger",
 			"lib/rake/{cplusplus,extensions}.rb",
 			"ext/apache2",
+			"ext/nginx",
 			"ext/oxt",
 			"ext/phusion_passenger/*.c",
-			"test/*.{cpp,rb}",
-			"test/support/*.rb",
-			"test/stub/*.rb",
+			"test/**/*.{cpp,rb}",
 			"benchmark/*.{cpp,rb}"
 		]
 	ensure
 		system "rm -rf #{tmpdir}"
 	end
 end
-