passenger 2.1.3 → 2.2.0

data/bin/passenger-make-enterprisey

@@ -1,21 +1,26 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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; version 2 of the License.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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.
+#  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.
 
 PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
 require 'digest/md5'

data/bin/passenger-memory-stats

@@ -1,21 +1,26 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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; version 2 of the License.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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.
+#  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.
 
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
 require 'phusion_passenger/platform_info'
@@ -124,25 +129,30 @@ class MemoryStats
 	end
 	
 	def start
-		if PlatformInfo.httpd.nil?
-			STDERR.puts "*** ERROR: The Apache executable cannot be found."
+		if PlatformInfo.httpd
+			apache_processes = list_processes(:exe => PlatformInfo.httpd)
+			if apache_processes.empty?
+				# On some Linux distros, the Apache worker processes
+				# are called "httpd.worker"
+				apache_processes = list_processes(:exe => "#{PlatformInfo.httpd}.worker")
+			end
+			print_process_list("Apache processes", apache_processes)
+		else
+			apache_processes = []
+			puts "#{BLUE_BG}#{BOLD}#{YELLOW}------------- Apache processes -------------#{RESET}\n"
+			STDERR.puts "*** WARNING: The Apache executable cannot be found."
 			STDERR.puts "Please set the APXS2 environment variable to your 'apxs2' " <<
 				"executable's filename, or set the HTTPD environment variable " <<
 				"to your 'httpd' or 'apache2' executable's filename."
-			exit 1
 		end
 		
-		apache_processes = list_processes(:exe => PlatformInfo.httpd)
-		if apache_processes.empty?
-			# On some Linux distros, the Apache worker processes
-			# are called "httpd.worker"
-			apache_processes = list_processes(:exe => "#{PlatformInfo.httpd}.worker")
-		end
-		print_process_list("Apache processes", apache_processes)
+		puts
+		nginx_processes = list_processes(:exe => "nginx")
+		print_process_list("Nginx processes", nginx_processes)
 		
 		puts
 		passenger_processes = list_processes(:match =>
-			/((^| )Passenger |(^| )Rails:|(^| )Rack:|ApplicationPoolServerExecutable)/)
+			/((^| )Passenger |(^| )Rails:|(^| )Rack:|ApplicationPoolServerExecutable|PassengerNginxHelperServer)/)
 		print_process_list("Passenger processes", passenger_processes, :show_ppid => false)
 		
 		if RUBY_PLATFORM !~ /linux/

data/bin/passenger-spawn-server

@@ -1,21 +1,26 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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; version 2 of the License.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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.
+#  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.
 
 root = File.expand_path("#{File.dirname(__FILE__)}/..")
 $LOAD_PATH.unshift("#{root}/lib", "#{root}/ext")

data/bin/passenger-status

@@ -1,21 +1,26 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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; version 2 of the License.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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.
+#  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.
 
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../ext")
@@ -64,7 +69,7 @@ def start
 			exit 1
 		end
 	else
-		show_status(ControlProcess.new(ARGV[0].to_i))
+		show_status(ControlProcess.for_pid(ARGV[0].to_i))
 	end
 end
 

data/bin/passenger-stress-test

@@ -1,21 +1,26 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  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; version 2 of the License.
+#  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:
 #
-#  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.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  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.
+#  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.
 
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../ext")

data/doc/{Users guide.html → Users guide Apache.html }

@@ -622,11 +622,14 @@ be located in the <tt>sbin</tt> folder instead of the <tt>bin</tt> folder.</td>
 native Linux package, because no compilation is necessary.</td>
 </tr></table>
 </div>
-<div class="paragraph"><p>If your system has multiple Ruby installations (this is likely the case on
-MacOS X), then you will need to tell the Phusion Passenger installer which one
-to use. If you only have one Ruby installation (the case on most Linux systems),
-then you can skip this section because Phusion Passenger will automatically detect it.</p></div>
-<div class="paragraph"><p>To specify the Ruby installation, prepend your Ruby installation&#8217;s <tt>bin</tt>
+<div class="paragraph"><p>If your system has multiple Ruby installations&#8201;&#8212;&#8201;which is likely the case on
+MacOS X, or if you&#8217;ve also installed
+<a href="http://www.rubyenterpriseedition.com">Ruby Enterprise Edition</a>&#8201;&#8212;&#8201;then you
+will need to tell the operating system which Ruby installation to use, prior to
+running the Phusion Passenger installer. If you only have one Ruby installation
+(the case on most Linux systems), then you can skip this section because Phusion
+Passenger will automatically detect it.</p></div>
+<div class="paragraph"><p>To specify a Ruby installation, prepend your Ruby installation&#8217;s <tt>bin</tt>
 directory to the <tt>PATH</tt> environment variable. For example, if you have the
 following Ruby installations:</p></div>
 <div class="ulist"><ul>
@@ -666,8 +669,8 @@ sudo apt-get update
 sudo apt-get install libapache2-mod-passenger</tt></pre>
 </div></div>
 <h4 id="_installing_via_the_source_tarball">2.1.6. Installing via the source tarball</h4>
-<div class="paragraph"><p>Extract the tarball to whatever location you prefer. The Phusion Passenger files
-are to reside in that location permanently. For example, if you would like
+<div class="paragraph"><p>Extract the tarball to whatever location you prefer. <strong>The Phusion Passenger files
+are to reside in that location permanently.</strong> For example, if you would like
 Phusion Passenger to reside in <tt>/opt/passenger-x.x.x</tt>:</p></div>
 <div class="listingblock">
 <div class="content">
@@ -696,6 +699,15 @@ installation. Furthermore, the <em>passenger-x.x.x</em> folder must be accessibl
 on installing Phusion Passenger on OS X</a>.</p></div>
 <h4 id="_ubuntu_linux">2.2.2. Ubuntu Linux</h4>
 <div class="paragraph"><p>Ben Hughes has written an <a href="http://www.railsgarden.com/2008/04/12/configurating-passenger-mod_rails-on-slicehost-with-ubuntu-710/">article on installing Phusion Passenger on Ubuntu</a>.</p></div>
+<h4 id="_opensolaris">2.2.3. OpenSolaris</h4>
+<div class="olist upperalpha"><ol class="upperalpha">
+<li>
+<p>
+Aaron Farr has written a <a href="http://cubiclemuses.com/cm/articles/2009/04/09/rails-passenger-open-solaris-ec2/">guide</a>
+about setting up Ruby on Rails and Phusion Passenger on OpenSolaris and EC2.
+</p>
+</li>
+</ol></div>
 </div>
 <h2 id="_deploying_a_ruby_on_rails_application">3. Deploying a Ruby on Rails application</h2>
 <div class="sectionbody">
@@ -1066,8 +1078,11 @@ Phusion Passenger&#8217;s behavior. Phusion Passenger&#8217;s Apache module supp
 following configuration options:</p></div>
 <h3 id="_passengerroot_lt_directory_gt">5.1. PassengerRoot &lt;directory&gt;</h3>
 <div class="paragraph"><p>The location to the Phusion Passenger root directory. This configuration option
-is essential to Phusion Passenger. The correct value is given by the installer,
-and should usually not be changed manually.</p></div>
+is essential to Phusion Passenger, and allows Phusion Passenger to locate its own
+data files. The correct value is given by the installer.</p></div>
+<div class="paragraph"><p>If you&#8217;ve moved Phusion Passenger to a different directory then you need to update
+this option as well. Please read
+<a href="#moving_phusion_passenger">Moving Phusion Passenger to a different directory</a> for more information.</p></div>
 <div class="paragraph"><p>This required option may only occur once, in the global server configuration.</p></div>
 <h3 id="_passengerloglevel_lt_integer_gt">5.2. PassengerLogLevel &lt;integer&gt;</h3>
 <div class="paragraph"><p>This option allows one to specify how much information Phusion Passenger should
@@ -1237,7 +1252,7 @@ default.</p></div>
 <div class="paragraph"><p>This option may only occur once, in the global server configuration.
 The default value is <em>on</em>.</p></div>
 <h3 id="PassengerDefaultUser">5.7. PassengerDefaultUser &lt;username&gt;</h3>
-<div class="paragraph"><p>Passenger enables <a href="#user_switching">user switching support</a> by default.
+<div class="paragraph"><p>Phusion Passenger enables <a href="#user_switching">user switching support</a> by default.
 This configuration option allows one to specify which user Rails/Rack
 applications must run as, if user switching fails or is disabled.</p></div>
 <div class="paragraph"><p>This option may only occur once, in the global server configuration.
@@ -1794,8 +1809,20 @@ process only takes about 40% of the time that is normally needed, assuming that
 you&#8217;re using the <em>smart</em> <a href="#RailsSpawnMethod">spawning method</a>. So if your
 system has enough memory, is it recommended that you set this option to a high
 value or to <em>0</em>.</p></div>
-<div class="paragraph"><p>This option may only occur in the global server configuration, and may occur at
-most once. The default value is <em>1800</em> (30 minutes).</p></div>
+<div class="paragraph"><p>This option may occur in the following places:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+In the global server configuration.
+</p>
+</li>
+<li>
+<p>
+In a virtual host configuration block.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>In each place, it may be specified at most once. The default value is <em>1800</em> (30 minutes).</p></div>
 <h4 id="_railsappspawneridletime_lt_integer_gt">5.13.6. RailsAppSpawnerIdleTime &lt;integer&gt;</h4>
 <div class="paragraph"><p>The ApplicationSpawner server (explained in <a href="#spawning_methods_explained">Spawning methods explained</a>) has an idle timeout, just like the backend processes spawned by
 Phusion Passenger do. That is, it will automatically shutdown if it hasn&#8217;t done
@@ -1809,8 +1836,20 @@ process only takes about 10% of the time that is normally needed, assuming that
 you&#8217;re using the <em>smart</em> or <em>smart-lv2</em> <a href="#RailsSpawnMethod">spawning method</a>. So if your
 system has enough memory, is it recommended that you set this option to a high
 value or to <em>0</em>.</p></div>
-<div class="paragraph"><p>This option may only occur in the global server configuration, and may occur at
-most once. The default value is <em>600</em> (10 minutes).</p></div>
+<div class="paragraph"><p>This option may occur in the following places:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+In the global server configuration.
+</p>
+</li>
+<li>
+<p>
+In a virtual host configuration block.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>In each place, it may be specified at most once. The default value is <em>600</em> (10 minutes).</p></div>
 <h3 id="_rack_specific_options">5.14. Rack-specific options</h3>
 <h4 id="_rackautodetect_lt_on_off_gt">5.14.1. RackAutoDetect &lt;on|off&gt;</h4>
 <div class="paragraph"><p>Whether Phusion Passenger should automatically detect whether a virtual host&#8217;s
@@ -2376,8 +2415,9 @@ This is a lot less than the 50 MB-ish memory usage as shown in the <em>VMSize</e
 <td class="icon">
 <img src="./images/icons/note.png" alt="Note" />
 </td>
-<td class="content">This tool only works on Linux. Unfortunately other operating systems don&#8217;t
-provide facilities for determining processes' private dirty RSS.</td>
+<td class="content">Private dirty RSS reporting only works on Linux. Unfortunately other operating systems
+don&#8217;t provide facilities for determining processes' private dirty RSS. On non-Linux systems,
+the Resident Set Size is reported instead.</td>
 </tr></table>
 </div>
 <h3 id="_inspecting_phusion_passenger_8217_s_internal_status">7.2. Inspecting Phusion Passenger&#8217;s internal status</h3>
@@ -2404,7 +2444,8 @@ max
 <dd>
 <p>
 The maximum number of application instances that Phusion Passenger will
-spawn. This equals the value given for <a href="#PassengerMaxPoolSize">PassengerMaxPoolSize</a>.
+spawn. This equals the value given for <a href="#PassengerMaxPoolSize">PassengerMaxPoolSize</a> (Apache)
+or <a href="#PassengerMaxPoolSize">passenger_max_pool_size</a> (Nginx).
 </p>
 </dd>
 <dt class="hdlist1">
@@ -2432,7 +2473,7 @@ inactive
 <p>
 The number of application instances that are currently <strong>not</strong> processing
 requests, i.e. are idle. Idle application instances will be shutdown after a while,
-as can be specified with <a href="#PassengerPoolIdleTime">PassengerPoolIdleTime</a> (unless this
+as can be specified with <a href="#PassengerPoolIdleTime">PassengerPoolIdleTime (Apache)</a>/<a href="#PassengerPoolIdleTime">passenger_pool_idle_time (Nginx)</a> (unless this
 value is set to 0, in which case application instances are never shut down via idle
 time). The value of <em>inactive</em> equals <tt>count - active</tt>.
 </p>
@@ -2561,12 +2602,13 @@ This feature is only available if Apache is started by <em>root</em>. This is th
 Under no circumstances will applications be run as <em>root</em>. If
   <em>environment.rb</em>/<em>config.ru</em> is owned as root or by an unknown user, then the
   Rails/Rack application will run as the user specified by
-  <a href="#PassengerDefaultUser">PassengerDefaultUser</a>.
+  <a href="#PassengerDefaultUser">PassengerDefaultUser (Apache)</a>/<a href="#PassengerDefaultUser">passenger_default_user (Nginx)</a>.
 </p>
 </li>
 </ul></div>
 <div class="paragraph"><p>User switching can be disabled with the
-<a href="#PassengerUserSwitching">PassengerUserSwitching</a> option.</p></div>
+<a href="#PassengerUserSwitching">PassengerUserSwitching (Apache)</a>/<a href="#PassengerUserSwitching">passenger_user_switching (Nginx)</a>
+option.</p></div>
 <h3 id="reducing_memory_usage">8.2. Reducing memory consumption of Ruby on Rails applications by 33%</h3>
 <div class="paragraph"><p>Is it possible to reduce memory consumption of your Rails applications by 33% on average,
 by using <a href="http://www.rubyenterpriseedition.com/">Ruby Enterprise Edition</a>.
@@ -2604,31 +2646,7 @@ namespace :deploy do
   end
 end</tt></pre>
 </div></div>
-<div class="paragraph"><p>You may notice that after each deploy, a new spawner server is
-created (it&#8217;ll show up in <tt>passenger-memory-stats</tt>). Indeed, Capistrano will deploy
-to a path ending with <em>/current</em> (ie : <em>/u/apps/yourapp/current</em>), so that you don&#8217;t
-have to care about revisions in your virtual host configuration. This <em>/current</em> directory
-is a symlink to the current revision deployed (<em>/path_to_app/releases/date_of_the_release</em>).
-Phusion Passenger recognizes applications by their full canonical path, so after
-deploying a new version, Phusion Passenger will think that the new version is
-a totally different application, thereby creating a new spawner server:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>1001   30291   [...]   Passenger ApplicationSpawner: /u/apps/my_app/releases/20080509104413
-1001   31371   [...]   Passenger ApplicationSpawner: /u/apps/my_app/releases/20080509104632</tt></pre>
-</div></div>
-<div class="paragraph"><p>Don&#8217;t worry about this. The (old) spawner server will terminate itself after its
-timeout period (10 minutes by default), so you will not run out of memory.</p></div>
-<div class="paragraph"><p>If you really want to release the spawner server&#8217;s memory immediately, then you can add a command
-to your Capistrano script to terminate the Passenger spawn server after each deploy. That
-command is as follows:</p></div>
-<div class="listingblock">
-<div class="content">
-<pre><tt>kill $( passenger-memory-stats | grep 'Passenger spawn server' | awk '{ print $1 }' )</tt></pre>
-</div></div>
-<div class="paragraph"><p>Killing the spawn server is completely safe, because Phusion Passenger will restart the
-spawn server if it has been terminated.</p></div>
-<h3 id="_moving_phusion_passenger_to_a_different_directory">8.4. Moving Phusion Passenger to a different directory</h3>
+<h3 id="moving_phusion_passenger">8.4. Moving Phusion Passenger to a different directory</h3>
 <div class="paragraph"><p>It is possible to relocate the Phusion Passenger files to a different directory. It
 involves two steps:</p></div>
 <div class="olist arabic"><ol class="arabic">
@@ -2676,14 +2694,7 @@ this command:</p></div>
 <div class="paragraph"><p>where <em>X.X.X</em> is the version number of Ruby on Rails.</p></div>
 <div class="paragraph"><p>All of these versions will exist in parallel, and will not conflict with each
 other. Phusion Passenger will automatically make use of the correct version.</p></div>
-<h3 id="_x_sendfile_support">8.6. X-Sendfile support</h3>
-<div class="paragraph"><p>Phusion Passenger does not provide X-Sendfile support by itself. Please install
-<a href="http://tn123.ath.cx/mod_xsendfile/">mod_xsendfile</a> for X-Sendfile support.</p></div>
-<h3 id="_upload_progress">8.7. Upload progress</h3>
-<div class="paragraph"><p>Phusion Passenger does not provide upload progress support by itself. Please
-try drogus&#8217;s <a href="http://github.com/drogus/apache-upload-progress-module/tree/master">
-Apache upload progress module</a> instead.</p></div>
-<h3 id="_making_the_application_restart_after_each_request">8.8. Making the application restart after each request</h3>
+<h3 id="_making_the_application_restart_after_each_request">8.6. Making the application restart after each request</h3>
 <div class="paragraph"><p>In some situations it might be desirable to restart the web application after
 each request, for example when developing a non-Rails application that doesn&#8217;t
 support code reloading, or when developing a web framework.</p></div>
@@ -2704,7 +2715,7 @@ or when you&#8217;re not developing a Rails application and your web framework
 does not support code reloading.</td>
 </tr></table>
 </div>
-<h3 id="sub_uri_deployment_uri_fix">8.9. How to fix broken images/CSS/JavaScript URIs in sub-URI deployments</h3>
+<h3 id="sub_uri_deployment_uri_fix">8.7. How to fix broken images/CSS/JavaScript URIs in sub-URI deployments</h3>
 <div class="paragraph"><p>Some people experience broken images and other broken static assets when they
 deploy their application to a sub-URI (i.e. <em>http://mysite.com/railsapp/</em>).
 The reason for this usually is that you used a
@@ -2739,6 +2750,13 @@ so that your images will always work no matter what sub-URI you&#8217;ve deploye
 append a timestamp to the URI to better facilitate HTTP caching. For more information,
 please refer to
 <a href="http://api.rubyonrails.org/classes/ActionView/Helpers/AssetTagHelper.html">the Rails API docs</a>.</p></div>
+<h3 id="_x_sendfile_support">8.8. X-Sendfile support</h3>
+<div class="paragraph"><p>Phusion Passenger does not provide X-Sendfile support by itself. Please install
+<a href="http://tn123.ath.cx/mod_xsendfile/">mod_xsendfile</a> for X-Sendfile support.</p></div>
+<h3 id="_upload_progress">8.9. Upload progress</h3>
+<div class="paragraph"><p>Phusion Passenger does not provide upload progress support by itself. Please
+try drogus&#8217;s <a href="http://github.com/drogus/apache-upload-progress-module/tree/master">
+Apache upload progress module</a> instead.</p></div>
 </div>
 <h2 id="_appendix_a_about_this_document">9. Appendix A: About this document</h2>
 <div class="sectionbody">
@@ -2964,12 +2982,12 @@ Passenger is creating a new worker process. Phusion Passenger provides the API
 call <tt>PhusionPassenger.on_event(:starting_worker_process)</tt> to do so. So you
 could insert the following code in your <em>environment.rb</em>:</p></div>
 <div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.4
+<div class="content"><!-- Generator: GNU source-highlight 2.11.1
 by Lorenzo Bettini
 http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
 <pre><tt><span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="font-weight: bold"><span style="color: #0000FF">defined</span></span><span style="color: #990000">?(</span>PhusionPassenger<span style="color: #990000">)</span>
-    PhusionPassenger<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #000000">on_event</span></span><span style="color: #990000">(:</span>starting_worker_process<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>forked<span style="color: #990000">|</span>
+    PhusionPassenger<span style="color: #990000">.</span>on_event<span style="color: #990000">(:</span>starting_worker_process<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>forked<span style="color: #990000">|</span>
         <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> forked
             <span style="font-style: italic"><span style="color: #9A1900"># We're in smart spawning mode.</span></span>
             <span style="color: #990000">...</span> code to reestablish socket connections here <span style="color: #990000">...</span>
@@ -3057,12 +3075,12 @@ Memcached is forced to handle this as an error.</p></div>
 <div class="paragraph"><p>Worker process 2 now has its own, separate communication channel with Memcached.
 The code in <em>environment.rb</em> looks like this:</p></div>
 <div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.4
+<div class="content"><!-- Generator: GNU source-highlight 2.11.1
 by Lorenzo Bettini
 http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
 <pre><tt><span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="font-weight: bold"><span style="color: #0000FF">defined</span></span><span style="color: #990000">?(</span>PhusionPassenger<span style="color: #990000">)</span>
-    PhusionPassenger<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #000000">on_event</span></span><span style="color: #990000">(:</span>starting_worker_process<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>forked<span style="color: #990000">|</span>
+    PhusionPassenger<span style="color: #990000">.</span>on_event<span style="color: #990000">(:</span>starting_worker_process<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>forked<span style="color: #990000">|</span>
         <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> forked
             <span style="font-style: italic"><span style="color: #9A1900"># We're in smart spawning mode.</span></span>
             reestablish_connection_to_memcached
@@ -3087,12 +3105,12 @@ then those threads will no longer be running in newly created worker process.
 You need to revive them when a new worker process is created. Use the
 <tt>:starting_worker_process</tt> event that Phusion Passenger provides, like this:</p></div>
 <div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 2.4
+<div class="content"><!-- Generator: GNU source-highlight 2.11.1
 by Lorenzo Bettini
 http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
 <pre><tt><span style="font-weight: bold"><span style="color: #0000FF">if</span></span> <span style="font-weight: bold"><span style="color: #0000FF">defined</span></span><span style="color: #990000">?(</span>PhusionPassenger<span style="color: #990000">)</span>
-    PhusionPassenger<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #000000">on_event</span></span><span style="color: #990000">(:</span>starting_worker_process<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>forked<span style="color: #990000">|</span>
+    PhusionPassenger<span style="color: #990000">.</span>on_event<span style="color: #990000">(:</span>starting_worker_process<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">do</span></span> <span style="color: #990000">|</span>forked<span style="color: #990000">|</span>
         <span style="font-weight: bold"><span style="color: #0000FF">if</span></span> forked
             <span style="font-style: italic"><span style="color: #9A1900"># We're in smart spawning mode.</span></span>
             <span style="color: #990000">...</span> code to revive threads here <span style="color: #990000">...</span>
@@ -3120,7 +3138,7 @@ has no effect.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-03-31 13:58:42 CEST
+Last updated 2009-04-16 19:42:11 CEST
 </div>
 </div>
 </body>