passenger 5.0.8 → 5.0.9

data/doc/Packaging.txt.md

@@ -278,16 +278,16 @@ Optional fields:
 
 # Vendoring of libraries
 
-Phusion Passenger vendors libev and libeio in order to make installation easier
+Phusion Passenger vendors libev and libuv in order to make installation easier
 for users on operating systems without proper package management, like OS X.
 If you want Phusion Passenger to compile against the system-provided
-libev and/or libeio instead, then set the following environment variables
+libev and/or libuv instead, then set the following environment variables
 before compiling:
 
  * `export USE_VENDORED_LIBEV=no`
- * `export USE_VENDORED_LIBEIO=no`
+ * `export USE_VENDORED_LIBUV=no`
 
-Note that we require at least libev 4.11 and libeio 1.0.
+Note that we require at least libev 4.11 and libuv 1.4.2.
 
 
 # Generating gem and tarball

data/doc/Users guide Apache.html

@@ -1126,8 +1126,9 @@ using the command line.</p></div>
 <div class="foo toclevel4"><a href="#_verifying_the_phusion_software_signing_key">2.9.3. Verifying the Phusion Software Signing key</a></div>
 <div class="foo toclevel4"><a href="#_verifying_the_gem_and_tarball">2.9.4. Verifying the gem and tarball</a></div>
 <div class="foo toclevel4"><a href="#_verifying_git_signatures">2.9.5. Verifying Git signatures</a></div>
-<div class="foo toclevel4"><a href="#_verifying_deb_and_rpm_packages">2.9.6. Verifying DEB and RPM packages</a></div>
-<div class="foo toclevel4"><a href="#_revocation">2.9.7. Revocation</a></div>
+<div class="foo toclevel4"><a href="#_verifying_debian_packages">2.9.6. Verifying Debian packages</a></div>
+<div class="foo toclevel4"><a href="#_verifying_rpm_packages">2.9.7. Verifying RPM packages</a></div>
+<div class="foo toclevel4"><a href="#_revocation">2.9.8. Revocation</a></div>
 <div class="foo toclevel3"><a href="#_non_interactive_automatic_headless_installs_or_upgrades">2.10. Non-interactive, automatic, headless installs or upgrades</a></div>
 <div class="foo toclevel3"><a href="#_customizing_the_compilation_process">2.11. Customizing the compilation process</a></div>
 <div class="foo toclevel4"><a href="#_setting_the_compiler">2.11.1. Setting the compiler</a></div>
@@ -1781,7 +1782,7 @@ Download the Passenger YUM repository definition.
 <div class="listingblock">
 <div class="content monospaced">
 <pre>unset HISTFILE
-sudo curl --fail -sSLo -u download:YOUR_DOWNLOAD_TOKEN /etc/yum.repos.d/passenger.repo https://www.phusionpassenger.com/enterprise_yum/el-passenger-enterprise.repo</pre>
+sudo curl --fail -sSL -u download:YOUR_DOWNLOAD_TOKEN -o /etc/yum.repos.d/passenger.repo https://www.phusionpassenger.com/enterprise_yum/el-passenger-enterprise.repo</pre>
 </div>
 </div>
 <div class="paragraph"><p>The <span class="monospaced">unset HISTFILE</span> command ensures that your download token isn’t saved to the Bash history file.</p></div>
@@ -1911,12 +1912,12 @@ Stop/start Apache (reload or restart is not enough when upgrading):
 <div class="ulist"><ul>
 <li>
 <p>
-Are you using RVM? Run <span class="monospaced">rvmsudo -s</span>
+Are you using RVM? Run <span class="monospaced">rvmsudo -H bash</span>
 </p>
 </li>
 <li>
 <p>
-Are you not using RVM, or do you not know what RVM is? Run <span class="monospaced">sudo -s</span>
+Are you not using RVM, or do you not know what RVM is? Run <span class="monospaced">sudo -H -s</span>
 </p>
 </li>
 <li>
@@ -1978,7 +1979,7 @@ First, download the <strong>license key</strong> from the <a href="https://www.p
 </div>
 </div>
 <div class="paragraph"><p>Substitute <em>YOUR_DOWNLOAD_TOKEN</em> with the one you find in the <a href="https://www.phusionpassenger.com/orders">Customer Area</a>. And notice the <strong>trailing slash</strong> in the URL! It is very important.</p></div>
-<div class="paragraph"><p>Finally, install the latest gem to obtain the files for the latest stable version of the open source Phusion Passenger:</p></div>
+<div class="paragraph"><p>Finally, install the latest gem to obtain the files for the latest stable version of Passenger Enterprise:</p></div>
 <div class="listingblock">
 <div class="content monospaced">
 <pre>gem install passenger-enterprise-server</pre>
@@ -2244,11 +2245,15 @@ gpg: Good signature from "Phusion Software Signing &lt;software-signing@phusion.
 </div>
 </div>
 <div class="sect3">
-<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_verifying_deb_and_rpm_packages"></span><h4 data-comment-topic="verifying-deb-and-rpm-packages-vgtv04" data-anchor="_verifying_deb_and_rpm_packages">2.9.6. Verifying DEB and RPM packages</h4>
-<div class="paragraph"><p>The DEB and RPM packages are signed with the signatures of the respective packagers. They are automatically checked upon installation.</p></div>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_verifying_debian_packages"></span><h4 data-comment-topic="verifying-deb-and-rpm-packages-vgtv04" data-anchor="_verifying_debian_packages">2.9.6. Verifying Debian packages</h4>
+<div class="paragraph"><p>Our <a href="#install_on_debian_ubuntu">APT repository</a> is signed by Phusion Automated Software Signing (<a href="mailto:auto-software-signing@phusion.nl">auto-software-signing@phusion.nl</a>). Packages are automatically checked upon installation.</p></div>
 </div>
 <div class="sect3">
-<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_revocation"></span><h4 data-comment-topic="revocation-4o01n2" data-anchor="_revocation">2.9.7. Revocation</h4>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_verifying_rpm_packages"></span><h4 data-comment-topic="verifying-rpm-packages-1nlx51r" data-anchor="_verifying_rpm_packages">2.9.7. Verifying RPM packages</h4>
+<div class="paragraph"><p>Our <a href="#installing_or_upgrading_on_red_hat">YUM repository</a> is signed by <a href="https://packagecloud.io">PackageCloud</a> (<a href="mailto:ops@packagecloud.io">ops@packagecloud.io</a>). PackageCloud is the RPM package hosting service that we use. You can find their key <a href="https://packagecloud.io/gpg.key">here</a>. Packages are automatically checked upon installation.</p></div>
+</div>
+<div class="sect3">
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_revocation"></span><h4 data-comment-topic="revocation-4o01n2" data-anchor="_revocation">2.9.8. Revocation</h4>
 <div class="paragraph"><p>In the event our key is compromised, we will revoke the key and upload the revocation information to sks-servers.net and keyserver.ubuntu.com. However your system will not know about the revocation until you update the keys from the keyservers. You should update your keys regularly (e.g. once a week) by invoking:</p></div>
 <div class="listingblock">
 <div class="content monospaced">
@@ -4185,6 +4190,14 @@ In <em>.htaccess</em>, if <span class="monospaced">AllowOverride Options</span>
 </li>
 </ul></div>
 <div class="paragraph"><p>In each place, it may be specified at most once. The default value is <em>off</em>.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/note.png" alt="Note">
+</td>
+<td class="content">Are you looking to prevent applications from being restarted when you restart the web server? That is handled by the <a href="Users%20guide%20Nginx.html#flying_passenger">Flying Passenger mode</a> (which requires Nginx), not by the rolling restarts feature.</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><span class="anchor_helper" id="PassengerResistDeploymentErrors"></span><h4 data-comment-topic="passengerresistdeploymenterrors" data-anchor="PassengerResistDeploymentErrors">7.4.16. PassengerResistDeploymentErrors &lt;on|off&gt;</h4>

data/doc/Users guide Apache.idmap.txt

@@ -56,9 +56,11 @@
 
 2.9.5. Verifying Git signatures	=>	verifying-git-signatures-oaafwd
 
-2.9.6. Verifying DEB and RPM packages	=>	verifying-deb-and-rpm-packages-vgtv04
+2.9.6. Verifying Debian packages	=>	verifying-deb-and-rpm-packages-vgtv04
 
-2.9.7. Revocation	=>	revocation-4o01n2
+2.9.7. Verifying RPM packages	=>	verifying-rpm-packages-1nlx51r
+
+2.9.8. Revocation	=>	revocation-4o01n2
 
 2.10. Non-interactive, automatic, headless installs or upgrades	=>	non-interactive-automatic-headless-installs-or-upgrades-1arnxii
 

data/doc/Users guide Apache.txt

@@ -965,6 +965,8 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
+NOTE: Are you looking to prevent applications from being restarted when you restart the web server? That is handled by the link:Users%20guide%20Nginx.html#flying_passenger[Flying Passenger mode] (which requires Nginx), not by the rolling restarts feature.
+
 [[PassengerResistDeploymentErrors]]
 ==== PassengerResistDeploymentErrors <on|off>
 :version: 3.0.0

data/doc/Users guide Nginx.html

@@ -1127,8 +1127,9 @@ using the command line.</p></div>
 <div class="foo toclevel4"><a href="#_verifying_the_phusion_software_signing_key">2.9.3. Verifying the Phusion Software Signing key</a></div>
 <div class="foo toclevel4"><a href="#_verifying_the_gem_and_tarball">2.9.4. Verifying the gem and tarball</a></div>
 <div class="foo toclevel4"><a href="#_verifying_git_signatures">2.9.5. Verifying Git signatures</a></div>
-<div class="foo toclevel4"><a href="#_verifying_deb_and_rpm_packages">2.9.6. Verifying DEB and RPM packages</a></div>
-<div class="foo toclevel4"><a href="#_revocation">2.9.7. Revocation</a></div>
+<div class="foo toclevel4"><a href="#_verifying_debian_packages">2.9.6. Verifying Debian packages</a></div>
+<div class="foo toclevel4"><a href="#_verifying_rpm_packages">2.9.7. Verifying RPM packages</a></div>
+<div class="foo toclevel4"><a href="#_revocation">2.9.8. Revocation</a></div>
 <div class="foo toclevel3"><a href="#_non_interactive_automatic_headless_installs_or_upgrades">2.10. Non-interactive, automatic, headless installs or upgrades</a></div>
 <div class="foo toclevel3"><a href="#_customizing_the_compilation_process">2.11. Customizing the compilation process</a></div>
 <div class="foo toclevel4"><a href="#_setting_the_compiler">2.11.1. Setting the compiler</a></div>
@@ -1832,7 +1833,7 @@ Download the Passenger YUM repository definition.
 <div class="listingblock">
 <div class="content monospaced">
 <pre>unset HISTFILE
-sudo curl --fail -sSLo -u download:YOUR_DOWNLOAD_TOKEN /etc/yum.repos.d/passenger.repo https://www.phusionpassenger.com/enterprise_yum/el-passenger-enterprise.repo</pre>
+sudo curl --fail -sSL -u download:YOUR_DOWNLOAD_TOKEN -o /etc/yum.repos.d/passenger.repo https://www.phusionpassenger.com/enterprise_yum/el-passenger-enterprise.repo</pre>
 </div>
 </div>
 <div class="paragraph"><p>The <span class="monospaced">unset HISTFILE</span> command ensures that your download token isn’t saved to the Bash history file.</p></div>
@@ -1974,12 +1975,12 @@ Restart Nginx:
 <div class="ulist"><ul>
 <li>
 <p>
-Are you using RVM? Run <span class="monospaced">rvmsudo -s</span>
+Are you using RVM? Run <span class="monospaced">rvmsudo -H bash</span>
 </p>
 </li>
 <li>
 <p>
-Are you not using RVM, or do you not know what RVM is? Run <span class="monospaced">sudo -s</span>
+Are you not using RVM, or do you not know what RVM is? Run <span class="monospaced">sudo -H -s</span>
 </p>
 </li>
 <li>
@@ -2041,7 +2042,7 @@ First, download the <strong>license key</strong> from the <a href="https://www.p
 </div>
 </div>
 <div class="paragraph"><p>Substitute <em>YOUR_DOWNLOAD_TOKEN</em> with the one you find in the <a href="https://www.phusionpassenger.com/orders">Customer Area</a>. And notice the <strong>trailing slash</strong> in the URL! It is very important.</p></div>
-<div class="paragraph"><p>Finally, install the latest gem to obtain the files for the latest stable version of the open source Phusion Passenger:</p></div>
+<div class="paragraph"><p>Finally, install the latest gem to obtain the files for the latest stable version of Passenger Enterprise:</p></div>
 <div class="listingblock">
 <div class="content monospaced">
 <pre>gem install passenger-enterprise-server</pre>
@@ -2339,11 +2340,15 @@ gpg: Good signature from "Phusion Software Signing &lt;software-signing@phusion.
 </div>
 </div>
 <div class="sect3">
-<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_verifying_deb_and_rpm_packages"></span><h4 data-comment-topic="verifying-deb-and-rpm-packages-1ed36d5" data-anchor="_verifying_deb_and_rpm_packages">2.9.6. Verifying DEB and RPM packages</h4>
-<div class="paragraph"><p>The DEB and RPM packages are signed with the signatures of the respective packagers. They are automatically checked upon installation.</p></div>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_verifying_debian_packages"></span><h4 data-comment-topic="verifying-deb-and-rpm-packages-1ed36d5" data-anchor="_verifying_debian_packages">2.9.6. Verifying Debian packages</h4>
+<div class="paragraph"><p>Our <a href="#install_on_debian_ubuntu">APT repository</a> is signed by Phusion Automated Software Signing (<a href="mailto:auto-software-signing@phusion.nl">auto-software-signing@phusion.nl</a>). Packages are automatically checked upon installation.</p></div>
 </div>
 <div class="sect3">
-<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_revocation"></span><h4 data-comment-topic="revocation-xwvhea" data-anchor="_revocation">2.9.7. Revocation</h4>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_verifying_rpm_packages"></span><h4 data-comment-topic="verifying-rpm-packages-1wwblzx" data-anchor="_verifying_rpm_packages">2.9.7. Verifying RPM packages</h4>
+<div class="paragraph"><p>Our <a href="#installing_or_upgrading_on_red_hat">YUM repository</a> is signed by <a href="https://packagecloud.io">PackageCloud</a> (<a href="mailto:ops@packagecloud.io">ops@packagecloud.io</a>). PackageCloud is the RPM package hosting service that we use. You can find their key <a href="https://packagecloud.io/gpg.key">here</a>. Packages are automatically checked upon installation.</p></div>
+</div>
+<div class="sect3">
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_revocation"></span><h4 data-comment-topic="revocation-xwvhea" data-anchor="_revocation">2.9.8. Revocation</h4>
 <div class="paragraph"><p>In the event our key is compromised, we will revoke the key and upload the revocation information to sks-servers.net and keyserver.ubuntu.com. However your system will not know about the revocation until you update the keys from the keyservers. You should update your keys regularly (e.g. once a week) by invoking:</p></div>
 <div class="listingblock">
 <div class="content monospaced">
@@ -4221,6 +4226,14 @@ In an <em>if</em> configuration scope.
 </li>
 </ul></div>
 <div class="paragraph"><p>In each place, it may be specified at most once. The default value is <em>off</em>.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/note.png" alt="Note">
+</td>
+<td class="content">Are you looking to prevent applications from being restarted when you restart Nginx? That is handled by the <a href="#flying_passenger">Flying Passenger mode</a>, not by the rolling restarts feature.</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><span class="anchor_helper" id="PassengerResistDeploymentErrors"></span><h4 data-comment-topic="passenger-resist-deployment-errors-on-off--k9yf1" data-anchor="PassengerResistDeploymentErrors">7.3.16. passenger_resist_deployment_errors &lt;on|off&gt;</h4>

data/doc/Users guide Nginx.idmap.txt

@@ -58,9 +58,11 @@
 
 2.9.5. Verifying Git signatures	=>	verifying-git-signatures-dyo4fk
 
-2.9.6. Verifying DEB and RPM packages	=>	verifying-deb-and-rpm-packages-1ed36d5
+2.9.6. Verifying Debian packages	=>	verifying-deb-and-rpm-packages-1ed36d5
 
-2.9.7. Revocation	=>	revocation-xwvhea
+2.9.7. Verifying RPM packages	=>	verifying-rpm-packages-1wwblzx
+
+2.9.8. Revocation	=>	revocation-xwvhea
 
 2.10. Non-interactive, automatic, headless installs or upgrades	=>	non-interactive-automatic-headless-installs-or-upgrades-834ymv
 

data/doc/Users guide Nginx.txt

@@ -939,6 +939,8 @@ This option may occur in the following places:
 
 In each place, it may be specified at most once. The default value is 'off'.
 
+NOTE: Are you looking to prevent applications from being restarted when you restart Nginx? That is handled by the <<flying_passenger,Flying Passenger mode>>, not by the rolling restarts feature.
+
 [[PassengerResistDeploymentErrors]]
 ==== passenger_resist_deployment_errors <on|off>
 :version: 3.0.0

data/doc/Users guide Standalone.html

@@ -1118,8 +1118,9 @@ pre {
 <div class="foo toclevel4"><a href="#_verifying_the_phusion_software_signing_key">2.9.3. Verifying the Phusion Software Signing key</a></div>
 <div class="foo toclevel4"><a href="#_verifying_the_gem_and_tarball">2.9.4. Verifying the gem and tarball</a></div>
 <div class="foo toclevel4"><a href="#_verifying_git_signatures">2.9.5. Verifying Git signatures</a></div>
-<div class="foo toclevel4"><a href="#_verifying_deb_and_rpm_packages">2.9.6. Verifying DEB and RPM packages</a></div>
-<div class="foo toclevel4"><a href="#_revocation">2.9.7. Revocation</a></div>
+<div class="foo toclevel4"><a href="#_verifying_debian_packages">2.9.6. Verifying Debian packages</a></div>
+<div class="foo toclevel4"><a href="#_verifying_rpm_packages">2.9.7. Verifying RPM packages</a></div>
+<div class="foo toclevel4"><a href="#_revocation">2.9.8. Revocation</a></div>
 <div class="foo toclevel3"><a href="#_customizing_the_compilation_process">2.10. Customizing the compilation process</a></div>
 <div class="foo toclevel4"><a href="#_setting_the_compiler">2.10.1. Setting the compiler</a></div>
 <div class="foo toclevel4"><a href="#_adding_additional_compiler_or_linker_flags">2.10.2. Adding additional compiler or linker flags</a></div>
@@ -1594,7 +1595,7 @@ Download the Passenger YUM repository definition.
 <div class="listingblock">
 <div class="content monospaced">
 <pre>unset HISTFILE
-sudo curl --fail -sSLo -u download:YOUR_DOWNLOAD_TOKEN /etc/yum.repos.d/passenger.repo https://www.phusionpassenger.com/enterprise_yum/el-passenger-enterprise.repo</pre>
+sudo curl --fail -sSL -u download:YOUR_DOWNLOAD_TOKEN -o /etc/yum.repos.d/passenger.repo https://www.phusionpassenger.com/enterprise_yum/el-passenger-enterprise.repo</pre>
 </div>
 </div>
 <div class="paragraph"><p>The <span class="monospaced">unset HISTFILE</span> command ensures that your download token isn’t saved to the Bash history file.</p></div>
@@ -1704,12 +1705,12 @@ Install the packages:
 <div class="ulist"><ul>
 <li>
 <p>
-Are you using RVM? Run <span class="monospaced">rvmsudo -s</span>
+Are you using RVM? Run <span class="monospaced">rvmsudo -H bash</span>
 </p>
 </li>
 <li>
 <p>
-Are you not using RVM, or do you not know what RVM is? Run <span class="monospaced">sudo -s</span>
+Are you not using RVM, or do you not know what RVM is? Run <span class="monospaced">sudo -H -s</span>
 </p>
 </li>
 <li>
@@ -1771,7 +1772,7 @@ First, download the <strong>license key</strong> from the <a href="https://www.p
 </div>
 </div>
 <div class="paragraph"><p>Substitute <em>YOUR_DOWNLOAD_TOKEN</em> with the one you find in the <a href="https://www.phusionpassenger.com/orders">Customer Area</a>. And notice the <strong>trailing slash</strong> in the URL! It is very important.</p></div>
-<div class="paragraph"><p>Finally, install the latest gem to obtain the files for the latest stable version of the open source Phusion Passenger:</p></div>
+<div class="paragraph"><p>Finally, install the latest gem to obtain the files for the latest stable version of Passenger Enterprise:</p></div>
 <div class="listingblock">
 <div class="content monospaced">
 <pre>gem install passenger-enterprise-server</pre>
@@ -1979,11 +1980,15 @@ gpg: Good signature from "Phusion Software Signing &lt;software-signing@phusion.
 </div>
 </div>
 <div class="sect3">
-<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_verifying_deb_and_rpm_packages"></span><h4 data-comment-topic="verifying-deb-and-rpm-packages-uga0ho" data-anchor="_verifying_deb_and_rpm_packages">2.9.6. Verifying DEB and RPM packages</h4>
-<div class="paragraph"><p>The DEB and RPM packages are signed with the signatures of the respective packagers. They are automatically checked upon installation.</p></div>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_verifying_debian_packages"></span><h4 data-comment-topic="verifying-deb-and-rpm-packages-uga0ho" data-anchor="_verifying_debian_packages">2.9.6. Verifying Debian packages</h4>
+<div class="paragraph"><p>Our <a href="#install_on_debian_ubuntu">APT repository</a> is signed by Phusion Automated Software Signing (<a href="mailto:auto-software-signing@phusion.nl">auto-software-signing@phusion.nl</a>). Packages are automatically checked upon installation.</p></div>
 </div>
 <div class="sect3">
-<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_revocation"></span><h4 data-comment-topic="revocation-ukzeg9" data-anchor="_revocation">2.9.7. Revocation</h4>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_verifying_rpm_packages"></span><h4 data-comment-topic="verifying-rpm-packages-1m745i5" data-anchor="_verifying_rpm_packages">2.9.7. Verifying RPM packages</h4>
+<div class="paragraph"><p>Our <a href="#installing_or_upgrading_on_red_hat">YUM repository</a> is signed by <a href="https://packagecloud.io">PackageCloud</a> (<a href="mailto:ops@packagecloud.io">ops@packagecloud.io</a>). PackageCloud is the RPM package hosting service that we use. You can find their key <a href="https://packagecloud.io/gpg.key">here</a>. Packages are automatically checked upon installation.</p></div>
+</div>
+<div class="sect3">
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_revocation"></span><h4 data-comment-topic="revocation-ukzeg9" data-anchor="_revocation">2.9.8. Revocation</h4>
 <div class="paragraph"><p>In the event our key is compromised, we will revoke the key and upload the revocation information to sks-servers.net and keyserver.ubuntu.com. However your system will not know about the revocation until you update the keys from the keyservers. You should update your keys regularly (e.g. once a week) by invoking:</p></div>
 <div class="listingblock">
 <div class="content monospaced">

data/doc/Users guide Standalone.idmap.txt

@@ -56,9 +56,11 @@
 
 2.9.5. Verifying Git signatures	=>	verifying-git-signatures-dltpan
 
-2.9.6. Verifying DEB and RPM packages	=>	verifying-deb-and-rpm-packages-uga0ho
+2.9.6. Verifying Debian packages	=>	verifying-deb-and-rpm-packages-uga0ho
 
-2.9.7. Revocation	=>	revocation-ukzeg9
+2.9.7. Verifying RPM packages	=>	verifying-rpm-packages-1m745i5
+
+2.9.8. Revocation	=>	revocation-ukzeg9
 
 2.10. Customizing the compilation process	=>	customizing-the-compilation-process-j4xj2t
 

data/doc/users_guide_snippets/installation.txt

@@ -290,7 +290,7 @@ sudo curl --fail -sSLo /etc/yum.repos.d/passenger.repo https://oss-binaries.phus
 +
 --------------------------------------------------------------
 unset HISTFILE
-sudo curl --fail -sSLo -u download:YOUR_DOWNLOAD_TOKEN /etc/yum.repos.d/passenger.repo https://www.phusionpassenger.com/enterprise_yum/el-passenger-enterprise.repo
+sudo curl --fail -sSL -u download:YOUR_DOWNLOAD_TOKEN -o /etc/yum.repos.d/passenger.repo https://www.phusionpassenger.com/enterprise_yum/el-passenger-enterprise.repo
 --------------------------------------------------------------
 +
 The `unset HISTFILE` command ensures that your download token isn't saved to the Bash history file.
@@ -423,8 +423,8 @@ which ruby
 
 Do you see a filename that references '/home' or '/Users'? If so then your Ruby interpreter is installed in your home directory and you can proceed to step 2. Otherwise, you need to switch to a root prompt by running one of the following commands:
 
-* Are you using RVM? Run `rvmsudo -s`
-* Are you not using RVM, or do you not know what RVM is? Run `sudo -s`
+* Are you using RVM? Run `rvmsudo -H bash`
+* Are you not using RVM, or do you not know what RVM is? Run `sudo -H -s`
 * Is 'sudo' not installed on your system? Run `su -c bash`
 
 You must maintain this root prompt throughout this installation guide.
@@ -471,7 +471,7 @@ gem source --add https://download:YOUR_DOWNLOAD_TOKEN@www.phusionpassenger.com/e
 +
 Substitute 'YOUR_DOWNLOAD_TOKEN' with the one you find in the link:https://www.phusionpassenger.com/orders[Customer Area]. And notice the **trailing slash** in the URL! It is very important.
 +
-Finally, install the latest gem to obtain the files for the latest stable version of the open source Phusion Passenger:
+Finally, install the latest gem to obtain the files for the latest stable version of Passenger Enterprise:
 +
 ----------------------
 gem install passenger-enterprise-server
@@ -731,9 +731,13 @@ gpg: Signature made Mon Mar 11 10:12:02 2013 CET using RSA key ID 0A212A8C
 gpg: Good signature from "Phusion Software Signing <software-signing@phusion.nl>"
 -------------------------------------------------------
 
-==== Verifying DEB and RPM packages
+==== Verifying Debian packages
 
-The DEB and RPM packages are signed with the signatures of the respective packagers. They are automatically checked upon installation.
+Our <<install_on_debian_ubuntu,APT repository>> is signed by Phusion Automated Software Signing (auto-software-signing@phusion.nl). Packages are automatically checked upon installation.
+
+==== Verifying RPM packages
+
+Our <<installing_or_upgrading_on_red_hat,YUM repository>> is signed by link:https://packagecloud.io[PackageCloud] (ops@packagecloud.io). PackageCloud is the RPM package hosting service that we use. You can find their key link:https://packagecloud.io/gpg.key[here]. Packages are automatically checked upon installation.
 
 ==== Revocation
 

data/ext/apache2/Hooks.cpp

@@ -617,8 +617,20 @@ private:
 			char backendData[MAX_STRING_LEN];
 			Timer timer;
 			getsfunc_BRIGADE(backendData, MAX_STRING_LEN, bb);
+
+			// The bucket brigade is an interface to the HTTP response sent by the
+			// PassengerAgent. The scanner parses (line by line) response headers
+			// into error_headers_out (mostly) as well as headers_out.
 			ret = ap_scan_script_header_err_brigade(r, bb, backendData);
 
+			// The PassengerAgent sets the Connection: close header because it wants
+			// the bb connection closed, but because we fed everything to the
+			// ap_scan_script it will also be set in the response to the client and
+			// that breaks HTTP 1.1 keep-alive, so unset it.
+			apr_table_unset(r->err_headers_out, "Connection");
+			// It's undefined in which of the tables it ends up in, so unset on both.
+			apr_table_unset(r->headers_out, "Connection");
+
 			if (ret == OK) {
 				// The API documentation for ap_scan_script_err_brigade() says it
 				// returns HTTP_OK on success, but it actually returns OK.
@@ -783,8 +795,7 @@ private:
 		char *buffer, size_t bufsize) const
 	{
 		assert(bufsize > headerSize);
-		memcpy(buffer, header, headerSize);
-		convertLowerCase((unsigned char *) buffer, headerSize);
+		convertLowerCase((const unsigned char *) header, (unsigned char *) buffer, headerSize);
 		buffer[headerSize] = '\0';
 		return strstr(buffer, "upgrade");
 	}

data/ext/common/ApplicationPool2/Pool/Inspection.h

@@ -55,9 +55,14 @@ void inspectProcessList(const InspectOptions &options, stringstream &result,
 		char cpubuf[10];
 		char membuf[10];
 
-		snprintf(cpubuf, sizeof(cpubuf), "%d%%", (int) process->metrics.cpu);
-		snprintf(membuf, sizeof(membuf), "%ldM",
-			(unsigned long) (process->metrics.realMemory() / 1024));
+		if (process->metrics.isValid()) {
+			snprintf(cpubuf, sizeof(cpubuf), "%d%%", (int) process->metrics.cpu);
+			snprintf(membuf, sizeof(membuf), "%ldM",
+				(unsigned long) (process->metrics.realMemory() / 1024));
+		} else {
+			snprintf(cpubuf, sizeof(cpubuf), "0%%");
+			snprintf(membuf, sizeof(membuf), "0M");
+		}
 		snprintf(buf, sizeof(buf),
 				"  * PID: %-5lu   Sessions: %-2u      Processed: %-5u   Uptime: %s\n"
 				"    CPU: %-5s   Memory  : %-5s   Last used: %s ago",

data/ext/common/BackgroundEventLoop.cpp

@@ -23,16 +23,65 @@
  *  THE SOFTWARE.
  */
 #include <cstdlib>
+#include <cerrno>
+#include <cassert>
 #include <boost/bind.hpp>
 #include <boost/make_shared.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <oxt/thread.hpp>
-#include <ev++.h>
-#include <eio.h>
+#include <oxt/backtrace.hpp>
+#include <oxt/system_calls.hpp>
+#include <oxt/detail/context.hpp>
+#include <ev.h>
+#include <uv.h>
 #include <BackgroundEventLoop.h>
 #include <Logging.h>
 #include <Exceptions.h>
 #include <SafeLibev.h>
 
+#ifndef HAVE_KQUEUE
+	#if defined(__APPLE__) || \
+		defined(__DragonFly__) || \
+		defined(__FreeBSD__) || \
+		defined(__OpenBSD__) || \
+		defined(__NetBSD__)
+		#define HAVE_KQUEUE 1
+	#endif
+#endif
+
+#ifndef HAVE_EPOLL
+	#ifdef __linux__
+		#define HAVE_EPOLL 1
+	#endif
+#endif
+
+#ifndef HAVE_POLLSET
+	#ifdef __AIX
+		#define HAVE_POLLSET 1
+	#endif
+#endif
+
+#ifndef HAVE_EVENT_PORTS
+	#if defined(sun) || defined(__sun)
+		#define HAVE_EVENT_PORTS
+	#endif
+#endif
+
+#if defined(HAVE_KQUEUE)
+	#include <sys/types.h>
+	#include <sys/event.h>
+	#include <sys/time.h>
+#elif defined(HAVE_EPOLL)
+	#include <sys/epoll.h>
+#elif defined(HAVE_POLLSET)
+	#include <sys/poll.h>
+	#include <sys/pollset.h>
+	#include <sys/fcntl.h>
+#elif defined(HAVE_EVENT_PORTS)
+	#include <port.h>
+#endif
+
+
 namespace Passenger {
 
 using namespace std;
@@ -41,126 +90,259 @@ using namespace oxt;
 
 
 struct BackgroundEventLoopPrivate {
+	struct ev_async exitSignaller;
+	struct ev_async libuvActivitySignaller;
+	uv_loop_t libuv_loop;
+	/**
+	 * Coordinates communication between the libuv poller thread and the
+	 * libuv activity callback (the latter which runs on the libevent thread.
+	 */
+	uv_sem_t libuv_sem;
+	/**
+	 * This timer doesn't do anything. It only exists to prevent
+	 * uv_backend_timeout() from returning 0, which would make the
+	 * libuv poller thread use 100% CPU.
+	 */
+	uv_timer_t libuv_timer;
+
 	oxt::thread *thr;
-	boost::mutex lock;
-	boost::condition_variable cond;
-	ev_idle eioRepeatWatcher;
-	ev_async eioReadyWatcher;
-	bool useLibeio;
+	oxt::thread *libuvPollerThr;
+	uv_barrier_t startBarrier;
+
+	bool usesLibuv;
 	bool started;
 };
 
-static BackgroundEventLoop *eioInstanceData = NULL;
-
 
 static void
-signalBackgroundEventLoopExit(struct ev_loop *loop, ev_async *async, int revents) {
+signalLibevExit(struct ev_loop *loop, ev_async *async, int revents) {
 	BackgroundEventLoop *bg = (BackgroundEventLoop *) async->data;
-	ev_break(bg->loop, EVBREAK_ALL);
+	if (bg->priv->usesLibuv) {
+		ev_async_stop(bg->libev_loop, &bg->priv->libuvActivitySignaller);
+	}
+	ev_async_stop(bg->libev_loop, &bg->priv->exitSignaller);
+	ev_break(bg->libev_loop, EVBREAK_ALL);
+	if (bg->priv->usesLibuv) {
+		uv_timer_stop(&bg->priv->libuv_timer);
+		uv_run(bg->libuv_loop, UV_RUN_NOWAIT);
+	}
 }
 
 static void
-startBackgroundLoop(BackgroundEventLoop *bg) {
-	boost::unique_lock<boost::mutex> l(bg->priv->lock);
-	bg->safe->setCurrentThread();
-	bg->priv->started = true;
-	bg->priv->cond.notify_all();
-	l.unlock();
-	ev_run(bg->loop, 0);
+onLibuvActivity(struct ev_loop *loop, ev_async *async, int revents) {
+	BackgroundEventLoop *bg = (BackgroundEventLoop *) async->data;
+	uv_run(bg->libuv_loop, UV_RUN_NOWAIT);
+	uv_sem_post(&bg->priv->libuv_sem);
 }
 
 static void
-eioRepeat(EV_P_ ev_idle *w, int revents) {
-	if (eio_poll() != -1) {
-		ev_idle_stop(EV_A_ w);
-	}
+doNothing(uv_timer_t *timer) {
+	// Do nothing
 }
 
-/* eio has some results, process them */
 static void
-eioReady(EV_P_ ev_async *w, int revents) {
-	if (eio_poll() == -1) {
-		ev_idle_start(EV_A_ &eioInstanceData->priv->eioRepeatWatcher);
+runBackgroundLoop(BackgroundEventLoop *bg) {
+	bg->safe->setCurrentThread();
+	if (bg->priv->usesLibuv) {
+		uv_timer_start(&bg->priv->libuv_timer, doNothing, 99999000, 99999000);
+		uv_run(bg->libuv_loop, UV_RUN_NOWAIT);
 	}
+	uv_barrier_wait(&bg->priv->startBarrier);
+	ev_run(bg->libev_loop, 0);
 }
 
-/* wake up the event loop */
 static void
-eioWantPoll(void) {
-	ev_async_send(eioInstanceData->loop, &eioInstanceData->priv->eioReadyWatcher);
+pollLibuv(BackgroundEventLoop *bg) {
+	uv_barrier_wait(&bg->priv->startBarrier);
+
+	int ret;
+	int fd;
+	int timeout;
+	int lastErrno;
+	bool intrRequested = false;
+	oxt::thread_local_context *ctx = oxt::get_thread_local_context();
+	assert(ctx != NULL);
+
+	fd = uv_backend_fd(&bg->priv->libuv_loop);
+
+	while (!this_thread::interruption_requested()) {
+		timeout = uv_backend_timeout(&bg->priv->libuv_loop);
+
+		ctx->syscall_interruption_lock.unlock();
+
+		do {
+			#if defined(HAVE_KQUEUE)
+				struct timespec ts;
+				struct kevent event;
+
+				ts.tv_sec = timeout / 1000;
+				ts.tv_nsec = (timeout % 1000) * 1000000;
+
+				ret = kevent(fd, NULL, 0, &event, 1, (timeout == -1) ? NULL : &ts);
+			#elif defined(HAVE_EPOLL)
+				struct epoll_event ev;
+				ret = epoll_wait(fd, &ev, 1, timeout);
+			#elif defined(HAVE_POLLSET)
+				struct pollfd event;
+				ret = pollset_poll(fd, &event, 1, timeout);
+			#elif defined(HAVE_EVENT_PORTS)
+				struct timespec ts;
+				struct port_event event;
+
+				ts.tv_sec = timeout / 1000;
+				ts.tv_nsec = (timeout % 1000) * 1000000;
+
+				ret = port_get(fd, &event, (timeout == -1) ? NULL : &ts);
+			#else
+				#error "This platform is not supported. Please add corresponding I/O polling code."
+			#endif
+
+			lastErrno = errno;
+		} while (ret == -1
+			&& lastErrno == EINTR
+			&& (!boost::this_thread::syscalls_interruptable()
+				|| !(intrRequested = this_thread::interruption_requested())));
+
+		ctx->syscall_interruption_lock.lock();
+
+		if (ret == -1
+			&& lastErrno == EINTR
+			&& this_thread::syscalls_interruptable()
+			&& intrRequested)
+		{
+			throw boost::thread_interrupted();
+		}
+
+		ev_async_send(bg->libev_loop, &bg->priv->libuvActivitySignaller);
+		uv_sem_wait(&bg->priv->libuv_sem);
+	}
 }
 
-BackgroundEventLoop::BackgroundEventLoop(bool scalable, bool useLibeio) {
+BackgroundEventLoop::BackgroundEventLoop(bool scalable, bool usesLibuv)
+	: libev_loop(NULL),
+	  libuv_loop(NULL),
+	  priv(NULL)
+{
+	struct Guard {
+		BackgroundEventLoop *self;
+
+		Guard(BackgroundEventLoop *_self)
+			: self(_self)
+			{ }
+
+		~Guard() {
+			if (self != NULL) {
+				if (self->libev_loop != NULL) {
+					ev_loop_destroy(self->libev_loop);
+				}
+				if (self->libuv_loop != NULL) {
+					uv_loop_close(self->libuv_loop);
+				}
+				delete self->priv;
+			}
+		}
+
+		void clear() {
+			self = NULL;
+		}
+	};
+
 	TRACE_POINT();
+	Guard guard(this);
+
+	priv = new BackgroundEventLoopPrivate();
 
 	if (scalable) {
-		loop = ev_loop_new(EVBACKEND_KQUEUE);
-		if (loop == NULL) {
-			loop = ev_loop_new(EVBACKEND_EPOLL);
+		libev_loop = ev_loop_new(EVBACKEND_KQUEUE);
+		if (libev_loop == NULL) {
+			libev_loop = ev_loop_new(EVBACKEND_EPOLL);
 		}
-		if (loop == NULL) {
-			loop = ev_loop_new(EVFLAG_AUTO);
+		if (libev_loop == NULL) {
+			libev_loop = ev_loop_new(EVFLAG_AUTO);
 		}
 	} else {
-		loop = ev_loop_new(EVBACKEND_POLL);
+		libev_loop = ev_loop_new(EVBACKEND_POLL);
 	}
-	if (loop == NULL) {
-		throw RuntimeException("Cannot create an event loop");
+	if (libev_loop == NULL) {
+		throw RuntimeException("Cannot create a libev event loop");
 	}
 
-	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_backend_fd(loop), "libev event loop: backend FD");
+	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_backend_fd(libev_loop), "libev event loop: backend FD");
 
-	async = (ev_async *) malloc(sizeof(ev_async));
-	async->data = this;
-	ev_async_init(async, signalBackgroundEventLoopExit);
-	ev_async_start(loop, async);
-	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(loop, 0), "libev event loop: async pipe 0");
-	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(loop, 1), "libev event loop: async pipe 1");
-	safe = boost::make_shared<SafeLibev>(loop);
-	priv = new BackgroundEventLoopPrivate();
-	priv->thr = NULL;
-	priv->useLibeio = useLibeio;
-	priv->started = false;
+	ev_async_init(&priv->exitSignaller, signalLibevExit);
+	ev_async_start(libev_loop, &priv->exitSignaller);
+	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(libev_loop, 0), "libev event loop: async pipe 0");
+	P_LOG_FILE_DESCRIPTOR_OPEN2(ev_loop_get_pipe(libev_loop, 1), "libev event loop: async pipe 1");
+	priv->exitSignaller.data = this;
+	safe = boost::make_shared<SafeLibev>(libev_loop);
+
+	uv_barrier_init(&priv->startBarrier, usesLibuv ? 3 : 2);
 
-	if (useLibeio) {
-		eioInstanceData = this;
-		ev_idle_init(&priv->eioRepeatWatcher, eioRepeat);
-		ev_async_init(&priv->eioReadyWatcher, eioReady);
-		ev_async_start(loop, &priv->eioReadyWatcher);
-		eio_init(eioWantPoll, 0);
+	if (usesLibuv) {
+		ev_async_init(&priv->libuvActivitySignaller, onLibuvActivity);
+		ev_async_start(libev_loop, &priv->libuvActivitySignaller);
+		priv->libuvActivitySignaller.data = this;
+
+		libuv_loop = &priv->libuv_loop;
+		uv_loop_init(&priv->libuv_loop);
+		uv_timer_init(&priv->libuv_loop, &priv->libuv_timer);
+		uv_sem_init(&priv->libuv_sem, 0);
+		P_LOG_FILE_DESCRIPTOR_OPEN2(uv_backend_fd(libuv_loop), "libuv event loop: backend");
+		P_LOG_FILE_DESCRIPTOR_OPEN2(libuv_loop->signal_pipefd[0], "libuv event loop: signal pipe 0");
+		P_LOG_FILE_DESCRIPTOR_OPEN2(libuv_loop->signal_pipefd[1], "libuv event loop: signal pipe 1");
 	}
+
+	priv->thr = NULL;
+	priv->libuvPollerThr = NULL;
+	priv->usesLibuv = usesLibuv;
+	priv->started = false;
+	guard.clear();
 }
 
 BackgroundEventLoop::~BackgroundEventLoop() {
 	stop();
-	if (priv->useLibeio) {
-		ev_idle_stop(loop, &priv->eioRepeatWatcher);
-		ev_async_stop(loop, &priv->eioReadyWatcher);
-		eioInstanceData = NULL;
+	if (priv->usesLibuv) {
+		while (uv_loop_alive(libuv_loop)) {
+			uv_run(libuv_loop, UV_RUN_NOWAIT);
+			syscalls::usleep(10000);
+		}
+		uv_sem_destroy(&priv->libuv_sem);
+		P_LOG_FILE_DESCRIPTOR_CLOSE(uv_backend_fd(libuv_loop));
+		P_LOG_FILE_DESCRIPTOR_CLOSE(libuv_loop->signal_pipefd[0]);
+		P_LOG_FILE_DESCRIPTOR_CLOSE(libuv_loop->signal_pipefd[1]);
+		uv_loop_close(libuv_loop);
 	}
-	ev_async_stop(loop, async);
+	uv_barrier_destroy(&priv->startBarrier);
 	delete priv;
-	free(async);
 }
 
 void
 BackgroundEventLoop::start(const string &threadName, unsigned int stackSize) {
 	assert(priv->thr == NULL);
-	boost::unique_lock<boost::mutex> l(priv->lock);
 	priv->thr = new oxt::thread(
-		boost::bind(startBackgroundLoop, this),
+		boost::bind(runBackgroundLoop, this),
 		threadName,
 		stackSize
 	);
-	while (!priv->started) {
-		priv->cond.wait(l);
+	if (priv->usesLibuv) {
+		priv->libuvPollerThr = new oxt::thread(
+			boost::bind(pollLibuv, this),
+			threadName + ": libuv poller",
+			1024 * 512
+		);
 	}
+	uv_barrier_wait(&priv->startBarrier);
 }
 
 void
 BackgroundEventLoop::stop() {
 	if (priv->thr != NULL) {
-		ev_async_send(loop, async);
+		if (priv->usesLibuv) {
+			priv->libuvPollerThr->interrupt_and_join();
+			delete priv->libuvPollerThr;
+			priv->libuvPollerThr = NULL;
+		}
+		ev_async_send(libev_loop, &priv->exitSignaller);
 		priv->thr->join();
 		delete priv->thr;
 		priv->thr = NULL;