github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[6.8] Upgrade from h2o2 v8.2.0 to @hapi/h2o2 v8.3.2 (#100333)

Browse source
This commit is contained in:
Thomas Watson 2021-05-26 11:27:34 +02:00 • committed by GitHub
parent df41843abc
commit 5b71ac851b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -135,6 +135,7 @@
"@elastic/ui-ace": "0.2.3",
"@hapi/boom": "^7.4.11",
"@hapi/good-squeeze": "^6.0.0",
"@hapi/h2o2": "^8.3.2",
"@hapi/hapi": "^17.9.0",
"@hapi/hoek": "^6.2.4",
"@hapi/inert": "^5.2.2",
@ -190,7 +191,6 @@
"glob": "^7.1.2",
"glob-all": "^3.1.0",
"globby": "^8.0.1",
"h2o2": "^8.2.0",
"handlebars": "4.7.7",
"hjson": "3.1.0",
"http-proxy-agent": "^2.1.0",

2
src/core/server/http/base_path_proxy_server.ts
View file

@ -66,7 +66,7 @@ export class BasePathProxyServer {
// Register hapi plugin that adds proxying functionality. It can be configured
// through the route configuration object (see { handler: { proxy: ... } }).
await this.server.register({ plugin: require('h2o2') });
await this.server.register(require('@hapi/h2o2'));
if (this.httpConfig.ssl.enabled) {
const tlsOptions = serverOptions.tls as TlsOptions;

2
src/server/http/register_hapi_plugins.js
View file

@ -19,7 +19,7 @@
import HapiTemplates from '@hapi/vision';
import HapiStaticFiles from '@hapi/inert';
import HapiProxy from 'h2o2';
import HapiProxy from '@hapi/h2o2';
const plugins = [HapiTemplates, HapiStaticFiles, HapiProxy];

34
yarn.lock
View file

@ -940,6 +940,16 @@
"@hapi/hoek" "9.x.x"
fast-safe-stringify "2.x.x"
"@hapi/h2o2@^8.3.2":
version "8.3.2"
resolved "https://registry.yarnpkg.com/@hapi/h2o2/-/h2o2-8.3.2.tgz#008a8f9ec3d9bba29077691aa9ec0ace93d4de80"
integrity sha512-2WkZq+QAkvYHWGqnUuG0stcVeGyv9T7bopBYnCJSUEuvBZlUf2BTX2JCVSKxsnTLOxCYwoC/aI4Rr0ZSRd2oVg==
dependencies:
"@hapi/boom" "7.x.x"
"@hapi/hoek" "8.x.x"
"@hapi/joi" "16.x.x"
"@hapi/wreck" "15.x.x"
"@hapi/hapi@^17.9.0":
version "17.9.0"
resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-17.9.0.tgz#c01836a3c38fdddd372d5453b7483e9761e5d46b"
@ -4552,11 +4562,6 @@ bounce@1.x.x:
boom "7.x.x"
hoek "6.x.x"
bourne@1.x.x:
version "1.1.2"
resolved "https://registry.yarnpkg.com/bourne/-/bourne-1.1.2.tgz#e290b5bd7166635632eaf8ef12b006b2d4a75b83"
integrity sha512-b2dgVkTZhkQirNMohgC00rWfpVqEi9y5tKM1k3JvoNx05ODtfQoPPd4js9CYFQoY0IM8LAmnJulEuWv74zjUOg==
boxen@^1.2.1, boxen@^1.2.2:
version "1.3.0"
resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
@ -10711,16 +10716,6 @@ gulplog@^1.0.0:
dependencies:
glogg "^1.0.0"
h2o2@^8.2.0:
version "8.2.0"
resolved "https://registry.yarnpkg.com/h2o2/-/h2o2-8.2.0.tgz#ead6a855f40cf8fbe67986751b5e2ff8a87aa643"
integrity sha512-TwWWSk1tMg03VkSKQTrTSXWKogmpYts5Uj5W6GN9CedFJY5EtL5vz2nndd9s5qxxSMP6Wj8jyGrj/6qV9d4KDg==
dependencies:
boom "7.x.x"
hoek "5.x.x"
joi "13.x.x"
wreck "14.x.x"
handle-thing@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
@ -22986,15 +22981,6 @@ wrappy@1:
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
wreck@14.x.x:
version "14.2.0"
resolved "https://registry.yarnpkg.com/wreck/-/wreck-14.2.0.tgz#0064a5b930fc675f57830c1fd28342da1a70b0fc"
integrity sha512-NFFft3SMgqrJbXEVfYifh+QDWFxni+98/I7ut7rLbz3F0XOypluHsdo3mdEYssGSirMobM3fGlqhyikbWKDn2Q==
dependencies:
boom "7.x.x"
bourne "1.x.x"
hoek "6.x.x"
write-file-atomic@^1.1.2:
version "1.3.4"
resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f"