passenger 6.0.13 → 6.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG +24 -1
- data/bin/passenger-status +29 -4
- data/build/test_basics.rb +2 -2
- data/doc/templates/markdown.html.erb +2 -6
- data/package.json +19 -17
- data/resources/templates/error_renderer/with_details/dist/bundle.js +2 -33
- data/resources/templates/error_renderer/with_details/dist/styles.css +2 -2
- data/resources/templates/error_renderer/with_details/src/index.html.template +0 -2
- data/resources/templates/error_renderer/with_details/webpack.config.js +13 -16
- data/resources/templates/error_renderer/without_details/dist/bundle.js +0 -1
- data/resources/templates/error_renderer/without_details/dist/styles.css +1 -1
- data/resources/templates/error_renderer/without_details/webpack.config.js +13 -16
- data/src/agent/Core/ApiServer.h +35 -0
- data/src/agent/Core/ApplicationPool/Pool.h +9 -1
- data/src/agent/Core/Config.h +2 -1
- data/src/agent/Core/Controller/Config.h +2 -1
- data/src/agent/Core/Controller/InternalUtils.cpp +1 -1
- data/src/agent/Core/Controller.h +1 -1
- data/src/agent/Watchdog/Config.h +2 -1
- data/src/cxx_supportlib/Constants.h +1 -1
- data/src/ruby_supportlib/phusion_passenger/config/restart_app_command.rb +16 -12
- data/src/ruby_supportlib/phusion_passenger/console_text_template.rb +7 -2
- data/src/ruby_supportlib/phusion_passenger/packaging.rb +1 -1
- data/src/ruby_supportlib/phusion_passenger/standalone/start_command/nginx_engine.rb +28 -17
- data/src/ruby_supportlib/phusion_passenger.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fa9f755880c3ddfc5cae56059e6b3f8842fc49fc
|
4
|
+
data.tar.gz: 275c6684a9f3f6d2645f5b443542754722956e82
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2f8b9e118657c0e208cfe8628ba189bf611fe2b92fcebdbbc99d2b0a38653a0c1f4f85b4e0a48119c2ba37d75dceed8bcc4cbfb0fe76f17be16060859be9a4d8
|
7
|
+
data.tar.gz: 90729494b5e3d8b0c908778c12069537aeb8821144e7eb1f9f811e8d5a12a28759fb601a6eeb3892fb0b407143b5062bf85f5fb37d8f50a54733b40c33adef45
|
data/CHANGELOG
CHANGED
@@ -1,4 +1,27 @@
|
|
1
|
-
Release 6.0.
|
1
|
+
Release 6.0.14 (Not yet released)
|
2
|
+
-------------
|
3
|
+
* Adds Ubuntu 22.04 "Jammy" packages, and removes Ubuntu 21.10 "Impish" packages.
|
4
|
+
* Fixes a use after free regression introduced in 6.0.12.
|
5
|
+
* Fixed a warning about ERB.new argument deprecation in Ruby 3.1. Closes GH-2417.
|
6
|
+
* Removed google apis from error pages for easier GDPR compliance.
|
7
|
+
* Updated various library versions used in precompiled binaries (used for e.g. gem installs):
|
8
|
+
|
9
|
+
- cmake 3.22.3 → 3.23.1
|
10
|
+
- git 2.35.1 → 2.36.0
|
11
|
+
- gnupg 2.3.4 → 2.3.5
|
12
|
+
- libgcrypt 1.9.4 → 1.10.1
|
13
|
+
- libgpg_error 1.44 → 1.45
|
14
|
+
- ntbtls 0.3.0 → 0.3.1
|
15
|
+
- rubygems 3.3.9 → 3.3.12
|
16
|
+
- zlib 1.2.11 → 1.2.12
|
17
|
+
- ruby
|
18
|
+
- 2.6.9 → 2.6.10
|
19
|
+
- 2.7.5 → 2.7.6
|
20
|
+
- 3.0.3 → 3.0.4
|
21
|
+
- 3.1.1 → 3.1.2
|
22
|
+
|
23
|
+
|
24
|
+
Release 6.0.13
|
2
25
|
-------------
|
3
26
|
* Add WASM mime type, Closes GH-2398.
|
4
27
|
* Fix compilation on FreeBSD 13. Closes GH-2402.
|
data/bin/passenger-status
CHANGED
@@ -41,6 +41,7 @@ PhusionPassenger.require_passenger_lib 'config/utils'
|
|
41
41
|
PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
|
42
42
|
require 'optparse'
|
43
43
|
require 'socket'
|
44
|
+
require 'json'
|
44
45
|
require 'net/http'
|
45
46
|
|
46
47
|
include PhusionPassenger::SharedConstants
|
@@ -114,7 +115,7 @@ end
|
|
114
115
|
|
115
116
|
def show_status(instance, options)
|
116
117
|
# if the noshow override is not specified, the default is to show the header, unless show=xml
|
117
|
-
if options[:noheader] != true && options[:show]
|
118
|
+
if options[:noheader] != true && !['xml','json'].include?(options[:show])
|
118
119
|
print_header(STDOUT, instance)
|
119
120
|
end
|
120
121
|
|
@@ -198,6 +199,30 @@ def show_status(instance, options)
|
|
198
199
|
exit 2
|
199
200
|
end
|
200
201
|
|
202
|
+
when 'json'
|
203
|
+
request = Net::HTTP::Get.new("/pool.json?secrets=#{options[:verbose]}")
|
204
|
+
try_performing_ro_admin_basic_auth(request, instance)
|
205
|
+
response = instance.http_request("agents.s/core_api", request)
|
206
|
+
if response.code.to_i / 100 == 2
|
207
|
+
indented = JSON.pretty_generate(JSON.parse(response.body))
|
208
|
+
if indented
|
209
|
+
puts indented
|
210
|
+
else
|
211
|
+
puts response.body
|
212
|
+
end
|
213
|
+
elsif response.code.to_i == 401
|
214
|
+
if response["pool-empty"] == "true"
|
215
|
+
puts "#{PROGRAM_NAME} is currently not serving any applications."
|
216
|
+
else
|
217
|
+
print_permission_error_message
|
218
|
+
exit 2
|
219
|
+
end
|
220
|
+
else
|
221
|
+
STDERR.puts "*** An error occured."
|
222
|
+
STDERR.puts "#{response.code}: #{response.body}"
|
223
|
+
exit 2
|
224
|
+
end
|
225
|
+
|
201
226
|
when 'union_station'
|
202
227
|
request = Net::HTTP::Get.new("/server.json")
|
203
228
|
try_performing_ro_admin_basic_auth(request, instance)
|
@@ -284,12 +309,12 @@ def create_option_parser(options)
|
|
284
309
|
opts.separator ""
|
285
310
|
|
286
311
|
opts.separator "Options:"
|
287
|
-
opts.on("--show=pool|server|backtraces|xml|union_station", String,
|
312
|
+
opts.on("--show=pool|server|backtraces|xml|json|union_station", String,
|
288
313
|
"Whether to show the pool's contents,#{nl}" <<
|
289
314
|
"the currently running requests,#{nl}" <<
|
290
315
|
"the backtraces of all threads or an XML#{nl}" <<
|
291
|
-
"description of the pool.") do |what|
|
292
|
-
if what !~ /\A(pool|server|requests|backtraces|xml|union_station)\Z/
|
316
|
+
"or JSON description of the pool.") do |what|
|
317
|
+
if what !~ /\A(pool|server|requests|backtraces|xml|json|union_station)\Z/
|
293
318
|
STDERR.puts "Invalid argument for --show."
|
294
319
|
exit 1
|
295
320
|
else
|
data/build/test_basics.rb
CHANGED
@@ -55,7 +55,7 @@ task 'test:install_deps' do
|
|
55
55
|
bundle_args = ENV['BUNDLE_ARGS'].to_s
|
56
56
|
end
|
57
57
|
|
58
|
-
|
58
|
+
npm_args = ENV['NPM_ARGS'].to_s
|
59
59
|
|
60
60
|
if !PlatformInfo.locate_ruby_tool('bundle') || bundler_too_old?
|
61
61
|
sh "#{gem_install} bundler"
|
@@ -68,7 +68,7 @@ task 'test:install_deps' do
|
|
68
68
|
end
|
69
69
|
|
70
70
|
if boolean_option('NODE_MODULES', default)
|
71
|
-
sh "
|
71
|
+
sh "npm install #{npm_args}"
|
72
72
|
end
|
73
73
|
end
|
74
74
|
|
@@ -4,11 +4,6 @@
|
|
4
4
|
<meta charset="utf-8">
|
5
5
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
6
6
|
<title><%= title %></title>
|
7
|
-
<!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
|
8
|
-
<!--[if lt IE 9]>
|
9
|
-
<script src="https://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
|
10
|
-
<![endif]-->
|
11
|
-
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css">
|
12
7
|
<style type="text/css">
|
13
8
|
<%= css %>
|
14
9
|
|
@@ -134,7 +129,8 @@
|
|
134
129
|
<div id="bottom-vertical-container-margin"></div>
|
135
130
|
</div>
|
136
131
|
|
137
|
-
<script src="https://
|
132
|
+
<script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
|
133
|
+
<script src="https://code.jquery.com/jquery-migrate-1.4.1.min.js"></script>
|
138
134
|
<script>
|
139
135
|
(function() {
|
140
136
|
var toc = $('#toc');
|
data/package.json
CHANGED
@@ -4,23 +4,25 @@
|
|
4
4
|
"description": "A fast and robust web server and application server for Ruby, Python and Node.js",
|
5
5
|
"main": "index.js",
|
6
6
|
"devDependencies": {
|
7
|
-
"babel
|
8
|
-
"babel-
|
9
|
-
"babel
|
10
|
-
"babel-
|
11
|
-
"body-parser": "^1.
|
12
|
-
"css-loader": "^
|
13
|
-
"
|
14
|
-
"
|
15
|
-
"jquery": "^3.
|
16
|
-
"
|
17
|
-
"
|
18
|
-
"
|
19
|
-
"
|
20
|
-
"
|
21
|
-
"
|
22
|
-
"
|
23
|
-
"webpack": "^
|
7
|
+
"@babel/core": "^7.17.9",
|
8
|
+
"@babel/preset-env": "^7.16.11",
|
9
|
+
"@babel/preset-react": "^7.16.7",
|
10
|
+
"babel-loader": "^8.2.5",
|
11
|
+
"body-parser": "^1.20.0",
|
12
|
+
"css-loader": "^6.7.1",
|
13
|
+
"css-minimizer-webpack-plugin": "^3.4.1",
|
14
|
+
"express": "^4.17.3",
|
15
|
+
"jquery": "^3.6.0",
|
16
|
+
"mini-css-extract-plugin": "^2.6.0",
|
17
|
+
"mocha": "^6.2.3",
|
18
|
+
"multer": "^1.4.4",
|
19
|
+
"preact": "^8.5.3",
|
20
|
+
"should": "^2.1.1",
|
21
|
+
"sinon": "^1.17.7",
|
22
|
+
"style-loader": "^3.3.1",
|
23
|
+
"terser-webpack-plugin": "^5.3.1",
|
24
|
+
"webpack": "^5.72.0",
|
25
|
+
"webpack-cli": "^4.9.2"
|
24
26
|
},
|
25
27
|
"scripts": {
|
26
28
|
"test": "rake test:node"
|