passenger 3.0.15 → 3.0.17

data/NEWS

@@ -1,3 +1,25 @@
+Release 3.0.17
+--------------
+
+ * Fixed a Ruby 1.9 encoding-related bug in the memory measurer.
+   (Phusion Passenger Enterprise)
+ * Fixed OOM adjustment bugs on Linux.
+ * Fixed compilation problems on Fedora 18 and 19.
+ * Fixed compilation problems on SunOS.
+ * Fixed compilation problems on AIX. Contribution by Perry Smith.
+ * Fixed various compilation warnings.
+ * Upgraded preferred Nginx version to 1.2.3.
+
+3.0.16 was an unofficial hotfix release, and so its announcement had been skipped.
+
+
+Release 3.0.15
+--------------
+
+ * Updated documentation.
+ * Updated website links.
+
+
 Release 3.0.14
 --------------
 

data/doc/Users guide Apache.html

@@ -2571,7 +2571,7 @@ if responses can be huge. Because entire responses are buffered in memory when t
 </div>
 <div class="sect2">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="PassengerRollingRestarts" data-comment-topic="passengerrollingrestarts">5.11. PassengerRollingRestarts &lt;on|off&gt;</h3>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>Enables or disables support for rolling restarts. Normally when you
 restart an application (by touching restart.txt), Phusion Passenger would
 shut down all application processes and spawn a new one. The spawning
@@ -2644,7 +2644,7 @@ In <em>.htaccess</em>, if <span class="monospaced">AllowOverride Options</span>
 </div>
 <div class="sect2">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="_passengerresistdeploymenterrors_lt_on_off_gt" data-comment-topic="passengerresistdeploymenterrors">5.12. PassengerResistDeploymentErrors &lt;on|off&gt;</h3>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>Enables or disables resistance against deployment errors.</p></div>
 <div class="paragraph"><p>Suppose you’ve upgraded your application and you’ve issues a command to restart it (by touching restart.txt), but the application code contains an error that prevents Phusion Passenger from successfully spawning a process (e.g. a syntax error). Phusion Passenger would normally display an error message in response to this.</p></div>
 <div class="paragraph"><p>By enabling deployment error resistance, Phusion Passenger Enterprise would instead do this:</p></div>
@@ -2910,7 +2910,7 @@ 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="_passengermaxinstances_lt_integer_gt" data-comment-topic="passengermaxinstances">5.14.3. PassengerMaxInstances &lt;integer&gt;</h4>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>The maximum number of application processes that may simultaneously exist
 for an application. This helps to make sure that a single application
 will not occupy all available slots in the application pool.</p></div>
@@ -3074,7 +3074,7 @@ 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="PassengerMaxRequestTime" data-comment-topic="passengermaxrequesttime-seconds--7qnz3x">5.14.7. PassengerMaxRequestTime &lt;seconds&gt;</h4>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>The maximum amount of time, in seconds, that an application process may take
 to process a request. If the request takes longer than this amount of time,
 then the application process will be forcefully shut down, and possibly
@@ -3143,7 +3143,7 @@ measure to avoid freezing applications.</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="PassengerMemoryLimit" data-comment-topic="passengermemorylimit">5.14.8. PassengerMemoryLimit &lt;integer&gt;</h4>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>The maximum amount of memory that an application process may use, in megabytes.
 Once an application process has surpassed its memory limit, it will process
 all the requests currently present in its queue and then shut down.
@@ -3745,7 +3745,7 @@ error messages should be written to instead.</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="_passengerdebugger_lt_on_off_gt" data-comment-topic="passengerdebugger-on-off--1lgdk7g">5.16.3. PassengerDebugger &lt;on|off&gt;</h4>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>Turns support for application debugging on or off. In case of Ruby applications,
 turning this option on will cause them to load the <span class="monospaced">ruby-debug</span> gem (when on Ruby 1.8)
 or the <span class="monospaced">debugger</span> gem (when on Ruby 1.9). If you’re using Bundler, you should add
@@ -3935,7 +3935,7 @@ In a virtual host configuration block.
 </div>
 </div>
 <div class="sect2">
-<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="_rack_specific_options" data-comment-topic="rack-specific-options-wk9qzt">5.18. Rack-specific options</h3>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="_rack_and_rails_gt_3_specific_options" data-comment-topic="rack-specific-options-wk9qzt">5.18. Rack and Rails &gt;= 3 specific options</h3>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="_rackautodetect_lt_on_off_gt" data-comment-topic="rackautodetect-on-off--vl1lxy">5.18.1. RackAutoDetect &lt;on|off&gt;</h4>
 <div class="paragraph"><p>Whether Phusion Passenger should automatically detect whether a virtual host’s
@@ -5647,7 +5647,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-08-01 13:31:01 CEST
+Last updated 2012-08-28 11:03:54 CEST
 </div>
 </div>
 <script>/*! jQuery v1.7.1 jquery.com | jquery.org/license */

data/doc/Users guide Apache.idmap.txt

@@ -192,7 +192,7 @@
 
 5.17.5. RailsAppSpawnerIdleTime <integer>	=>	railsappspawneridletime-integer--1awgog1
 
-5.18. Rack-specific options	=>	rack-specific-options-wk9qzt
+5.18. Rack and Rails >= 3 specific options	=>	rack-specific-options-wk9qzt
 
 5.18.1. RackAutoDetect <on|off>	=>	rackautodetect-on-off--vl1lxy
 

data/doc/Users guide Apache.txt

@@ -982,7 +982,8 @@ if responses can be huge. Because entire responses are buffered in memory when t
 
 [[PassengerRollingRestarts]]
 === PassengerRollingRestarts <on|off> ===
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 Enables or disables support for rolling restarts. Normally when you
 restart an application (by touching restart.txt), Phusion Passenger would
@@ -1021,7 +1022,8 @@ This option may occur in the following places:
 In each place, it may be specified at most once. The default value is 'off'.
 
 === PassengerResistDeploymentErrors <on|off> ===
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 Enables or disables resistance against deployment errors.
 
@@ -1204,7 +1206,8 @@ The PassengerMinInstances option may occur in the following places:
 In each place, it may be specified at most once. The default value is '1'.
 
 ==== PassengerMaxInstances <integer> ====
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 The maximum number of application processes that may simultaneously exist
 for an application. This helps to make sure that a single application
@@ -1337,7 +1340,8 @@ measure to avoid memory leaks.
 
 [[PassengerMaxRequestTime]]
 ==== PassengerMaxRequestTime <seconds> ====
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 The maximum amount of time, in seconds, that an application process may take
 to process a request. If the request takes longer than this amount of time,
@@ -1387,7 +1391,8 @@ measure to avoid freezing applications.
 
 [[PassengerMemoryLimit]]
 ==== PassengerMemoryLimit <integer> ====
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 The maximum amount of memory that an application process may use, in megabytes.
 Once an application process has surpassed its memory limit, it will process
@@ -1844,7 +1849,8 @@ error messages should be written to instead.
 This option may only occur once, in the global server configuration.
 
 ==== PassengerDebugger <on|off> ====
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 Turns support for application debugging on or off. In case of Ruby applications,
 turning this option on will cause them to load the `ruby-debug` gem (when on Ruby 1.8)
@@ -1979,7 +1985,7 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is '600' (10 minutes).
 
-=== Rack-specific options ===
+=== Rack and Rails >= 3 specific options ===
 
 ==== RackAutoDetect <on|off> ====
 Whether Phusion Passenger should automatically detect whether a virtual host's

data/doc/Users guide Nginx.html

@@ -1990,7 +1990,7 @@ In an <em>if</em> configuration scope.
 </div>
 <div class="sect2">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="PassengerRollingRestarts" data-comment-topic="passenger-rolling-restarts">5.4. passenger_rolling_restarts &lt;on|off&gt;</h3>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>Enables or disables support for rolling restarts. Normally when you
 restart an application (by touching restart.txt), Phusion Passenger would
 shut down all application processes and spawn a new one. The spawning
@@ -2063,7 +2063,7 @@ In an <em>if</em> configuration scope.
 </div>
 <div class="sect2">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="_passenger_resist_deployment_errors_lt_on_off_gt" data-comment-topic="passenger-resist-deployment-errors-on-off--k9yf1">5.5. passenger_resist_deployment_errors &lt;on|off&gt;</h3>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>Enables or disables resistance against deployment errors.</p></div>
 <div class="paragraph"><p>Suppose you’ve upgraded your application and you’ve issues a command to restart it (by touching restart.txt), but the application code contains an error that prevents Phusion Passenger from successfully spawning a process (e.g. a syntax error). Phusion Passenger would normally display an error message in response to this.</p></div>
 <div class="paragraph"><p>By enabling deployment error resistance, Phusion Passenger Enterprise would instead do this:</p></div>
@@ -2709,7 +2709,7 @@ 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_lt_integer_gt" data-comment-topic="passenger-max-instances">5.9.3. passenger_max_instances &lt;integer&gt;</h4>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>The maximum number of application processes that may simultaneously exist
 for an application. This helps to make sure that a single application
 will not occupy all available slots in the application pool.</p></div>
@@ -2842,7 +2842,7 @@ 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="PassengerMaxRequestTime" data-comment-topic="passenger-max-request-time-seconds--1qod9kg">5.9.7. passenger_max_request_time &lt;seconds&gt;</h4>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>The maximum amount of time, in seconds, that an application process may take
 to process a request. If the request takes longer than this amount of time,
 then the application process will be forcefully shut down, and possibly
@@ -3255,7 +3255,7 @@ error messages should be written to instead.</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="_passenger_debugger_lt_on_off_gt" data-comment-topic="passenger-debugger-on-off--1wkuq85">5.10.3. passenger_debugger &lt;on|off&gt;</h4>
-<div class="paragraph"><p><strong>Available in Phusion Passenger Enterprise since version 3.0.0.</strong></p></div>
+<div class="paragraph"><p><strong>This feature is only available in <a href="https://www.phusionpassenger.com/enterprise">Phusion Passenger Enterprise</a>. It was introduced in version 3.0.0. <a href="https://www.phusionpassenger.com/download">Buy Phusion Passenger Enterprise here.</a></strong></p></div>
 <div class="paragraph"><p>Turns support for application debugging on or off. In case of Ruby applications,
 turning this option on will cause them to load the <span class="monospaced">ruby-debug</span> gem (when on Ruby 1.8)
 or the <span class="monospaced">debugger</span> gem (when on Ruby 1.9). If you’re using Bundler, you should add
@@ -3403,7 +3403,7 @@ In an <em>if</em> configuration scope.
 </div>
 </div>
 <div class="sect2">
-<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="_rack_specific_options" data-comment-topic="rack-specific-options-13yvdxs">5.12. Rack-specific options</h3>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h3 id="_rack_and_rails_gt_3_specific_options" data-comment-topic="rack-specific-options-13yvdxs">5.12. Rack and Rails &gt;= 3 specific options</h3>
 <div class="sect3">
 <a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><h4 id="RackEnv" data-comment-topic="rack-env-string--tqmrt0">5.12.1. rack_env &lt;string&gt;</h4>
 <div class="paragraph"><p>This option allows one to specify the default <span class="monospaced">RACK_ENV</span> value.</p></div>
@@ -4473,7 +4473,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-08-01 13:31:01 CEST
+Last updated 2012-08-28 11:03:54 CEST
 </div>
 </div>
 <script>/*! jQuery v1.7.1 jquery.com | jquery.org/license */

data/doc/Users guide Nginx.idmap.txt

@@ -122,7 +122,7 @@
 
 5.11.3. rails_app_spawner_idle_time <integer>	=>	rails-app-spawner-idle-time-integer--1xjqe4b
 
-5.12. Rack-specific options	=>	rack-specific-options-13yvdxs
+5.12. Rack and Rails >= 3 specific options	=>	rack-specific-options-13yvdxs
 
 5.12.1. rack_env <string>	=>	rack-env-string--tqmrt0
 

data/doc/Users guide Nginx.txt

@@ -645,7 +645,8 @@ In each place, it may be specified at most once. The default value is 'smart-lv2
 
 [[PassengerRollingRestarts]]
 === passenger_rolling_restarts <on|off> ===
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 Enables or disables support for rolling restarts. Normally when you
 restart an application (by touching restart.txt), Phusion Passenger would
@@ -684,7 +685,8 @@ This option may occur in the following places:
 In each place, it may be specified at most once. The default value is 'off'.
 
 === passenger_resist_deployment_errors <on|off> ===
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 Enables or disables resistance against deployment errors.
 
@@ -1060,7 +1062,8 @@ 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 <integer> ====
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 The maximum number of application processes that may simultaneously exist
 for an application. This helps to make sure that a single application
@@ -1161,7 +1164,8 @@ measure to avoid memory leaks.
 
 [[PassengerMaxRequestTime]]
 ==== passenger_max_request_time <seconds> ====
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 The maximum amount of time, in seconds, that an application process may take
 to process a request. If the request takes longer than this amount of time,
@@ -1485,7 +1489,8 @@ error messages should be written to instead.
 This option may only occur once, in the 'http' configuration block.
 
 ==== passenger_debugger <on|off> ====
-**Available in Phusion Passenger Enterprise since version 3.0.0.**
+:version: 3.0.0
+include::users_guide_snippets/enterprise_only.txt[]
 
 Turns support for application debugging on or off. In case of Ruby applications,
 turning this option on will cause them to load the `ruby-debug` gem (when on Ruby 1.8)
@@ -1575,7 +1580,7 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is '600' (10 minutes).
 
-=== Rack-specific options ===
+=== Rack and Rails >= 3 specific options ===
 [[RackEnv]]
 ==== rack_env <string> ====
 This option allows one to specify the default `RACK_ENV` value.

data/doc/users_guide_snippets/enterprise_only.txt

@@ -0,0 +1 @@
+**This feature is only available in link:https://www.phusionpassenger.com/enterprise[Phusion Passenger Enterprise]. It was introduced in version {version}. link:https://www.phusionpassenger.com/download[Buy Phusion Passenger Enterprise here.]**

data/ext/apache2/Configuration.cpp

@@ -36,6 +36,7 @@
 
 #include "Configuration.hpp"
 #include "Utils.h"
+#include "Constants.h"
 #include <LoggingAgent/FilterSupport.h>
 
 /* The APR headers must come after the Passenger headers. See Hooks.cpp
@@ -317,6 +318,15 @@ DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_friendly_error_pages, friendlyEr
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_union_station_support, unionStationSupport)
 DEFINE_DIR_THREEWAY_CONFIG_SETTER(cmd_passenger_buffer_response, bufferResponse)
 
+#ifndef PASSENGER_IS_ENTERPRISE
+static const char *
+cmd_passenger_enterprise_only(cmd_parms *cmd, void *pcfg, const char *arg) {
+	return "this feature is only available in Phusion Passenger Enterprise. "
+		"You are currently running the open source Phusion Passenger Enterprise. "
+		"Please learn more about and/or buy Phusion Passenger Enterprise at https://www.phusionpassenger.com/enterprise";
+}
+#endif
+
 static const char *
 cmd_passenger_spawn_method(cmd_parms *cmd, void *pcfg, const char *arg) {
 	DirConfig *config = (DirConfig *) pcfg;
@@ -671,6 +681,36 @@ const command_rec passenger_commands[] = {
 		"Whether to enable logging through Union Station."),
 	
 	/*****************************/
+	AP_INIT_TAKE1("PassengerMemoryLimit",
+		(Take1Func) cmd_passenger_enterprise_only,
+		NULL,
+		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
+		"The maximum amount of memory in MB that an application instance may use."),
+	AP_INIT_TAKE1("PassengerMaxInstances",
+		(Take1Func) cmd_passenger_enterprise_only,
+		NULL,
+		OR_LIMIT | ACCESS_CONF | RSRC_CONF,
+		"The maximum number of instances for the current application that Passenger may spawn."),
+	AP_INIT_TAKE1("PassengerMaxRequestTime",
+		(Take1Func) cmd_passenger_enterprise_only,
+		NULL,
+		OR_ALL,
+		"The maximum time (in seconds) that the current application may spend on a request."),
+	AP_INIT_FLAG("PassengerRollingRestarts",
+		(FlagFunc) cmd_passenger_enterprise_only,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"Whether to turn on rolling restarts"),
+	AP_INIT_FLAG("PassengerResistDeploymentErrors",
+		(FlagFunc) cmd_passenger_enterprise_only,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"Whether to turn on deployment error resistance"),
+	AP_INIT_FLAG("PassengerDebugger",
+		(FlagFunc) cmd_passenger_enterprise_only,
+		NULL,
+		OR_OPTIONS | ACCESS_CONF | RSRC_CONF,
+		"Whether to turn on debugger support"),
 
 	// Rails-specific settings.
 	AP_INIT_TAKE1("RailsBaseURI",

data/ext/apache2/Hooks.cpp

@@ -491,14 +491,14 @@ private:
 					len = strlen(filename);
 					if (len > 0 && filename[len - 1] == '/') {
 						pageCacheFile = apr_pstrcat(r->pool, filename,
-							"index.html", NULL);
+							"index.html", (char *) NULL);
 					} else {
 						pageCacheFile = apr_pstrcat(r->pool, filename,
-							".html", NULL);
+							".html", (char *) NULL);
 					}
 				} else {
 					pageCacheFile = apr_pstrcat(r->pool, filename,
-						".html", NULL);
+						".html", (char *) NULL);
 				}
 				if (!fileExists(pageCacheFile)) {
 					pageCacheFile = NULL;
@@ -948,7 +948,7 @@ private:
 	 * Convert an HTTP header name to a CGI environment name.
 	 */
 	char *httpToEnv(apr_pool_t *p, const char *headerName) {
-		char *result  = apr_pstrcat(p, "HTTP_", headerName, NULL);
+		char *result  = apr_pstrcat(p, "HTTP_", headerName, (char *) NULL);
 		char *current = result + sizeof("HTTP_") - 1;
 		
 		while (*current != '\0') {
@@ -1049,7 +1049,7 @@ private:
 		} else {
 			const char *request_uri;
 			if (r->args != NULL) {
-				request_uri = apr_pstrcat(r->pool, escapedUri, "?", r->args, NULL);
+				request_uri = apr_pstrcat(r->pool, escapedUri, "?", r->args, (char *) NULL);
 			} else {
 				request_uri = escapedUri;
 			}

data/ext/boost/config/suffix.hpp

@@ -102,6 +102,18 @@
 #  define BOOST_HAS_STATIC_ASSERT
 #endif
 
+//
+// constexpr workarounds
+// 
+#if defined(BOOST_NO_CONSTEXPR)
+#define BOOST_CONSTEXPR
+#define BOOST_CONSTEXPR_OR_CONST const
+#else
+#define BOOST_CONSTEXPR constexpr
+#define BOOST_CONSTEXPR_OR_CONST constexpr
+#endif
+#define BOOST_STATIC_CONSTEXPR  static BOOST_CONSTEXPR_OR_CONST
+
 //
 // if there is no __int64 then there is no specialisation
 // for numeric_limits<__int64> either:

data/ext/boost/src/pthread/thread.cpp

@@ -365,7 +365,7 @@ namespace boost
                     cond.timed_wait(lock, xt);
 #   endif
                     xtime cur;
-                    xtime_get(&cur, TIME_UTC);
+                    xtime_get(&cur, TIME_UTC_);
                     if (xtime_cmp(xt, cur) <= 0)
                         return;
                 }
@@ -380,7 +380,7 @@ namespace boost
             BOOST_VERIFY(!pthread_yield());
 #   else
             xtime xt;
-            xtime_get(&xt, TIME_UTC);
+            xtime_get(&xt, TIME_UTC_);
             sleep(xt);
 #   endif
         }

data/ext/boost/src/pthread/timeconv.inl

@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND = 1000;
 inline void to_time(int milliseconds, boost::xtime& xt)
 {
     int res = 0;
-    res = boost::xtime_get(&xt, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&xt, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
     xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
@@ -57,8 +57,8 @@ inline void to_timespec_duration(const boost::xtime& xt, timespec& ts)
 {
     boost::xtime cur;
     int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     if (boost::xtime_cmp(xt, cur) <= 0)
     {
@@ -88,8 +88,8 @@ inline void to_duration(boost::xtime xt, int& milliseconds)
 {
     boost::xtime cur;
     int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     if (boost::xtime_cmp(xt, cur) <= 0)
         milliseconds = 0;
@@ -110,8 +110,8 @@ inline void to_microduration(boost::xtime xt, int& microseconds)
 {
     boost::xtime cur;
     int res = 0;
-    res = boost::xtime_get(&cur, boost::TIME_UTC);
-    BOOST_ASSERT(res == boost::TIME_UTC);
+    res = boost::xtime_get(&cur, boost::TIME_UTC_);
+    BOOST_ASSERT(res == boost::TIME_UTC_);
 
     if (boost::xtime_cmp(xt, cur) <= 0)
         microseconds = 0;

data/ext/boost/thread/locks.hpp

@@ -164,9 +164,9 @@ namespace boost
     struct adopt_lock_t
     {};
     
-    const defer_lock_t defer_lock={};
-    const try_to_lock_t try_to_lock={};
-    const adopt_lock_t adopt_lock={};
+    BOOST_CONSTEXPR_OR_CONST defer_lock_t defer_lock={};
+    BOOST_CONSTEXPR_OR_CONST try_to_lock_t try_to_lock={};
+    BOOST_CONSTEXPR_OR_CONST adopt_lock_t adopt_lock={};
 
     template<typename Mutex>
     class shared_lock;

data/ext/boost/thread/xtime.hpp

@@ -20,7 +20,7 @@ namespace boost {
 
 enum xtime_clock_types
 {
-    TIME_UTC=1
+    TIME_UTC_=1
 //    TIME_TAI,
 //    TIME_MONOTONIC,
 //    TIME_PROCESS,
@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_time const& abs_time)
 
 inline int xtime_get(struct xtime* xtp, int clock_type)
 {
-    if (clock_type == TIME_UTC)
+    if (clock_type == TIME_UTC_)
     {
         *xtp=get_xtime(get_system_time());
         return clock_type;

data/ext/common/ApplicationPool/Pool.h

@@ -718,7 +718,7 @@ private:
 					}
 				} else {
 					xtime xt;
-					xtime_get(&xt, TIME_UTC);
+					xtime_get(&xt, TIME_UTC_);
 					xt.sec += maxIdleTime + 1;
 					if (cleanerThreadSleeper.timed_wait(l, xt)) {
 						// Condition was woken up.

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.15"
+#define PASSENGER_VERSION "3.0.17"
 
 #define FEEDBACK_FD 3
 

data/ext/common/IniFile.h

@@ -149,7 +149,7 @@ protected:
 	ifstream iniFileStream;
 
 	char lastAcceptedChar;
-	char upcomingChar;
+	int upcomingChar;
 	bool upcomingTokenPtrIsStale;
 
 	int currentLine;
@@ -158,7 +158,7 @@ protected:
 	TokenPtr upcomingTokenPtr;
 
 	void expect(char ch) {
-		char upcomingChar = (char)iniFileStream.peek();
+		int upcomingChar = iniFileStream.peek();
 	
 		if (ch != upcomingChar) {
 			switch(upcomingChar) {
@@ -176,10 +176,10 @@ protected:
 	}
 
 	void accept() {
-		if ((int) upcomingChar == EOF) return;
+		if (upcomingChar == EOF) return;
 	
 		lastAcceptedChar = (char)iniFileStream.get();
-		upcomingChar     = (char)iniFileStream.peek();
+		upcomingChar     = iniFileStream.peek();
 		currentColumn++;
 	
 		if (lastAcceptedChar == '\n') {
@@ -189,9 +189,9 @@ protected:
 	}
 
 	void ignore() {
-		if ((int) upcomingChar == EOF) return;
+		if (upcomingChar == EOF) return;
 	
-		upcomingChar = (char)iniFileStream.peek();
+		upcomingChar = iniFileStream.peek();
 		currentColumn++;
 	
 		if ((char)iniFileStream.get() == '\n') {
@@ -261,7 +261,7 @@ protected:
 		int column = currentColumn;
 		string result;
 	
-		while (upcomingChar != '\n' && (int) upcomingChar != EOF) {
+		while (upcomingChar != '\n' && upcomingChar != EOF) {
 			result.append(1, upcomingChar);
 			accept();
 		}
@@ -282,7 +282,7 @@ protected:
 		int column = currentColumn;
 		string result;
 	
-		while ((int) upcomingChar != EOF) {
+		while (upcomingChar != EOF) {
 			result.append(1, upcomingChar);
 			accept();
 		}
@@ -332,7 +332,7 @@ public:
 		}
 	
 		while (iniFileStream.good()) {
-			upcomingChar = (char)iniFileStream.peek();
+			upcomingChar = iniFileStream.peek();
 			switch(upcomingChar) {
 				case '[':
 					return tokenizeSection();

data/ext/common/LoggingAgent/LoggingServer.h

@@ -780,7 +780,7 @@ private:
 	}
 	
 	bool isDirectory(const string &dir, struct dirent *entry) const {
-		#ifdef __sun__
+		#if defined(__sun__) || defined(_AIX)
 			string path = dir;
 			path.append("/");
 			path.append(entry->d_name);

data/ext/common/MessageChannel.h

@@ -389,14 +389,14 @@ public:
 			unsigned int ret;
 			try {
 				ret = Passenger::readExact(fd, buf, size, &t);
-				#if defined(__NetBSD__) || defined(__OpenBSD__)
+				#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(_AIX)
 					*timeout = llround((double) t / 1000);
 				#else
 					*timeout = llroundl((long double) t / 1000);
 				#endif
 				return ret == size;
 			} catch (...) {
-				#if defined(__NetBSD__) || defined(__OpenBSD__)
+				#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(_AIX)
 					*timeout = llround((double) t / 1000);
 				#else
 					*timeout = llroundl((long double) t / 1000);

data/ext/common/Watchdog.cpp

@@ -800,7 +800,7 @@ setOomScore(const StaticString &score) {
 	FILE *f;
 	OomFileType type;
 	
-	f = openOomAdjFile("r", type);
+	f = openOomAdjFile("w", type);
 	if (f != NULL) {
 		fwrite(score.data(), 1, score.size(), f);
 		fclose(f);

data/ext/nginx/Configuration.c

@@ -905,6 +905,15 @@ peers:
     return NGX_CONF_OK;
 }
 
+#ifndef PASSENGER_IS_ENTERPRISE
+static char *
+passenger_enterprise_only(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    return ": this feature is only available in Phusion Passenger Enterprise. "
+        "You are currently running the open source Phusion Passenger Enterprise. "
+        "Please learn more about and/or buy Phusion Passenger Enterprise at https://www.phusionpassenger.com/enterprise ;";
+}
+#endif
+
 static char *
 passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
@@ -1380,6 +1389,42 @@ const ngx_command_t passenger_commands[] = {
       NULL },
 
     /************************************/
+
+    { ngx_string("passenger_max_instances"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      passenger_enterprise_only,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("passenger_max_request_time"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      passenger_enterprise_only,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("passenger_memory_limit"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      passenger_enterprise_only,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("passenger_rolling_restarts"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+      passenger_enterprise_only,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
+    { ngx_string("passenger_resist_deployment_errors"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+      passenger_enterprise_only,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      0,
+      NULL },
+
     /************************************/
 
     /******** Backward compatibility options ********/

data/lib/phusion_passenger.rb

@@ -25,10 +25,10 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.15'
+	VERSION_STRING = '3.0.17'
 	
-	PREFERRED_NGINX_VERSION = '1.2.2'
-	PREFERRED_PCRE_VERSION  = '8.30'
+	PREFERRED_NGINX_VERSION = '1.2.3'
+	PREFERRED_PCRE_VERSION  = '8.31'
 	STANDALONE_INTERFACE_VERSION  = 1
 	
 	

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -52,6 +52,7 @@ module PlatformInfo
 	end
 	
 	def self.compiler_supports_visibility_flag?
+		return false if RUBY_PLATFORM =~ /aix/
 		return try_compile(:c, '', '-fvisibility=hidden')
 	end
 	memoize :compiler_supports_visibility_flag?, true
@@ -150,12 +151,12 @@ module PlatformInfo
 				flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
 				flags << '-D__SOLARIS9__ -DBOOST__STDC_CONSTANT_MACROS_DEFINED' if RUBY_PLATFORM =~ /solaris2.9/
 			end
-			flags << '-D_XOPEN_SOURCE=500 -D_XPG4_2 -D__EXTENSIONS__ -D__SOLARIS__ -D_FILE_OFFSET_BITS=64'
 			flags << '-DBOOST_HAS_STDINT_H' unless RUBY_PLATFORM =~ /solaris2.9/
 			flags << '-mcpu=ultrasparc' if RUBY_PLATFORM =~ /sparc/
 		elsif RUBY_PLATFORM =~ /openbsd/
 			flags << '-DBOOST_HAS_STDINT_H -D_GLIBCPP__PTHREADS'
 		elsif RUBY_PLATFORM =~ /aix/
+			flags << '-pthread'
 			flags << '-DOXT_DISABLE_BACKTRACES'
 		elsif RUBY_PLATFORM =~ /(sparc-linux|arm-linux|^arm.*-linux|sh4-linux)/
 			# http://code.google.com/p/phusion-passenger/issues/detail?id=200

data/test/tut/tut.h

@@ -69,15 +69,9 @@ static int setenv(const char *name, const char *value, int override) {
 	typedef factory::object object; \
 	factory name## _group(#name)
 
-#ifdef __clang__
-	#define TEST_METHOD(i) \
-		template<> \
-		void object::test<i>()
-#else
-	#define TEST_METHOD(i) \
-		template<> template<> \
-		void object::test<i>()
-#endif
+#define TEST_METHOD(i) \
+	template<> template<> \
+	void object::test<i>()
 
 /**
  * Template Unit Tests Framework for C++.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 37
   prerelease: 
   segments: 
   - 3
   - 0
-  - 15
-  version: 3.0.15
+  - 17
+  version: 3.0.17
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-01 00:00:00 Z
+date: 2012-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -285,6 +285,7 @@ files:
 - doc/users_guide_snippets/appendix_a_about.txt
 - doc/users_guide_snippets/appendix_b_terminology.txt
 - doc/users_guide_snippets/appendix_c_spawning_methods.txt
+- doc/users_guide_snippets/enterprise_only.txt
 - doc/users_guide_snippets/global_queueing_explained.txt
 - doc/users_guide_snippets/passenger_spawn_method.txt
 - doc/users_guide_snippets/rackup_specifications.txt