passenger 3.0.13 → 3.0.14

data/NEWS

@@ -1,3 +1,18 @@
+Release 3.0.14
+--------------
+
+ * [Apache] Fixed a long-standing mod_rewrite-related problem.
+   Some mod_rewrite rules would not work, but it depends on the exact
+   mod_rewrite configuration so it would work for some people but not
+   for others. Issue #563. Thanks a lot to cedricmaion for providing
+   information on the nature of the bug and to peter.nash55 for
+   providing a VM that allowed us to reproduce the problem.
+ * [Nginx] Preferred Nginx version to 1.2.2.
+   The previously preferred version was 1.2.1.
+ * Cleared some confusing terminology in the documentation.
+ * Fixed some Ruby 1.9 encoding problems.
+
+
 Release 3.0.13
 --------------
 

data/doc/Architectural overview.html

@@ -1504,7 +1504,7 @@ Attribution-Share Alike 3.0 Unported License</a>.</p></div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-06-14 09:44:52 CEST
+Last updated 2012-06-14 11:55:27 CEST
 </div>
 </div>
 <script>/*! jQuery v1.7.1 jquery.com | jquery.org/license */

data/doc/Users guide Apache.html

@@ -2492,9 +2492,9 @@ directory that’s readable by Apache, but only writable by administrators.</p><
 responses, protection is provided against slow HTTP clients that can not read your
 response immediately.</p></div>
 <div class="paragraph"><p>For example, consider an HTTP client that’s on a dial-up modem link, and your
-application instance generates a 2 MB response. If response buffering is turned
-off then your application instance will be blocked until the entire 2 MB has been
-sent out to the HTTP client. This disallows your application instance to do any useful
+application process generates a 2 MB response. If response buffering is turned
+off then your application process will be blocked until the entire 2 MB has been
+sent out to the HTTP client. This disallows your application process to do any useful
 work in the mean time. By enabling response buffering, Phusion Passenger will read
 the application response as quickly as possible and will take care of slow clients.</p></div>
 <div class="paragraph"><p>However, keep in mind that enabling this option will make streaming responses
@@ -2689,13 +2689,13 @@ In <em>.htaccess</em>, if <span class="monospaced">AllowOverride Options</span>
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="_resource_control_and_optimization_options" data-comment-topic="resource-control-and-optimization-options-zu2f7u">5.12. Resource control and optimization options</h3>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="_passengermaxpoolsize_lt_integer_gt" data-comment-topic="passengermaxpoolsize-integer--am64q8">5.12.1. PassengerMaxPoolSize &lt;integer&gt;</h4>
-<div class="paragraph"><p>The maximum number of Ruby on Rails or Rack application instances that may
-be simultaneously active. A larger number results in higher memory usage,
+<div class="paragraph"><p>The maximum number of <a href="#application_process">application processes</a> that may
+simultaneously exist. A larger number results in higher memory usage,
 but improved ability to handle concurrent HTTP clients.</p></div>
 <div class="paragraph"><p>The optimal value depends on your system’s hardware and the server’s average
 load. You should experiment with different values. But generally speaking,
 the value should be at least equal to the number of CPUs (or CPU cores) that
-you have. If your system has 2 GB of RAM, then we recommend a value of <em>30</em>.
+you have. If your system has 2 GB of RAM, then we recommend a value of <em>15</em>.
 If your system is a Virtual Private Server (VPS) and has about 256 MB RAM, and
 is also running other services such as MySQL, then we recommend a value of <em>2</em>.</p></div>
 <div class="paragraph"><p>If you find that your server is unable to handle the load on your Rails/Rack websites
@@ -2710,32 +2710,32 @@ The default value is <em>6</em>.</p></div>
 <img src="./images/icons/tip.png" alt="Tip">
 </td>
 <td class="content">We strongly recommend you to <a href="#reducing_memory_usage">use Ruby Enterprise Edition</a>. This allows you to reduce the memory usage of your Ruby on Rails applications
-by about 33%. And it’s not hard to install.</td>
+by about 33%, and it’s not hard to install.</td>
 </tr></table>
 </div>
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="PassengerMinInstances" data-comment-topic="passengermininstances-integer--wegq6b">5.12.2. PassengerMinInstances &lt;integer&gt;</h4>
-<div class="paragraph"><p>This specifies the minimum number of application instances that must be kept around
-whenever Phusion Passenger cleans up idle instances. You should set this option to a
+<div class="paragraph"><p>This specifies the minimum number of application processes that should exist for a
+given application. You should set this option to a
 non-zero value if you want to avoid potentially long startup times after a website
-has been idle for an extended period.</p></div>
-<div class="paragraph"><p>Please note that this option does <strong>not</strong> pre-start application instances during Apache
+has been <a href="#idle_process">idle</a> for an extended period.</p></div>
+<div class="paragraph"><p>Please note that this option does <strong>not</strong> pre-start application processes during Apache
 startup. It just makes sure that when the application is first accessed:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-at least the given number of instances will be spawned.
+at least the given number of processes will be spawned.
 </p>
 </li>
 <li>
 <p>
-the given number of processes will be kept around even when instances are being
+the given number of processes will be kept around even when processes are being
    idle cleaned (see <a href="#PassengerPoolIdleTime">PassengerPoolIdleTime</a>).
 </p>
 </li>
 </ol></div>
-<div class="paragraph"><p>If you want to pre-start application instances during Apache startup, then you should use the <a href="#PassengerPreStart">PassengerPreStart</a> directive, possibly in combination with
+<div class="paragraph"><p>If you want to pre-start application processes during Apache startup, then you should use the <a href="#PassengerPreStart">PassengerPreStart</a> directive, possibly in combination with
 <em>PassengerMinInstances</em>. This behavior might seem counter-intuitive at first sight,
 but <a href="#PassengerPreStart">PassengerPreStart</a> explains the rationale behind it.</p></div>
 <div class="paragraph"><p>For example, suppose that you have the following configuration:</p></div>
@@ -2751,15 +2751,15 @@ PassengerPoolIdleTime 10
 &lt;/VirtualHost&gt;</pre>
 </div>
 </div>
-<div class="paragraph"><p>When you start Apache, there are 0 application instances for <em>foobar.com</em>. Things will
+<div class="paragraph"><p>When you start Apache, there are 0 application processes for <em>foobar.com</em>. Things will
 stay that way until someone visits <em>foobar.com</em>. Suppose that there is only 1 visitor.
-1 application instance will be started immediately to serve the visitor, while 2 will
+1 application process will be started immediately to serve the visitor, while 2 will
 be spawned in the background. After 10 seconds, when the idle timeout has
-been reached, these 3 application instances will not be cleaned up.</p></div>
+been reached, these 3 application processes will not be cleaned up.</p></div>
 <div class="paragraph"><p>Now suppose that there’s a sudden spike of traffic, and 100 users visit <em>foobar.com</em>
-simultanously. Phusion Passenger will start 12 more application instances. After the idle
+simultanously. Phusion Passenger will start 12 more application processes. After the idle
 timeout of 10 seconds have passed, Phusion Passenger will clean up 12 application
-instances, keeping 3 instances around.</p></div>
+processes, keeping 3 processes around.</p></div>
 <div class="paragraph"><p>The PassengerMinInstances option may occur in the following places:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -2787,11 +2787,11 @@ In <em>.htaccess</em>, if <span class="monospaced">AllowOverride Limits</span> i
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="_passengermaxinstancesperapp_lt_integer_gt" data-comment-topic="passengermaxinstancesperapp-integer--1pteawn">5.12.3. PassengerMaxInstancesPerApp &lt;integer&gt;</h4>
-<div class="paragraph"><p>The maximum number of application instances that may be simultaneously active
+<div class="paragraph"><p>The maximum number of application processes that may simultaneously exist
 for a single application. This helps to make sure that a single application
 will not occupy all available slots in the application pool.</p></div>
 <div class="paragraph"><p>This value must be less than <a href="#PassengerMaxPoolSize">PassengerMaxPoolSize</a>. A value of 0
-means that there is no limit placed on the number of instances a single application
+means that there is no limit placed on the number of processes a single application
 may use, i.e. only the global limit of <a href="#PassengerMaxPoolSize">PassengerMaxPoolSize</a>
 will be enforced.</p></div>
 <div class="paragraph"><p>This option may only occur once, in the global server configuration.
@@ -2799,8 +2799,8 @@ The default value is <em>0</em>.</p></div>
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="PassengerPoolIdleTime" data-comment-topic="passengerpoolidletime-integer--a3gunq">5.12.4. PassengerPoolIdleTime &lt;integer&gt;</h4>
-<div class="paragraph"><p>The maximum number of seconds that an application instance may be idle. That is,
-if an application instance hasn’t received any traffic after the given number of
+<div class="paragraph"><p>The maximum number of seconds that an application process may be idle. That is,
+if an application process hasn’t received any traffic after the given number of
 seconds, then it will be shutdown in order to conserve memory.</p></div>
 <div class="paragraph"><p>Decreasing this value means that applications will have to be spawned
 more often. Since spawning is a relatively slow operation, some visitors may
@@ -2810,10 +2810,10 @@ free up resources used by applications more quickly.</p></div>
 Rails/Rack web page. We recommend a value of <span class="monospaced">2 * x</span>, where <span class="monospaced">x</span> is the average
 number of seconds that a visitor spends on a single Rails/Rack web page. But your
 mileage may vary.</p></div>
-<div class="paragraph"><p>When this value is set to <em>0</em>, application instances will not be shutdown unless
-it’s really necessary, i.e. when Phusion Passenger is out of worker processes
-for a given application and one of the inactive application instances needs to
-make place for another application instance. Setting the value to 0 is
+<div class="paragraph"><p>When this value is set to <em>0</em>, application processes will not be shutdown unless
+it’s really necessary, i.e. when Phusion Passenger is out of application processes
+for a given application and one of the <a href="#inactive_process">inactive application processes</a> needs to
+make place for another application process. Setting the value to 0 is
 recommended if you’re on a non-shared host that’s only running a few
 applications, each which must be available at all times.</p></div>
 <div class="paragraph"><p>This option may only occur once, in the global server configuration.
@@ -2821,10 +2821,10 @@ The default value is <em>300</em>.</p></div>
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="PassengerMaxRequests" data-comment-topic="passengermaxrequests-integer--ietgd0">5.12.5. PassengerMaxRequests &lt;integer&gt;</h4>
-<div class="paragraph"><p>The maximum number of requests an application instance will process. After
-serving that many requests, the application instance will be shut down and
+<div class="paragraph"><p>The maximum number of requests an application process will process. After
+serving that many requests, the application process will be shut down and
 Phusion Passenger will restart it. A value of 0 means that there is no maximum:
-an application instance will thus be shut down when its idle timeout has been
+an application process will thus be shut down when its idle timeout has been
 reached.</p></div>
 <div class="paragraph"><p>This option is useful if your application is leaking memory. By shutting
 it down after a certain number of requests, all of its memory is guaranteed
@@ -2921,11 +2921,11 @@ In <em>.htaccess</em>, if <span class="monospaced">AllowOverride Limits</span> i
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="PassengerPreStart" data-comment-topic="passengerprestart-url--1v76tcz">5.12.7. PassengerPreStart &lt;url&gt;</h4>
-<div class="paragraph"><p>By default, Phusion Passenger does not start any application instances until said
+<div class="paragraph"><p>By default, Phusion Passenger does not start any application processes until said
 web application is first accessed. The result is that the first visitor of said
 web application might experience a small delay as Phusion Passenger is starting
 the web application on demand. If that is undesirable, then this directive can be
-used to pre-started application instances during Apache startup.</p></div>
+used to pre-started application processes during Apache startup.</p></div>
 <div class="paragraph"><p>A few things to be careful of:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -2958,7 +2958,7 @@ The path part of the URL must point to some URI that the web application
 <li>
 <p>
 You will probably want to combine this option with
-  <a href="#PassengerMinInstances">PassengerMinInstances</a> because application instances
+  <a href="#PassengerMinInstances">PassengerMinInstances</a> because application processes
   started with <em>PassengerPreStart</em> are subject to the usual idle timeout rules.
   See the example below for an explanation.
 </p>
@@ -3050,10 +3050,10 @@ The following example is wrong and won’t pre-start the store web application:<
 </div>
 <div class="sect4">
 <h5 id="_example_3_combining_with_passengermininstances">Example 3: combining with PassengerMinInstances</h5>
-<div class="paragraph"><p>Application instances started with PassengerPreStart are
+<div class="paragraph"><p>Application processes started with PassengerPreStart are
 also subject to the idle timeout rules as specified by
 <a href="#PassengerPoolIdleTime">PassengerPoolIdleTime</a>! That means that by default,
-the pre-started application instances for foo.com are bar.com are shut down
+the pre-started application processes for foo.com are bar.com are shut down
 after a few minutes of inactivity. If you don’t want that to happen, then
 you should combine PassengerPreStart with
 <a href="#PassengerMinInstances">PassengerMinInstances</a>, like this:</p></div>
@@ -3062,13 +3062,15 @@ you should combine PassengerPreStart with
 <pre>&lt;VirtualHost *:80&gt;
    ServerName foo.com
    DocumentRoot /webapps/foo/public
-   PassengerMinInstances 1      # &lt;--- added
+   # Added!
+   PassengerMinInstances 1
 &lt;/VirtualHost&gt;
 
 &lt;VirtualHost *:3500&gt;
    ServerName bar.com
    DocumentRoot /webapps/bar/public
-   PassengerMinInstances 1      # &lt;--- added
+   # Added!
+   PassengerMinInstances 1
 &lt;/VirtualHost&gt;
 
 PassengerPreStart http://foo.com/
@@ -4899,6 +4901,14 @@ For example, take the following directory structure:</p></div>
 </div>
 </div>
 </div>
+<div class="sect2">
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="idle_process" data-comment-topic="idle-process-potb6g">11.2. Idle process</h3>
+<div class="paragraph"><p>An "idle process" refers to a process that hasn’t processed any requests for a while.</p></div>
+</div>
+<div class="sect2">
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="inactive_process" data-comment-topic="inactive-process-16gjv2e">11.3. Inactive process</h3>
+<div class="paragraph"><p>An "inactive process" refers to a process that’s current not processing any requests. An idle process is always inactive, but an inactive process is not always considered idle.</p></div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -5233,7 +5243,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-06-14 09:49:56 CEST
+Last updated 2012-07-21 20:27:37 CEST
 </div>
 </div>
 <script>/*! jQuery v1.7.1 jquery.com | jquery.org/license */

data/doc/Users guide Apache.idmap.txt

@@ -24,6 +24,10 @@
 
 11.1. Application root	=>	application-root-otx6xf
 
+11.2. Idle process	=>	idle-process-potb6g
+
+11.3. Inactive process	=>	inactive-process-16gjv2e
+
 12. Appendix C: Spawning methods explained	=>	appendix-c-spawning-methods-explained-owghi9
 
 12.1. The most straightforward and traditional way: conservative spawning	=>	the-most-straightforward-and-traditional-way-conservative-spawning-1ybbli2

data/doc/Users guide Apache.txt

@@ -922,9 +922,9 @@ responses, protection is provided against slow HTTP clients that can not read yo
 response immediately.
 
 For example, consider an HTTP client that's on a dial-up modem link, and your
-application instance generates a 2 MB response. If response buffering is turned
-off then your application instance will be blocked until the entire 2 MB has been
-sent out to the HTTP client. This disallows your application instance to do any useful
+application process generates a 2 MB response. If response buffering is turned
+off then your application process will be blocked until the entire 2 MB has been
+sent out to the HTTP client. This disallows your application process to do any useful
 work in the mean time. By enabling response buffering, Phusion Passenger will read
 the application response as quickly as possible and will take care of slow clients.
 
@@ -1063,14 +1063,14 @@ In each place, it may be specified at most once. The default value is 'on'.
 === Resource control and optimization options ===
 
 ==== PassengerMaxPoolSize <integer> ====
-The maximum number of Ruby on Rails or Rack application instances that may
-be simultaneously active. A larger number results in higher memory usage,
+The maximum number of <<application_process,application processes>> that may
+simultaneously exist. A larger number results in higher memory usage,
 but improved ability to handle concurrent HTTP clients.
 
 The optimal value depends on your system's hardware and the server's average
 load. You should experiment with different values. But generally speaking,
 the value should be at least equal to the number of CPUs (or CPU cores) that
-you have. If your system has 2 GB of RAM, then we recommend a value of '30'.
+you have. If your system has 2 GB of RAM, then we recommend a value of '15'.
 If your system is a Virtual Private Server (VPS) and has about 256 MB RAM, and
 is also running other services such as MySQL, then we recommend a value of '2'.
 
@@ -1084,23 +1084,23 @@ The default value is '6'.
 
 TIP: We strongly recommend you to <<reducing_memory_usage,use Ruby Enterprise
 Edition>>. This allows you to reduce the memory usage of your Ruby on Rails applications
-by about 33%. And it's not hard to install.
+by about 33%, and it's not hard to install.
 
 [[PassengerMinInstances]]
 ==== PassengerMinInstances <integer> ====
-This specifies the minimum number of application instances that must be kept around
-whenever Phusion Passenger cleans up idle instances. You should set this option to a
+This specifies the minimum number of application processes that should exist for a
+given application. You should set this option to a
 non-zero value if you want to avoid potentially long startup times after a website
-has been idle for an extended period.
+has been <<idle_process,idle>> for an extended period.
 
-Please note that this option does *not* pre-start application instances during Apache
+Please note that this option does *not* pre-start application processes during Apache
 startup. It just makes sure that when the application is first accessed:
 
-1. at least the given number of instances will be spawned.
-2. the given number of processes will be kept around even when instances are being
+1. at least the given number of processes will be spawned.
+2. the given number of processes will be kept around even when processes are being
    idle cleaned (see <<PassengerPoolIdleTime,PassengerPoolIdleTime>>).
 
-If you want to pre-start application instances during Apache startup, then you should use the <<PassengerPreStart,PassengerPreStart>> directive, possibly in combination with
+If you want to pre-start application processes during Apache startup, then you should use the <<PassengerPreStart,PassengerPreStart>> directive, possibly in combination with
 'PassengerMinInstances'. This behavior might seem counter-intuitive at first sight,
 but <<PassengerPreStart,PassengerPreStart>> explains the rationale behind it.
 
@@ -1117,16 +1117,16 @@ PassengerPoolIdleTime 10
 </VirtualHost>
 ---------------------------------
 
-When you start Apache, there are 0 application instances for 'foobar.com'. Things will
+When you start Apache, there are 0 application processes for 'foobar.com'. Things will
 stay that way until someone visits 'foobar.com'. Suppose that there is only 1 visitor.
-1 application instance will be started immediately to serve the visitor, while 2 will
+1 application process will be started immediately to serve the visitor, while 2 will
 be spawned in the background. After 10 seconds, when the idle timeout has
-been reached, these 3 application instances will not be cleaned up.
+been reached, these 3 application processes will not be cleaned up.
 
 Now suppose that there's a sudden spike of traffic, and 100 users visit 'foobar.com'
-simultanously. Phusion Passenger will start 12 more application instances. After the idle
+simultanously. Phusion Passenger will start 12 more application processes. After the idle
 timeout of 10 seconds have passed, Phusion Passenger will clean up 12 application
-instances, keeping 3 instances around.
+processes, keeping 3 processes around.
 
 The PassengerMinInstances option may occur in the following places:
 
@@ -1138,12 +1138,12 @@ The PassengerMinInstances option may occur in the following places:
 In each place, it may be specified at most once. The default value is '1'.
 
 ==== PassengerMaxInstancesPerApp <integer> ====
-The maximum number of application instances that may be simultaneously active
+The maximum number of application processes that may simultaneously exist
 for a single application. This helps to make sure that a single application
 will not occupy all available slots in the application pool.
 
 This value must be less than <<PassengerMaxPoolSize,PassengerMaxPoolSize>>. A value of 0
-means that there is no limit placed on the number of instances a single application
+means that there is no limit placed on the number of processes a single application
 may use, i.e. only the global limit of <<PassengerMaxPoolSize,PassengerMaxPoolSize>>
 will be enforced.
 
@@ -1152,8 +1152,8 @@ The default value is '0'.
 
 [[PassengerPoolIdleTime]]
 ==== PassengerPoolIdleTime <integer> ====
-The maximum number of seconds that an application instance may be idle. That is,
-if an application instance hasn't received any traffic after the given number of
+The maximum number of seconds that an application process may be idle. That is,
+if an application process hasn't received any traffic after the given number of
 seconds, then it will be shutdown in order to conserve memory.
 
 Decreasing this value means that applications will have to be spawned
@@ -1166,10 +1166,10 @@ Rails/Rack web page. We recommend a value of `2 * x`, where `x` is the average
 number of seconds that a visitor spends on a single Rails/Rack web page. But your
 mileage may vary.
 
-When this value is set to '0', application instances will not be shutdown unless 
-it's really necessary, i.e. when Phusion Passenger is out of worker processes
-for a given application and one of the inactive application instances needs to
-make place for another application instance. Setting the value to 0 is
+When this value is set to '0', application processes will not be shutdown unless 
+it's really necessary, i.e. when Phusion Passenger is out of application processes
+for a given application and one of the <<inactive_process,inactive application processes>> needs to
+make place for another application process. Setting the value to 0 is
 recommended if you're on a non-shared host that's only running a few
 applications, each which must be available at all times.
 
@@ -1178,10 +1178,10 @@ The default value is '300'.
 
 [[PassengerMaxRequests]]
 ==== PassengerMaxRequests <integer> ====
-The maximum number of requests an application instance will process. After
-serving that many requests, the application instance will be shut down and
+The maximum number of requests an application process will process. After
+serving that many requests, the application process will be shut down and
 Phusion Passenger will restart it. A value of 0 means that there is no maximum:
-an application instance will thus be shut down when its idle timeout has been
+an application process will thus be shut down when its idle timeout has been
 reached.
 
 This option is useful if your application is leaking memory. By shutting
@@ -1236,11 +1236,11 @@ In each place, it may be specified at most once. The default value is '0'.
 
 [[PassengerPreStart]]
 ==== PassengerPreStart <url> ====
-By default, Phusion Passenger does not start any application instances until said
+By default, Phusion Passenger does not start any application processes until said
 web application is first accessed. The result is that the first visitor of said
 web application might experience a small delay as Phusion Passenger is starting
 the web application on demand. If that is undesirable, then this directive can be
-used to pre-started application instances during Apache startup.
+used to pre-started application processes during Apache startup.
 
 A few things to be careful of:
 
@@ -1254,7 +1254,7 @@ A few things to be careful of:
   * The path part of the URL must point to some URI that the web application
     handles.
 - You will probably want to combine this option with
-  <<PassengerMinInstances,PassengerMinInstances>> because application instances
+  <<PassengerMinInstances,PassengerMinInstances>> because application processes
   started with 'PassengerPreStart' are subject to the usual idle timeout rules.
   See the example below for an explanation.
 
@@ -1335,10 +1335,10 @@ PassengerPreStart http://myblog.com/    # <----- WRONG! Missing "/store" part.
 
 ===== Example 3: combining with PassengerMinInstances =====
 
-Application instances started with PassengerPreStart are
+Application processes started with PassengerPreStart are
 also subject to the idle timeout rules as specified by
 <<PassengerPoolIdleTime,PassengerPoolIdleTime>>! That means that by default,
-the pre-started application instances for foo.com are bar.com are shut down
+the pre-started application processes for foo.com are bar.com are shut down
 after a few minutes of inactivity. If you don't want that to happen, then
 you should combine PassengerPreStart with
 <<PassengerMinInstances,PassengerMinInstances>>, like this:
@@ -1347,13 +1347,15 @@ you should combine PassengerPreStart with
 <VirtualHost *:80>
    ServerName foo.com
    DocumentRoot /webapps/foo/public
-   PassengerMinInstances 1      # <--- added
+   # Added!
+   PassengerMinInstances 1
 </VirtualHost>
 
 <VirtualHost *:3500>
    ServerName bar.com
    DocumentRoot /webapps/bar/public
-   PassengerMinInstances 1      # <--- added
+   # Added!
+   PassengerMinInstances 1
 </VirtualHost>
 
 PassengerPreStart http://foo.com/

data/doc/Users guide Nginx.html

@@ -2276,9 +2276,9 @@ disk if the response is larger than a certain threshold. By buffering responses,
 protection is provided against slow HTTP clients that can not read your response
 immediately.</p></div>
 <div class="paragraph"><p>For example, consider an HTTP client that’s on a dial-up modem link, and your
-application instance generates a 2 MB response. If response buffering is turned
-off then your application instance will be blocked until the entire 2 MB has been
-sent out to the HTTP client. This disallows your application instance to do any useful
+application process generates a 2 MB response. If response buffering is turned
+off then your application process will be blocked until the entire 2 MB has been
+sent out to the HTTP client. This disallows your application process to do any useful
 work in the mean time. By enabling response buffering, Phusion Passenger will read
 the application response as quickly as possible and will take care of slow clients.</p></div>
 <div class="paragraph"><p>However, keep in mind that enabling this option will make streaming responses
@@ -2484,13 +2484,13 @@ In an <em>if</em> configuration scope.
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="_resource_control_and_optimization_options" data-comment-topic="resource-control-and-optimization-options-xd7evs">5.7. Resource control and optimization options</h3>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="PassengerMaxPoolSize" data-comment-topic="passenger-max-pool-size-integer--3jzefs">5.7.1. passenger_max_pool_size &lt;integer&gt;</h4>
-<div class="paragraph"><p>The maximum number of Ruby on Rails or Rack application instances that may
-be simultaneously active. A larger number results in higher memory usage,
+<div class="paragraph"><p>The maximum number of <a href="#application_process">application processes</a> that may
+simultanously exist. A larger number results in higher memory usage,
 but improved ability to handle concurrent HTTP clients.</p></div>
 <div class="paragraph"><p>The optimal value depends on your system’s hardware and the server’s average
 load. You should experiment with different values. But generally speaking,
 the value should be at least equal to the number of CPUs (or CPU cores) that
-you have. If your system has 2 GB of RAM, then we recommend a value of <em>30</em>.
+you have. If your system has 2 GB of RAM, then we recommend a value of <em>15</em>.
 If your system is a Virtual Private Server (VPS) and has about 256 MB RAM, and
 is also running other services such as MySQL, then we recommend a value of <em>2</em>.</p></div>
 <div class="paragraph"><p>If you find that your server is unable to handle the load on your Rails/Rack websites
@@ -2505,32 +2505,32 @@ The default value is <em>6</em>.</p></div>
 <img src="./images/icons/tip.png" alt="Tip">
 </td>
 <td class="content">We strongly recommend you to <a href="#reducing_memory_usage">use Ruby Enterprise Edition</a>. This allows you to reduce the memory usage of your Ruby on Rails applications
-by about 33%. And it’s not hard to install.</td>
+by about 33%, and it’s not hard to install.</td>
 </tr></table>
 </div>
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="PassengerMinInstances" data-comment-topic="passenger-min-instances-integer--uclykt">5.7.2. passenger_min_instances &lt;integer&gt;</h4>
-<div class="paragraph"><p>This specifies the minimum number of application instances that must be kept around
-whenever Phusion Passenger cleans up idle instances. You should set this option to a
+<div class="paragraph"><p>This specifies the minimum number of application processes that should exist for a
+given application. You should set this option to a
 non-zero value if you want to avoid potentially long startup times after a website
-has been idle for an extended period.</p></div>
-<div class="paragraph"><p>Please note that this option does <strong>not</strong> pre-start application instances during Nginx
+has been <a href="#idle_process">idle</a> for an extended period.</p></div>
+<div class="paragraph"><p>Please note that this option does <strong>not</strong> pre-start application processes during Nginx
 startup. It just makes sure that when the application is first accessed:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-at least the given number of instances will be spawned.
+at least the given number of processes will be spawned.
 </p>
 </li>
 <li>
 <p>
-the given number of processes will be kept around even when instances are being
+the given number of processes will be kept around even when processes are being
    idle cleaned (see <a href="#PassengerPoolIdleTime">passenger_pool_idle_time</a>).
 </p>
 </li>
 </ol></div>
-<div class="paragraph"><p>If you want to pre-start application instances during Nginx startup, then you should use the <a href="#PassengerPreStart">passenger_pre_start</a> directive, possibly in combination with
+<div class="paragraph"><p>If you want to pre-start application processes during Nginx startup, then you should use the <a href="#PassengerPreStart">passenger_pre_start</a> directive, possibly in combination with
 <em>passenger_min_instances</em>. This behavior might seem counter-intuitive at first sight,
 but <a href="#PassengerPreStart">passenger_pre_start</a> explains the rationale behind it.</p></div>
 <div class="paragraph"><p>For example, suppose that you have the following configuration:</p></div>
@@ -2550,15 +2550,15 @@ but <a href="#PassengerPreStart">passenger_pre_start</a> explains the rationale
 }</pre>
 </div>
 </div>
-<div class="paragraph"><p>When you start Nginx, there are 0 application instances for <em>foobar.com</em>. Things will
+<div class="paragraph"><p>When you start Nginx, there are 0 application processes for <em>foobar.com</em>. Things will
 stay that way until someone visits <em>foobar.com</em>. Suppose that there is only 1 visitor.
-1 application instance will be started immediately to serve the visitor, while 2 will
+1 application process will be started immediately to serve the visitor, while 2 will
 be spawned in the background. After 10 seconds, when the idle timeout has
-been reached, these 3 application instances will not be cleaned up.</p></div>
+been reached, these 3 application processes will not be cleaned up.</p></div>
 <div class="paragraph"><p>Now suppose that there’s a sudden spike of traffic, and 100 users visit <em>foobar.com</em>
-simultanously. Phusion Passenger will start 12 more application instances. After the idle
+simultanously. Phusion Passenger will start 12 more application processes. After the idle
 timeout of 10 seconds have passed, Phusion Passenger will clean up 12 application
-instances, keeping 3 instances around.</p></div>
+processes, keeping 3 processes around.</p></div>
 <div class="paragraph"><p>The passenger_min_instances option may occur in the following places:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -2586,11 +2586,11 @@ In an <em>if</em> configuration scope.
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="_passenger_max_instances_per_app_lt_integer_gt" data-comment-topic="passenger-max-instances-per-app-integer--1p7q3cf">5.7.3. passenger_max_instances_per_app &lt;integer&gt;</h4>
-<div class="paragraph"><p>The maximum number of application instances that may be simultaneously active
+<div class="paragraph"><p>The maximum number of application processes that may simultaneously exist
 for a single application. This helps to make sure that a single application
 will not occupy all available slots in the application pool.</p></div>
 <div class="paragraph"><p>This value must be less than <a href="#PassengerMaxPoolSize">passenger_max_pool_size</a>. A value of 0
-means that there is no limit placed on the number of instances a single application
+means that there is no limit placed on the number of processes a single application
 may use, i.e. only the global limit of <a href="#PassengerMaxPoolSize">passenger_max_pool_size</a>
 will be enforced.</p></div>
 <div class="paragraph"><p>This option may only occur once, in the <em>http</em> configuration block.
@@ -2598,8 +2598,8 @@ The default value is <em>0</em>.</p></div>
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="PassengerPoolIdleTime" data-comment-topic="passenger-pool-idle-time-integer--xcw65o">5.7.4. passenger_pool_idle_time &lt;integer&gt;</h4>
-<div class="paragraph"><p>The maximum number of seconds that an application instance may be idle. That is,
-if an application instance hasn’t received any traffic after the given number of
+<div class="paragraph"><p>The maximum number of seconds that an application process may be idle. That is,
+if an application process hasn’t received any traffic after the given number of
 seconds, then it will be shutdown in order to conserve memory.</p></div>
 <div class="paragraph"><p>Decreasing this value means that applications will have to be spawned
 more often. Since spawning is a relatively slow operation, some visitors may
@@ -2609,10 +2609,10 @@ free up resources used by applications more quickly.</p></div>
 Rails/Rack web page. We recommend a value of <span class="monospaced">2 * x</span>, where <span class="monospaced">x</span> is the average
 number of seconds that a visitor spends on a single Rails/Rack web page. But your
 mileage may vary.</p></div>
-<div class="paragraph"><p>When this value is set to <em>0</em>, application instances will not be shutdown unless
+<div class="paragraph"><p>When this value is set to <em>0</em>, application processes will not be shutdown unless
 it’s really necessary, i.e. when Phusion Passenger is out of worker processes
-for a given application and one of the inactive application instances needs to
-make place for another application instance. Setting the value to 0 is
+for a given application and one of the <a href="#inactive_process">inactive application processes</a> needs to
+make place for another application process. Setting the value to 0 is
 recommended if you’re on a non-shared host that’s only running a few
 applications, each which must be available at all times.</p></div>
 <div class="paragraph"><p>This option may only occur once, in the <em>http</em> configuration block.
@@ -2620,10 +2620,10 @@ The default value is <em>300</em>.</p></div>
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="PassengerMaxRequests" data-comment-topic="passenger-max-requests-integer--sgzint">5.7.5. passenger_max_requests &lt;integer&gt;</h4>
-<div class="paragraph"><p>The maximum number of requests an application instance will process. After
-serving that many requests, the application instance will be shut down and
+<div class="paragraph"><p>The maximum number of requests an application process will process. After
+serving that many requests, the application process will be shut down and
 Phusion Passenger will restart it. A value of 0 means that there is no maximum:
-an application instance will thus be shut down when its idle timeout has been
+an application process will thus be shut down when its idle timeout has been
 reached.</p></div>
 <div class="paragraph"><p>This option is useful if your application is leaking memory. By shutting
 it down after a certain number of requests, all of its memory is guaranteed
@@ -2668,11 +2668,11 @@ measure to avoid memory leaks.</p></div>
 </div>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="PassengerPreStart" data-comment-topic="passenger-pre-start-url--qeevln">5.7.6. passenger_pre_start &lt;url&gt;</h4>
-<div class="paragraph"><p>By default, Phusion Passenger does not start any application instances until said
+<div class="paragraph"><p>By default, Phusion Passenger does not start any application processes until said
 web application is first accessed. The result is that the first visitor of said
 web application might experience a small delay as Phusion Passenger is starting
 the web application on demand. If that is undesirable, then this directive can be
-used to pre-started application instances during Nginx startup.</p></div>
+used to pre-started application processes during Nginx startup.</p></div>
 <div class="paragraph"><p>A few things to be careful of:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -2705,7 +2705,7 @@ The path part of the URL must point to some URI that the web application
 <li>
 <p>
 You will probably want to combine this option with
-  <a href="#PassengerMinInstances">passenger_min_instances</a> because application instances
+  <a href="#PassengerMinInstances">passenger_min_instances</a> because application processes
   started with <em>passenger_pre_start</em> are subject to the usual idle timeout rules.
   See the example below for an explanation.
 </p>
@@ -2794,10 +2794,10 @@ The following example is wrong and won’t pre-start the store web application:<
 </div>
 <div class="sect4">
 <h5 id="_example_3_combining_with_passenger_min_instances">Example 3: combining with passenger_min_instances</h5>
-<div class="paragraph"><p>Application instances started with passenger_pre_start are
+<div class="paragraph"><p>Application processes started with passenger_pre_start are
 also subject to the idle timeout rules as specified by
 <a href="#PassengerPoolIdleTime">passenger_pool_idle_time</a>! That means that by default,
-the pre-started application instances for foo.com are bar.com are shut down
+the pre-started application processes for foo.com are bar.com are shut down
 after a few minutes of inactivity. If you don’t want that to happen, then
 you should combine passenger_pre_start with
 <a href="#PassengerMinInstances">passenger_min_instances</a>, like this:</p></div>
@@ -3757,6 +3757,14 @@ For example, take the following directory structure:</p></div>
 </div>
 </div>
 </div>
+<div class="sect2">
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="idle_process" data-comment-topic="idle-process-13byfw9">10.2. Idle process</h3>
+<div class="paragraph"><p>An "idle process" refers to a process that hasn’t processed any requests for a while.</p></div>
+</div>
+<div class="sect2">
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="inactive_process" data-comment-topic="inactive-process-1d2h0po">10.3. Inactive process</h3>
+<div class="paragraph"><p>An "inactive process" refers to a process that’s current not processing any requests. An idle process is always inactive, but an inactive process is not always considered idle.</p></div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -4091,7 +4099,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-06-14 09:44:53 CEST
+Last updated 2012-07-21 20:27:37 CEST
 </div>
 </div>
 <script>/*! jQuery v1.7.1 jquery.com | jquery.org/license */

data/doc/Users guide Nginx.idmap.txt

@@ -22,6 +22,10 @@
 
 10.1. Application root	=>	application-root-1fd6bqv
 
+10.2. Idle process	=>	idle-process-13byfw9
+
+10.3. Inactive process	=>	inactive-process-1d2h0po
+
 11. Appendix C: Spawning methods explained	=>	appendix-c-spawning-methods-explained-tcp8e6
 
 11.1. The most straightforward and traditional way: conservative spawning	=>	the-most-straightforward-and-traditional-way-conservative-spawning-civ29z

data/doc/Users guide Nginx.txt

@@ -774,9 +774,9 @@ protection is provided against slow HTTP clients that can not read your response
 immediately.
 
 For example, consider an HTTP client that's on a dial-up modem link, and your
-application instance generates a 2 MB response. If response buffering is turned
-off then your application instance will be blocked until the entire 2 MB has been
-sent out to the HTTP client. This disallows your application instance to do any useful
+application process generates a 2 MB response. If response buffering is turned
+off then your application process will be blocked until the entire 2 MB has been
+sent out to the HTTP client. This disallows your application process to do any useful
 work in the mean time. By enabling response buffering, Phusion Passenger will read
 the application response as quickly as possible and will take care of slow clients.
 
@@ -915,14 +915,14 @@ In each place, it may be specified at most once. The default value is 'on'.
 === Resource control and optimization options ===
 [[PassengerMaxPoolSize]]
 ==== passenger_max_pool_size <integer> ====
-The maximum number of Ruby on Rails or Rack application instances that may
-be simultaneously active. A larger number results in higher memory usage,
+The maximum number of <<application_process,application processes>> that may
+simultanously exist. A larger number results in higher memory usage,
 but improved ability to handle concurrent HTTP clients.
 
 The optimal value depends on your system's hardware and the server's average
 load. You should experiment with different values. But generally speaking,
 the value should be at least equal to the number of CPUs (or CPU cores) that
-you have. If your system has 2 GB of RAM, then we recommend a value of '30'.
+you have. If your system has 2 GB of RAM, then we recommend a value of '15'.
 If your system is a Virtual Private Server (VPS) and has about 256 MB RAM, and
 is also running other services such as MySQL, then we recommend a value of '2'.
 
@@ -936,23 +936,23 @@ The default value is '6'.
 
 TIP: We strongly recommend you to <<reducing_memory_usage,use Ruby Enterprise
 Edition>>. This allows you to reduce the memory usage of your Ruby on Rails applications
-by about 33%. And it's not hard to install.
+by about 33%, and it's not hard to install.
 
 [[PassengerMinInstances]]
 ==== passenger_min_instances <integer> ====
-This specifies the minimum number of application instances that must be kept around
-whenever Phusion Passenger cleans up idle instances. You should set this option to a
+This specifies the minimum number of application processes that should exist for a
+given application. You should set this option to a
 non-zero value if you want to avoid potentially long startup times after a website
-has been idle for an extended period.
+has been <<idle_process,idle>> for an extended period.
 
-Please note that this option does *not* pre-start application instances during Nginx
+Please note that this option does *not* pre-start application processes during Nginx
 startup. It just makes sure that when the application is first accessed:
 
-1. at least the given number of instances will be spawned.
-2. the given number of processes will be kept around even when instances are being
+1. at least the given number of processes will be spawned.
+2. the given number of processes will be kept around even when processes are being
    idle cleaned (see <<PassengerPoolIdleTime,passenger_pool_idle_time>>).
 
-If you want to pre-start application instances during Nginx startup, then you should use the <<PassengerPreStart,passenger_pre_start>> directive, possibly in combination with
+If you want to pre-start application processes during Nginx startup, then you should use the <<PassengerPreStart,passenger_pre_start>> directive, possibly in combination with
 'passenger_min_instances'. This behavior might seem counter-intuitive at first sight,
 but <<PassengerPreStart,passenger_pre_start>> explains the rationale behind it.
 
@@ -973,16 +973,16 @@ http {
 }
 ---------------------------------
 
-When you start Nginx, there are 0 application instances for 'foobar.com'. Things will
+When you start Nginx, there are 0 application processes for 'foobar.com'. Things will
 stay that way until someone visits 'foobar.com'. Suppose that there is only 1 visitor.
-1 application instance will be started immediately to serve the visitor, while 2 will
+1 application process will be started immediately to serve the visitor, while 2 will
 be spawned in the background. After 10 seconds, when the idle timeout has
-been reached, these 3 application instances will not be cleaned up.
+been reached, these 3 application processes will not be cleaned up.
 
 Now suppose that there's a sudden spike of traffic, and 100 users visit 'foobar.com'
-simultanously. Phusion Passenger will start 12 more application instances. After the idle
+simultanously. Phusion Passenger will start 12 more application processes. After the idle
 timeout of 10 seconds have passed, Phusion Passenger will clean up 12 application
-instances, keeping 3 instances around.
+processes, keeping 3 processes around.
 
 The passenger_min_instances option may occur in the following places:
 
@@ -994,12 +994,12 @@ The passenger_min_instances option may occur in the following places:
 In each place, it may be specified at most once. The default value is '1'.
 
 ==== passenger_max_instances_per_app <integer> ====
-The maximum number of application instances that may be simultaneously active
+The maximum number of application processes that may simultaneously exist
 for a single application. This helps to make sure that a single application
 will not occupy all available slots in the application pool.
 
 This value must be less than <<PassengerMaxPoolSize,passenger_max_pool_size>>. A value of 0
-means that there is no limit placed on the number of instances a single application
+means that there is no limit placed on the number of processes a single application
 may use, i.e. only the global limit of <<PassengerMaxPoolSize,passenger_max_pool_size>>
 will be enforced.
 
@@ -1008,8 +1008,8 @@ The default value is '0'.
 
 [[PassengerPoolIdleTime]]
 ==== passenger_pool_idle_time <integer> ====
-The maximum number of seconds that an application instance may be idle. That is,
-if an application instance hasn't received any traffic after the given number of
+The maximum number of seconds that an application process may be idle. That is,
+if an application process hasn't received any traffic after the given number of
 seconds, then it will be shutdown in order to conserve memory.
 
 Decreasing this value means that applications will have to be spawned
@@ -1022,10 +1022,10 @@ Rails/Rack web page. We recommend a value of `2 * x`, where `x` is the average
 number of seconds that a visitor spends on a single Rails/Rack web page. But your
 mileage may vary.
 
-When this value is set to '0', application instances will not be shutdown unless 
+When this value is set to '0', application processes will not be shutdown unless 
 it's really necessary, i.e. when Phusion Passenger is out of worker processes
-for a given application and one of the inactive application instances needs to
-make place for another application instance. Setting the value to 0 is
+for a given application and one of the <<inactive_process,inactive application processes>> needs to
+make place for another application process. Setting the value to 0 is
 recommended if you're on a non-shared host that's only running a few
 applications, each which must be available at all times.
 
@@ -1034,10 +1034,10 @@ The default value is '300'.
 
 [[PassengerMaxRequests]]
 ==== passenger_max_requests <integer> ====
-The maximum number of requests an application instance will process. After
-serving that many requests, the application instance will be shut down and
+The maximum number of requests an application process will process. After
+serving that many requests, the application process will be shut down and
 Phusion Passenger will restart it. A value of 0 means that there is no maximum:
-an application instance will thus be shut down when its idle timeout has been
+an application process will thus be shut down when its idle timeout has been
 reached.
 
 This option is useful if your application is leaking memory. By shutting
@@ -1063,11 +1063,11 @@ measure to avoid memory leaks.
 
 [[PassengerPreStart]]
 ==== passenger_pre_start <url> ====
-By default, Phusion Passenger does not start any application instances until said
+By default, Phusion Passenger does not start any application processes until said
 web application is first accessed. The result is that the first visitor of said
 web application might experience a small delay as Phusion Passenger is starting
 the web application on demand. If that is undesirable, then this directive can be
-used to pre-started application instances during Nginx startup.
+used to pre-started application processes during Nginx startup.
 
 A few things to be careful of:
 
@@ -1081,7 +1081,7 @@ A few things to be careful of:
   * The path part of the URL must point to some URI that the web application
     handles.
 - You will probably want to combine this option with
-  <<PassengerMinInstances,passenger_min_instances>> because application instances
+  <<PassengerMinInstances,passenger_min_instances>> because application processes
   started with 'passenger_pre_start' are subject to the usual idle timeout rules.
   See the example below for an explanation.
 
@@ -1167,10 +1167,10 @@ passenger_pre_start http://myblog.com/;    # <----- WRONG! Missing "/store" part
 
 ===== Example 3: combining with passenger_min_instances =====
 
-Application instances started with passenger_pre_start are
+Application processes started with passenger_pre_start are
 also subject to the idle timeout rules as specified by
 <<PassengerPoolIdleTime,passenger_pool_idle_time>>! That means that by default,
-the pre-started application instances for foo.com are bar.com are shut down
+the pre-started application processes for foo.com are bar.com are shut down
 after a few minutes of inactivity. If you don't want that to happen, then
 you should combine passenger_pre_start with
 <<PassengerMinInstances,passenger_min_instances>>, like this:

data/doc/users_guide_snippets/appendix_b_terminology.txt

@@ -61,3 +61,11 @@ In case of Python (WSGI) applications, this is the directory that contains
    |
    +- ...
 -----------------------------------------
+
+[[idle_process]]
+=== Idle process ===
+An "idle process" refers to a process that hasn't processed any requests for a while.
+
+[[inactive_process]]
+=== Inactive process ===
+An "inactive process" refers to a process that's current not processing any requests. An idle process is always inactive, but an inactive process is not always considered idle.

data/ext/apache2/Hooks.cpp

@@ -159,6 +159,7 @@ private:
 		char *filenameBeforeModRewrite;
 		apr_filetype_e oldFileType;
 		const char *handlerBeforeModAutoIndex;
+		bool enabled;
 		
 		RequestNote(const DirectoryMapper &m, DirConfig *c)
 			: mapper(m),
@@ -169,6 +170,7 @@ private:
 			filenameBeforeModRewrite  = NULL;
 			oldFileType               = APR_NOFILE;
 			handlerBeforeModAutoIndex = NULL;
+			enabled                   = true;
 		}
 		
 		~RequestNote() {
@@ -239,9 +241,25 @@ private:
 	 * The existance of a request note means that the handler should be run.
 	 */
 	inline RequestNote *getRequestNote(request_rec *r) {
-		void *note = 0;
-		apr_pool_userdata_get(&note, "Phusion Passenger", r->pool);
-		return (RequestNote *) note;
+		void *pointer = 0;
+		apr_pool_userdata_get(&pointer, "Phusion Passenger", r->pool);
+		if (pointer != NULL) {
+			RequestNote *note = (RequestNote *) pointer;
+			if (OXT_LIKELY(note->enabled)) {
+				return note;
+			} else {
+				return 0;
+			}
+		} else {
+			return 0;
+		}
+	}
+
+	void disableRequestNote(request_rec *r) {
+		RequestNote *note = getRequestNote(r);
+		if (note != NULL) {
+			note->enabled = false;
+		}
 	}
 	
 	/**
@@ -418,6 +436,7 @@ private:
 		try {
 			if (mapper.getBaseURI() == NULL) {
 				// (B) is not true.
+				disableRequestNote(r);
 				return false;
 			}
 		} catch (const FileSystemException &e) {
@@ -441,6 +460,7 @@ private:
 					RequestNote::cleanup, r->pool);
 				return true;
 			} else {
+				disableRequestNote(r);
 				return false;
 			}
 		}
@@ -451,6 +471,7 @@ private:
 			FileType fileType = getFileType(filename);
 			if (fileType == FT_REGULAR) {
 				// (C) is true.
+				disableRequestNote(r);
 				return false;
 			}
 			
@@ -511,6 +532,7 @@ private:
 			 * don't let the handler hook run so that Apache can decide how
 			 * to display the error.
 			 */
+			disableRequestNote(r);
 			return false;
 		}
 	}
@@ -776,7 +798,7 @@ private:
 				ap_pass_brigade(r->output_filters, bb);
 				
 				if (r->connection->aborted) {
-					P_WARN("Either the vistor clicked on the 'Stop' button in the "
+					P_WARN("Either the visitor clicked on the 'Stop' button in the "
 						"web browser, or the visitor's connection has stalled "
 						"and couldn't receive the data that Apache is sending "
 						"to it. As a result, you will probably see a 'Broken Pipe' "

data/ext/common/Constants.h

@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.0.13"
+#define PASSENGER_VERSION "3.0.14"
 
 #define FEEDBACK_FD 3
 

data/lib/phusion_passenger.rb

@@ -25,9 +25,9 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.13'
+	VERSION_STRING = '3.0.14'
 	
-	PREFERRED_NGINX_VERSION = '1.2.1'
+	PREFERRED_NGINX_VERSION = '1.2.2'
 	PREFERRED_PCRE_VERSION  = '8.30'
 	STANDALONE_INTERFACE_VERSION  = 1
 	

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -1,3 +1,5 @@
+#  encoding: utf-8
+#
 #  Phusion Passenger - http://www.modrails.com/
 #  Copyright (c) 2010 Phusion
 #
@@ -251,6 +253,7 @@ private
 		File.open(filename, 'rb') do |f|
 			IO.popen("tar xzf -", "w") do |io|
 				buffer = ''
+				buffer = buffer.force_encoding('binary') if buffer.respond_to?(:force_encoding)
 				total_size = File.size(filename)
 				bytes_read = 0
 				yield(bytes_read, total_size)

data/lib/phusion_passenger/templates/standalone/config.erb

@@ -27,7 +27,7 @@
 master_process on;
 worker_processes 1;
 daemon on;
-error_log '<%= @options[:log_file] %>' info;
+error_log '<%= @options[:log_file] %>' <% if debugging? %>info<% end %>;
 pid '<%= @options[:pid_file] %>';
 <% if @options[:user] %>user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;<% end %>
 

data/lib/phusion_passenger/utils.rb

@@ -340,15 +340,6 @@ protected
 		# If the app is using Bundler then any dependencies required past this
 		# point must be specified in the Gemfile. Like ruby-debug if debugging is on...
 		
-		if options["debugger"]
-			require 'ruby-debug'
-			if !Debugger.respond_to?(:ctrl_port)
-				raise "Your version of ruby-debug is too old. Please upgrade to the latest version."
-			end
-			Debugger.start_remote('127.0.0.1', [0, 0])
-			Debugger.start
-		end
-		
 		PhusionPassenger._spawn_options = options
 	end
 	

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 3
   - 0
-  - 13
-  version: 3.0.13
+  - 14
+  version: 3.0.14
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-07-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -232,7 +232,6 @@ files:
 - bin/passenger-memory-stats
 - bin/passenger-status
 - doc/ApplicationPool algorithm.txt
-- doc/Architectural overview.html
 - doc/Architectural overview.idmap.txt
 - doc/Architectural overview.txt
 - doc/definitions.h
@@ -276,16 +275,12 @@ files:
 - doc/images/spawn_server_architecture.svg
 - doc/images/typical_isolated_web_application.png
 - doc/images/typical_isolated_web_application.svg
-- doc/Security of user switching support.html
 - doc/Security of user switching support.idmap.txt
 - doc/Security of user switching support.txt
-- doc/Users guide Apache.html
 - doc/Users guide Apache.idmap.txt
 - doc/Users guide Apache.txt
-- doc/Users guide Nginx.html
 - doc/Users guide Nginx.idmap.txt
 - doc/Users guide Nginx.txt
-- doc/Users guide Standalone.html
 - doc/Users guide Standalone.idmap.txt
 - doc/Users guide Standalone.txt
 - doc/users_guide_snippets/analysis_and_system_maintenance.txt
@@ -1080,7 +1075,6 @@ files:
 - ext/libev/ltmain.sh
 - ext/libev/missing
 - ext/libev/mkinstalldirs
-- ext/libev/config.h
 - ext/libev/ev++.h
 - ext/libev/ev.h
 - ext/libev/ev_vars.h
@@ -1508,11 +1502,15 @@ files:
 - test/stub/vendor_rails/minimal/railties/lib/ruby_version_check.rb
 - test/stub/vendor_rails/minimal/README
 - test/stub/wsgi/passenger_wsgi.py
-- test/stub/wsgi/passenger_wsgi.pyc
 - test/stub/wsgi/public/wsgi-snake.jpg
 - test/stub/zsfa/header.png
 - test/stub/zsfa/index.html
 - test/stub/zsfa/zsfa.png
+- doc/Users guide Apache.html
+- doc/Users guide Nginx.html
+- doc/Users guide Standalone.html
+- doc/Security of user switching support.html
+- doc/Architectural overview.html
 homepage: http://www.modrails.com/
 licenses: []
 

data/ext/libev/config.h

@@ -1,122 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the `clock_gettime' function. */
-/* #undef HAVE_CLOCK_GETTIME */
-
-/* "use syscall interface for clock_gettime" */
-/* #undef HAVE_CLOCK_SYSCALL */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `epoll_ctl' function. */
-/* #undef HAVE_EPOLL_CTL */
-
-/* Define to 1 if you have the `eventfd' function. */
-/* #undef HAVE_EVENTFD */
-
-/* Define to 1 if you have the `inotify_init' function. */
-/* #undef HAVE_INOTIFY_INIT */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `kqueue' function. */
-#define HAVE_KQUEUE 1
-
-/* Define to 1 if you have the `m' library (-lm). */
-#define HAVE_LIBM 1
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef HAVE_LIBRT */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `nanosleep' function. */
-/* #undef HAVE_NANOSLEEP */
-
-/* Define to 1 if you have the `poll' function. */
-#define HAVE_POLL 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#define HAVE_POLL_H 1
-
-/* Define to 1 if you have the `port_create' function. */
-/* #undef HAVE_PORT_CREATE */
-
-/* Define to 1 if you have the <port.h> header file. */
-/* #undef HAVE_PORT_H */
-
-/* Define to 1 if you have the `select' function. */
-#define HAVE_SELECT 1
-
-/* Define to 1 if you have the `signalfd' function. */
-/* #undef HAVE_SIGNALFD */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-/* #undef HAVE_SYS_EPOLL_H */
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-/* #undef HAVE_SYS_EVENTFD_H */
-
-/* Define to 1 if you have the <sys/event.h> header file. */
-#define HAVE_SYS_EVENT_H 1
-
-/* Define to 1 if you have the <sys/inotify.h> header file. */
-/* #undef HAVE_SYS_INOTIFY_H */
-
-/* Define to 1 if you have the <sys/queue.h> header file. */
-#define HAVE_SYS_QUEUE_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/signalfd.h> header file. */
-/* #undef HAVE_SYS_SIGNALFD_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Name of package */
-#define PACKAGE "libev"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "3.9"