passenger 5.0.30 → 5.1.0

data/dev/ci/run_travis.sh

@@ -155,12 +155,16 @@ run cp test/config.json.travis test/config.json
 run chmod g+x,o+x $HOME
 
 if [[ "$TEST_RUBY_VERSION" != "" ]]; then
-	echo "$ rvm use $TEST_RUBY_VERSION"
 	if [[ -f ~/.rvm/scripts/rvm ]]; then
 		source ~/.rvm/scripts/rvm
 	else
 		source /usr/local/rvm/scripts/rvm
 	fi
+	echo "$ rvm list"
+	rvm list
+	echo "$ rvm install $TEST_RUBY_VERSION"
+	rvm install $TEST_RUBY_VERSION
+	echo "$ rvm use $TEST_RUBY_VERSION"
 	rvm use $TEST_RUBY_VERSION
 	if [[ "$TEST_RUBYGEMS_VERSION" = "" ]]; then
 		run gem --version
@@ -244,5 +248,5 @@ if [[ "$TEST_SOURCE_PACKAGING" = 1 ]]; then
 	apt_get_update
 	run sudo apt-get install -y --no-install-recommends source-highlight
 	install_test_deps_with_doctools
-	run bundle exec rspec -f s -c test/integration_tests/source_packaging_test.rb
+	run bundle _1.11.2_ exec rspec -f s -c test/integration_tests/source_packaging_test.rb
 fi

data/doc/Users guide Apache.html

@@ -1156,7 +1156,8 @@ pre {
 <div class="foo toclevel4"><a href="#PassengerGroup">7.5.3. PassengerGroup &lt;group name&gt;</a></div>
 <div class="foo toclevel4"><a href="#PassengerDefaultUser">7.5.4. PassengerDefaultUser &lt;username&gt;</a></div>
 <div class="foo toclevel4"><a href="#PassengerDefaultGroup">7.5.5. PassengerDefaultGroup &lt;group name&gt;</a></div>
-<div class="foo toclevel4"><a href="#PassengerFriendlyErrorPages">7.5.6. PassengerFriendlyErrorPages &lt;on|off&gt;</a></div>
+<div class="foo toclevel4"><a href="#_passengershowversioninheader_lt_on_off_gt">7.5.6. PassengerShowVersionInHeader &lt;on|off&gt;</a></div>
+<div class="foo toclevel4"><a href="#PassengerFriendlyErrorPages">7.5.7. PassengerFriendlyErrorPages &lt;on|off&gt;</a></div>
 <div class="foo toclevel3"><a href="#_resource_control_and_optimization_options">7.6. Resource control and optimization options</a></div>
 <div class="foo toclevel4"><a href="#PassengerMaxPoolSize">7.6.1. PassengerMaxPoolSize &lt;integer&gt;</a></div>
 <div class="foo toclevel4"><a href="#PassengerMinInstances">7.6.2. PassengerMinInstances &lt;integer&gt;</a></div>
@@ -1640,7 +1641,11 @@ Report security vulnerabilities to <a href="mailto:security@phusion.nl">security
 <div class="paragraph"><p>This documentation has moved. Please visit <a href="https://www.phusionpassenger.com/library/config/apache/reference/#passengerdefaultgroup">https://www.phusionpassenger.com/library/config/apache/reference/#passengerdefaultgroup</a></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="PassengerFriendlyErrorPages"></span><h4 data-comment-topic="passengerfriendlyerrorpages" data-anchor="PassengerFriendlyErrorPages">7.5.6. PassengerFriendlyErrorPages &lt;on|off&gt;</h4>
+<a href="javascript:void(0)" class="comments empty" title="Add a comment"><span class="count"></span></a><span class="anchor_helper" id="_passengershowversioninheader_lt_on_off_gt"></span><h4 data-comment-topic="passengershowversioninheader-on-off--d8rvr0" data-anchor="_passengershowversioninheader_lt_on_off_gt">7.5.6. PassengerShowVersionInHeader &lt;on|off&gt;</h4>
+<div class="paragraph"><p>This documentation has moved. Please visit <a href="https://www.phusionpassenger.com/library/config/apache/reference/#passengershowversioninheader">https://www.phusionpassenger.com/library/config/apache/reference/#passengershowversioninheader</a></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="PassengerFriendlyErrorPages"></span><h4 data-comment-topic="passengerfriendlyerrorpages" data-anchor="PassengerFriendlyErrorPages">7.5.7. PassengerFriendlyErrorPages &lt;on|off&gt;</h4>
 <div class="paragraph"><p>This documentation has moved. Please visit <a href="https://www.phusionpassenger.com/library/config/apache/reference/#passengerfriendlyerrorpages">https://www.phusionpassenger.com/library/config/apache/reference/#passengerfriendlyerrorpages</a></p></div>
 </div>
 </div>

data/doc/Users guide Apache.txt

@@ -208,6 +208,10 @@ This documentation has moved. Please visit https://www.phusionpassenger.com/libr
 
 This documentation has moved. Please visit https://www.phusionpassenger.com/library/config/apache/reference/#passengerdefaultgroup
 
+==== PassengerShowVersionInHeader <on|off> ====
+
+This documentation has moved. Please visit https://www.phusionpassenger.com/library/config/apache/reference/#passengershowversioninheader
+
 [[PassengerFriendlyErrorPages]]
 ==== PassengerFriendlyErrorPages <on|off> ====
 

data/resources/templates/error_layout.css

@@ -1,103 +1,89 @@
 body {
-	font-family: Verdana, 'Bitstream Vera Sans', Arial, Sans-Serif;
-	font-size: 10pt;
-	background: white;
-	color: #222222;
-	margin: 0;
-	padding-top: 3em;
-	padding-bottom: 3em;
-	padding-left: 4.5em;
-	padding-right: 4.5em;
+    font-family: Arial, Sans-Serif;
+    font-size: 13px;
+    color: #222222;
+    margin: 0;
+}
+.column {
+    width: 1000px;
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+}
+header {
+    margin-top: 50px;
+    border-bottom: 1px solid #E3E3E3;
+    margin-bottom: 45px;
+}
+footer {
+    font-size: 14px;
+    color: #7F7F7F;
+    border-top: 1px solid #E3E3E3;
+    margin-top: 50px;
+    padding: 40px 0px;
 }
-
 h1 {
-	font-size: 17pt;
-	font-weight: medium;
-	color: #533e72;
-	border-bottom: 1px solid #533e72;
+    font-size: 30px;
+    margin-top: 30px;
+    margin-bottom: 10px;
 }
-
-h1.title {
-	margin-top: 0;
+.subtitle {
+    margin-top: 0px;
+    margin-bottom: 110px;
+    font-size: 20px;
 }
-
-h1.error_title {
-	color: red;
-	border-bottom: 1px solid red;
+#operator_info {
+    display: none;
 }
-
-a {
-	text-decoration: none;
+#show_operator_info {
+    font-size: 17px;
+    font-weight: normal;
 }
-
-a:hover {
-	text-decoration: underline;
-}
-
-dt {
-	font-weight: bold;
-	color: #280050;
-}
-
-dd {
-	margin-top: 0.5em;
-	margin-bottom: 1em;
-}
-
-.commands {
-	border: 1px solid #b594e7;
-	background: #ddc6ff;
-	padding: 0.5em;
-	margin: 0.5em;
-	font-family: 'Bitstream Vera Sans Mono', 'Courier New', Monospace;
+.left {
+    text-align: left;
+    padding: 8px;
 }
-
-pre {
-	overflow: auto;
-	white-space: pre-wrap;
-	text-align: left;
+h3 {
+    margin-top: 30px;
+    margin-bottom: 10px;
+    font-size: 23px;
 }
-
-table.backtrace th {
-	background: #8470a6;
-	color: white;
+ul {
+    padding-left: 16px;
 }
-
-table.backtrace th,
-table.backtrace td {
-	padding: 0.2em;
-	padding-left: 0.4em;
-	padding-right: 0.4em;
+a, li {
+    font-weight: bold;
+    color: #1781BF;
+    text-decoration: none;
 }
-
-table.backtrace tr td {
-	background: #ecdfff;
+.error {
+    font-weight: bold;
+    background: #E6F3FC;
+    border-radius: 5px;
+    padding: 7px 12px;
 }
-
-table.backtrace tr.even td {
-	background: #f7f2ff;
+.bold {
+    font-weight: bold !important;
 }
-
-table.backtrace td.index {
-	font-weight: bold;
+pre {
+    margin: 0px;
+    overflow-x: auto;
+    white-space: pre-wrap;
+    word-break: break-all; 
 }
-
-#site_footer {
-	border-top: solid 1px black;
-	margin-top: 1em;
-	padding-top: 1em;
-	font-size: small;
-	color: #777777;
+dt {
+    margin-top: 16px;
+    font-weight: bold;
 }
-
-#site_footer a {
-	color: #65498e;
+dd {
+    margin-left: 0px;
 }
-
-#site_footer a:hover {
-	color: #9681d9;
+.plain {
+    color: inherit;
+    font-weight: inherit;
 }
 
-#site_header .corporate_identity {
-	display: none;
+#content {
+    overflow-y: scroll;
+    height: 800px;
 }

data/resources/templates/error_layout.html.template

@@ -1,95 +1,86 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html>
 <html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<meta name="generator" content="Phusion Passenger">
-	<title>{{TITLE}}</title>
-	<style type="text/css">
-		{{CSS|raw}}
-	</style>
-	<link rel="stylesheet" type="text/css" href="http://www.modrails.com/error_pages/1.0/error_page.css">
-	<style type="text/css">
-		dd {
-			text-align: left;
-		}
-
-		dd pre {
-			margin-top: 0;
-			margin-bottom: 0;
-		}
-	</style>
-</head>
-
-<body>
-
-	<div id="site_container">
-		<div id="site_header">
-			<ul class="corporate_identity">
-				<li class="logo"><a href="https://www.phusionpassenger.com"><span>Phusion Passenger</span></a></li>
-			</ul>
-		</div>
-		<div id="site_body">
-			<h1 class="error_title">{{TITLE}}</h1>
-			<div id="content">
-				{{CONTENT|raw}}
-
-				<dl>
-				<dt>Error ID</dt>
-				<dd>{{ERROR_ID}}</dd>
-				<dt>Application root</dt>
-				<dd>{{APP_ROOT}}</dd>
-				<dt>Environment (value of RAILS_ENV, RACK_ENV, WSGI_ENV, NODE_ENV and PASSENGER_APP_ENV)</dt>
-				<dd>{{ENVIRONMENT}}</dd>
-				{{if IS_RUBY_APP}}
-					<dt>Ruby interpreter command</dt>
-					<dd><pre>{{RUBY}}</pre></dd>
-				{{/if}}
-				<dt>User and groups</dt>
-				<dd><pre>{{USER_INFO|default=Unknown}}</pre></dd>
-				<dt>Environment variables</dt>
-				<dd><pre>{{ENVVARS|default=Unknown}}</pre></dd>
-				<dt>Ulimits</dt>
-				<dd><pre>{{ULIMIT|default=Unknown}}</pre></dd>
-				{{if SYSTEM_METRICS}}
-					<dt>System metrics</dt>
-					<dd><pre>{{SYSTEM_METRICS|default=Unknown}}</pre></dd>
-				{{/if}}
-				{{if RUBY_INFO}}
-					<dt>General Ruby interpreter information</dt>
-					<dd><pre>{{RUBY_INFO}}</pre></dd>
-				{{/if}}
-				{{if RBCONFIG}}
-					<dt>Ruby configuration (RbConfig::CONFIG)</dt>
-					<dd><pre>{{RBCONFIG}}</pre></dd>
-				{{/if}}
-				{{if ACTIVATED_GEMS}}
-					<dt>Activated Ruby gems</dt>
-					<dd><pre>{{ACTIVATED_GEMS}}</pre></dd>
-				{{/if}}
-				{{if LOAD_PATH}}
-					<dt>Ruby load path ($LOAD_PATH)</dt>
-					<dd><pre>{{LOAD_PATH}}</pre></dd>
-				{{/if}}
-				{{if LOADED_LIBS}}
-					<dt>Ruby loaded libraries ($LOADED_FEATURES)</dt>
-					<dd><pre>{{LOADED_LIBS}}</pre></dd>
-				{{/if}}
-				</dl>
-			</div>
-		</div>
-		<div id="site_footer">
-			<!--
-			   You are free to modify the footer as you see fit,
-			   but we kindly ask of you to preserve to following
-			   text. Thank you.
-			-->
-			<div class="container">
-				Powered by <a href="https://www.phusionpassenger.com/">Phusion Passenger</a>,
-				<tt>mod_rails</tt> / <tt>mod_rack</tt> for Apache and Nginx.
-			</div>
-		</div>
-	</div>
-
-</body>
+  <head>
+    <title>We're sorry, but something went wrong: {{TITLE}}</title>
+    <style type="text/css">
+      {{CSS|raw}}
+    </style>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="generator" content="Phusion Passenger">
+  </head>
+  <body>
+    <header>
+      <div class="column">
+        <svg width="50" height="50" viewBox="0 0 64 64" xmlns="http://www.w3.org/2000/svg"><path d="m731.234002 153.838666v-18.841339c0-4.417534-3.577416-7.997327-7.990382-7.997327h-6.414571c-4.417012 0-7.990383 3.580525-7.990383 7.997327v18.841339h-18.841339c-4.417534 0-7.997327 3.577416-7.997327 7.990383v6.414571c0 4.417011 3.580525 7.990382 7.997327 7.990382h18.841339v18.841339c0 4.417534 3.577416 7.997328 7.990383 7.997328h6.414571c4.417011 0 7.990382-3.580526 7.990382-7.997328v-18.841339h18.841339c4.417534 0 7.997328-3.577416 7.997328-7.990382v-6.414571c0-4.417012-3.580526-7.990383-7.997328-7.990383z" fill="#f87575" transform="matrix(.70710678 -.70710678 .70710678 .70710678 -593.80455139 424.48059756)"/></svg>
+        <h1>We're sorry, but something went wrong.</h1>
+        <p class="subtitle">The issue has been logged for investigation. Please try again later.</p>
+      </div>
+    </header>
+    <div class="column">
+      <a id="show_operator_info" href="#">Technical details for the administrator of this website</a>
+      <div id="operator_info" style="display:block">
+        <div class="left">
+          <h3>Error:</h3>
+          <span class="error">{{TITLE}}</span>
+          <h3>Error ID:</h3>
+          <span class="error">{{ERROR_ID}}</span>
+          <h3>Details:</h3>
+          {{CONTENT|raw}}
+          <h3>System information:</h3>
+          <div id="content">
+            <dl>
+              <dt>Application root</dt>
+              <dd>{{APP_ROOT}}</dd>
+              <dt>Environment (value of RAILS_ENV, RACK_ENV, WSGI_ENV, NODE_ENV and PASSENGER_APP_ENV)</dt>
+              <dd>{{ENVIRONMENT}}</dd>
+              {{if IS_RUBY_APP}}
+              <dt>Ruby interpreter command</dt>
+              <dd><pre>{{RUBY}}</pre></dd>
+              {{/if}}
+              <dt>User and groups</dt>
+              <dd><pre>{{USER_INFO|default=Unknown}}</pre></dd>
+              <dt>Environment variables</dt>
+              <dd><pre>{{ENVVARS|default=Unknown}}</pre></dd>
+              <dt>Ulimits</dt>
+              <dd><pre>{{ULIMIT|default=Unknown}}</pre></dd>
+              {{if SYSTEM_METRICS}}
+              <dt>System metrics</dt>
+              <dd><pre>{{SYSTEM_METRICS|default=Unknown}}</pre></dd>
+              {{/if}}
+              {{if RUBY_INFO}}
+              <dt>General Ruby interpreter information</dt>
+              <dd><pre>{{RUBY_INFO}}</pre></dd>
+              {{/if}}
+              {{if RBCONFIG}}
+              <dt>Ruby configuration (RbConfig::CONFIG)</dt>
+              <dd><pre>{{RBCONFIG}}</pre></dd>
+              {{/if}}
+              {{if ACTIVATED_GEMS}}
+              <dt>Activated Ruby gems</dt>
+              <dd><pre>{{ACTIVATED_GEMS}}</pre></dd>
+              {{/if}}
+              {{if LOAD_PATH}}
+              <dt>Ruby load path ($LOAD_PATH)</dt>
+              <dd><pre>{{LOAD_PATH}}</pre></dd>
+              {{/if}}
+              {{if LOADED_LIBS}}
+              <dt>Ruby loaded libraries ($LOADED_FEATURES)</dt>
+              <dd><pre>{{LOADED_LIBS}}</pre></dd>
+              {{/if}}
+            </dl>
+          </div>
+        </div>
+      </div>
+    </div>
+    <footer>
+      <!--
+       You are free to modify the footer as you see fit,
+       but we kindly ask of you to preserve the following
+       text. Thank you.
+       -->
+      <div class="column">
+        This website is powered by <b>Passenger</b>&reg;, a rock-solid, feature-rich web application server that integrates with Apache and Nginx.
+      </div>
+    </footer>
+  </body>
 </html>
-

data/resources/templates/standalone/http.erb

@@ -8,19 +8,21 @@ passenger_ctl integration_mode standalone;
 passenger_ctl standalone_engine nginx;
 passenger_user_switching off;
 
-<% if @options[:ruby] %>
-    passenger_ruby <%= @options[:ruby] %>;
-<% else %>
-    passenger_ruby <%= PlatformInfo.ruby_command %>;
-<% end %>
-<% if @options[:user] %>
-    passenger_user <%= @options[:user] %>;
-    passenger_default_user <%= @options[:user] %>;
-    passenger_analytics_log_user <%= @options[:user] %>;
-<% else %>
-    passenger_user <%= current_user %>;
-    passenger_default_user <%= current_user %>;
-    passenger_analytics_log_user <%= current_user %>;
+<% if Process.euid == 0 %>
+    <% if @options[:ruby] %>
+        passenger_ruby <%= @options[:ruby] %>;
+    <% else %>
+        passenger_ruby <%= PlatformInfo.ruby_command %>;
+    <% end %>
+    <% if @options[:user] %>
+        passenger_user <%= @options[:user] %>;
+        passenger_default_user <%= @options[:user] %>;
+        passenger_analytics_log_user <%= @options[:user] %>;
+    <% else %>
+        passenger_user <%= current_user %>;
+        passenger_default_user <%= current_user %>;
+        passenger_analytics_log_user <%= current_user %>;
+    <% end %>
 <% end %>
 
 <%= nginx_http_option(:socket_backlog) %>
@@ -32,6 +34,8 @@ passenger_user_switching off;
 <%= nginx_http_option(:max_preloader_idle_time) %>
 <%= nginx_http_option(:turbocaching) %>
 <%= nginx_http_option(:instance_registry_dir) %>
+<%= nginx_http_option(:disable_security_update_check) %>
+<%= nginx_http_option(:security_update_check_proxy) %>
 <%= nginx_http_option(:data_buffer_dir) %>
 <%= nginx_http_option(:core_file_descriptor_ulimit) %>
 <%= nginx_http_option(:union_station_gateway_address) %>