passenger 6.0.13 → 6.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a18af9e7b3ec92ce88aa64fd7d62242691972a
-  data.tar.gz: b3b72d0daa134635ea11f3cab5745f7a491dd102
+  metadata.gz: f51fe2f94d713dcb1f6f56e57fcdf9a15b55cd60
+  data.tar.gz: 043ca2b56fb2c4cd1402588e5710b494966591b8
 SHA512:
-  metadata.gz: 42bd44f99c71b20f121f91197ae7e407993fef8a15935659907f98399d10deb5c97dac9acb8f9cb253cb42b1304a140769a67c08a22e7f9fe1cda5e9cb06e3f0
-  data.tar.gz: 923ab59ac46d2d6f96f265fa79628a8f68186c2e8055bbb451cbcf9f593f5f58cb1cfaf1c4aef8950a8356a8c2b95a0821f957211ca5d003b262e33b1c813453
+  metadata.gz: 4b4f504752a5ed7fedee9c701431b47abfd168a7fddfbb14510f2127e420f33728e765feb5ce40fcd56483c5f546bddb201ce0ef96cdb161717b946ccaa5ab5e
+  data.tar.gz: 60f2803713c89eada3f62d47d5cf0f55d26e01b2c2ee23af4144def877b18772f29dcfe2654a5f2597c33de76bd4dcadeca84d4ba1b4dcc7bbfee09aa8cd7bc9

data/CHANGELOG

@@ -1,4 +1,54 @@
-Release 6.0.13 (Not yet released)
+Release 6.0.15 (Not yet released)
+-------------
+ * Restore ability to build against upstream libev. Contributed by Antonio Terceiro. Closes GH-1544.
+ * Improve rvm gemset detection. Closes GH-2420.
+ * Fix watchdog error on disable-log-prefix flag. Contributed by Paul Hanyzewski. Closes GH-2363.
+ * Upgrades Boost to 1.80.
+ * Fixed compilation on some platforms by explicitely using the stl queue. Closes GH-2440.
+ * Raise an error in case rack gets an ENOBUFS error. Contributed by Mathieu Jobin.
+ * Fixes interaction between preload bundler option and setenv RUBYOPT option. Closes GH-2424.
+ * Add rpm packages for el9 (RHEL, Rocky, Alma). Closes GH-2431.
+ * Upgrade jsoncpp to 1.9.5.
+ * Improve Solaris support for 11.3 & 11.4.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+ - ccache: 4.6 → 4.6.3
+ - cmake: 3.23.1 → 3.24.2
+ - curl: 7.82.0 → 7.85.0
+ - git: 2.36.0 → 2.37.3
+ - gnupg: 2.3.5 → 2.3.7
+ - libiconv: 1.16 → 1.17
+ - libksba: 1.6.0 → 1.6.1
+ - openssl: 1.1.1n → 1.1.1q
+ - pinentry: 1.2.0 → 1.2.1
+ - rubygems: 3.3.12 → 3.3.22
+
+
+Release 6.0.14
+-------------
+ * Removes use of rexml in passenger restart command, because it was removed from Ruby 3. Closes GH-2415.
+ * Adds Ubuntu 22.04 "Jammy" packages, and removes Ubuntu 21.10 "Impish" packages.
+ * Fixes a use after free regression introduced in 6.0.12.
+ * Fixed a warning about ERB.new argument deprecation in Ruby 3.1. Closes GH-2417.
+ * Removed google apis from error pages for easier GDPR compliance.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+
+   - cmake 3.22.3 → 3.23.1
+   - git 2.35.1 → 2.36.0
+   - gnupg 2.3.4 → 2.3.5
+   - libgcrypt 1.9.4 → 1.10.1
+   - libgpg_error 1.44 → 1.45
+   - ntbtls 0.3.0 → 0.3.1
+   - rubygems 3.3.9 → 3.3.12
+   - zlib 1.2.11 → 1.2.12
+   - ruby
+     - 2.6.9 → 2.6.10
+     - 2.7.5 → 2.7.6
+     - 3.0.3 → 3.0.4
+     - 3.1.1 → 3.1.2
+
+
+Release 6.0.13
 -------------
  * Add WASM mime type, Closes GH-2398.
  * Fix compilation on FreeBSD 13. Closes GH-2402.

data/CONTRIBUTORS

@@ -71,6 +71,7 @@ Luuk Hendriks (Phusion)
 MAEDA Go
 Magnus Holm
 Mark R. James
+Mathieu Jobin
 Matt Ozinga
 Michal Papis
 Michał Pokrywka
@@ -86,6 +87,7 @@ Oleksiy Shchukin
 Olle Jonsson
 Pat Downey
 Paul B
+Paul Hanyzewski
 Paul Kmiec
 Pepijn Looije
 Perry Smith

data/bin/passenger-status

@@ -41,6 +41,7 @@ PhusionPassenger.require_passenger_lib 'config/utils'
 PhusionPassenger.require_passenger_lib 'utils/ansi_colors'
 require 'optparse'
 require 'socket'
+require 'json'
 require 'net/http'
 
 include PhusionPassenger::SharedConstants
@@ -114,7 +115,7 @@ end
 
 def show_status(instance, options)
   # if the noshow override is not specified, the default is to show the header, unless show=xml
-  if options[:noheader] != true && options[:show] != 'xml'
+  if options[:noheader] != true && !['xml','json'].include?(options[:show])
     print_header(STDOUT, instance)
   end
 
@@ -198,6 +199,30 @@ def show_status(instance, options)
       exit 2
     end
 
+  when 'json'
+    request = Net::HTTP::Get.new("/pool.json?secrets=#{options[:verbose]}")
+    try_performing_ro_admin_basic_auth(request, instance)
+    response = instance.http_request("agents.s/core_api", request)
+    if response.code.to_i / 100 == 2
+      indented = JSON.pretty_generate(JSON.parse(response.body))
+      if indented
+        puts indented
+      else
+        puts response.body
+      end
+    elsif response.code.to_i == 401
+      if response["pool-empty"] == "true"
+        puts "#{PROGRAM_NAME} is currently not serving any applications."
+      else
+        print_permission_error_message
+        exit 2
+      end
+    else
+      STDERR.puts "*** An error occured."
+      STDERR.puts "#{response.code}: #{response.body}"
+      exit 2
+    end
+
   when 'union_station'
     request = Net::HTTP::Get.new("/server.json")
     try_performing_ro_admin_basic_auth(request, instance)
@@ -284,12 +309,12 @@ def create_option_parser(options)
     opts.separator ""
 
     opts.separator "Options:"
-    opts.on("--show=pool|server|backtraces|xml|union_station", String,
+    opts.on("--show=pool|server|backtraces|xml|json|union_station", String,
             "Whether to show the pool's contents,#{nl}" <<
             "the currently running requests,#{nl}" <<
             "the backtraces of all threads or an XML#{nl}" <<
-            "description of the pool.") do |what|
-      if what !~ /\A(pool|server|requests|backtraces|xml|union_station)\Z/
+            "or JSON description of the pool.") do |what|
+      if what !~ /\A(pool|server|requests|backtraces|xml|json|union_station)\Z/
         STDERR.puts "Invalid argument for --show."
         exit 1
       else

data/build/common_library.rb

@@ -110,6 +110,7 @@ if USE_VENDORED_LIBEV
     result = '-Isrc/cxx_supportlib/vendor-modified/libev'
     # Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
     result << ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+    result << ' -DUSE_VENDORED_LIBEV'
     result
   end
 

data/build/test_basics.rb

@@ -55,7 +55,7 @@ task 'test:install_deps' do
     bundle_args = ENV['BUNDLE_ARGS'].to_s
   end
 
-  yarn_args = ENV['YARN_ARGS'].to_s
+  npm_args = ENV['NPM_ARGS'].to_s
 
   if !PlatformInfo.locate_ruby_tool('bundle') || bundler_too_old?
     sh "#{gem_install} bundler"
@@ -68,7 +68,7 @@ task 'test:install_deps' do
   end
 
   if boolean_option('NODE_MODULES', default)
-    sh "yarn install #{yarn_args}"
+    sh "npm install #{npm_args}"
   end
 end
 

data/doc/templates/markdown.html.erb

@@ -4,11 +4,6 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><%= title %></title>
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-      <script src="https://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
-    <![endif]-->
-    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css">
     <style type="text/css">
       <%= css %>
       
@@ -134,7 +129,8 @@
       <div id="bottom-vertical-container-margin"></div>
     </div>
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+    <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
+    <script src="https://code.jquery.com/jquery-migrate-1.4.1.min.js"></script>
     <script>
       (function() {
         var toc = $('#toc');

data/package.json

@@ -4,23 +4,25 @@
   "description": "A fast and robust web server and application server for Ruby, Python and Node.js",
   "main": "index.js",
   "devDependencies": {
-    "babel-core": "^6.25.0",
-    "babel-loader": "^7.0.0",
-    "babel-preset-env": "^1.5.2",
-    "babel-preset-react": "^6.24.1",
-    "body-parser": "^1.18.2",
-    "css-loader": "^0.28.4",
-    "express": "^4.16.3",
-    "extract-text-webpack-plugin": "^2.1.2",
-    "jquery": "^3.2.1",
-    "mocha": "^6.0.2",
-    "multer": "^1.3.0",
-    "preact": "^8.1.0",
-    "should": "^2.0.1",
-    "sinon": "^1.7.3",
-    "style-loader": "^0.18.2",
-    "uglifyjs-webpack-plugin": "^0.4.3",
-    "webpack": "^2.6.0"
+    "@babel/core": "^7.17.9",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-react": "^7.16.7",
+    "babel-loader": "^8.2.5",
+    "body-parser": "^1.20.0",
+    "css-loader": "^6.7.1",
+    "css-minimizer-webpack-plugin": "^3.4.1",
+    "express": "^4.17.3",
+    "jquery": "^3.6.0",
+    "mini-css-extract-plugin": "^2.6.0",
+    "mocha": "^6.2.3",
+    "multer": "^1.4.4",
+    "preact": "^8.5.3",
+    "should": "^2.1.1",
+    "sinon": "^1.17.7",
+    "style-loader": "^3.3.1",
+    "terser-webpack-plugin": "^5.3.1",
+    "webpack": "^5.72.0",
+    "webpack-cli": "^4.9.2"
   },
   "scripts": {
     "test": "rake test:node"