Merge remote-tracking branch 'origin/master' into php8

7 files changed, 6 insertions, 6 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3188569..af5b7238 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 * ADDED: Set CSP also as meta tag, to deal with misconfigured webservers mangling the HTTP header
 * ADDED: Sanitize SVG preview, preventing script execution in instance context
 * CHANGED: Language selection cookie only transmitted over HTTPS (#472)
- * CHANGED: Upgrading libraries to: base-x 4.0.0, bootstrap 3.4.1 (JS), DOMpurify 2.3.6, ip-lib 1.18.0, jQuery 3.6.0, random_compat 2.0.21 & Showdown 2.0.3
+ * CHANGED: Upgrading libraries to: base-x 4.0.0, bootstrap 3.4.1 (JS), DOMpurify 2.3.6, ip-lib 1.18.0, jQuery 3.6.0, random_compat 2.0.21, Showdown 2.0.3 & zlib 1.2.12
 * CHANGED: Removed automatic `.ini` configuration file migration (#808)
 * CHANGED: Removed configurable `dir` for `traffic` & `purge` limiters (#419)
 * CHANGED: Server salt, traffic and purge limiter now stored in the storage backend (#419)
diff --git a/js/common.js b/js/common.js
index 290c3996..7a68c7ed 100644
--- a/js/common.js
+++ b/js/common.js
@@ -12,7 +12,7 @@ global.WebCrypto = require('@peculiar/webcrypto').Crypto;
 // application libraries to test
 global.$ = global.jQuery = require('./jquery-3.6.0');
 global.RawDeflate = require('./rawinflate-0.3').RawDeflate;
-global.zlib = require('./zlib-1.2.11').zlib;
+global.zlib = require('./zlib-1.2.12').zlib;
 require('./prettify');
 global.prettyPrint = window.PR.prettyPrint;
 global.prettyPrintOne = window.PR.prettyPrintOne;
diff --git a/js/zlib-1.2.11.wasm b/js/zlib-1.2.11.wasm
deleted file mode 100644
index d98ea382..00000000
--- a/js/zlib-1.2.11.wasm
+++ /dev/null
diff --git a/js/zlib-1.2.11.js b/js/zlib-1.2.12.js
index ed0abea8..a245608f 100644
--- a/js/zlib-1.2.11.js
+++ b/js/zlib-1.2.12.js
@@ -26,9 +26,9 @@
 
 let buff;
 if (typeof fetch === 'undefined') {
- buff = fs.readFileSync('zlib-1.2.11.wasm');
+ buff = fs.readFileSync('zlib-1.2.12.wasm');
 } else {
- const resp = await fetch('js/zlib-1.2.11.wasm');
+ const resp = await fetch('js/zlib-1.2.12.wasm');
 buff = await resp.arrayBuffer();
 }
 const module = await WebAssembly.compile(buff);
diff --git a/js/zlib-1.2.12.wasm b/js/zlib-1.2.12.wasm
new file mode 100644
index 00000000..0b86cf5d
--- /dev/null
+++ b/js/zlib-1.2.12.wasm
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index ec39effb..41fa2deb 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -55,7 +55,7 @@ if ($ZEROBINCOMPATIBILITY) :
 <?php
 endif;
 ?>
- <script type="text/javascript" data-cfasync="false" src="js/zlib-1.2.11.js" integrity="sha512-Yey/0yoaVmSbqMEyyff3DIu8kCPwpHvHf7tY1AuZ1lrX9NPCMg87PwzngMi+VNbe4ilCApmePeuKT869RTcyCQ==" crossorigin="anonymous"></script>
+ <script type="text/javascript" data-cfasync="false" src="js/zlib-1.2.12.js" integrity="sha512-Ewve1dyEW/Vf97OY91/aWqMx9NaaUK5d8Z6JB1RR5gFXtMhse/Ya7D/5CE/UrQTwOWqmkvn97JjP4YDUrmq/yA==" crossorigin="anonymous"></script>
 <script type="text/javascript" data-cfasync="false" src="js/base-x-4.0.0.js" integrity="sha512-nNPg5IGCwwrveZ8cA/yMGr5HiRS5Ps2H+s0J/mKTPjCPWUgFGGw7M5nqdnPD3VsRwCVysUh3Y8OWjeSKGkEQJQ==" crossorigin="anonymous"></script>
 <script type="text/javascript" data-cfasync="false" src="js/rawinflate-0.3.js" integrity="sha512-g8uelGgJW9A/Z1tB6Izxab++oj5kdD7B4qC7DHwZkB6DGMXKyzx7v5mvap2HXueI2IIn08YlRYM56jwWdm2ucQ==" crossorigin="anonymous"></script>
 <script type="text/javascript" data-cfasync="false" src="js/bootstrap-3.4.1.js" integrity="sha512-oBTprMeNEKCnqfuqKd6sbvFzmFQtlXS3e0C/RGFV0hD6QzhHV+ODfaQbAlmY6/q0ubbwlAM/nCJjkrgA3waLzg==" crossorigin="anonymous"></script>
diff --git a/tpl/page.php b/tpl/page.php
index 0beda2cd..df2031b9 100644
--- a/tpl/page.php
+++ b/tpl/page.php
@@ -34,7 +34,7 @@ if ($ZEROBINCOMPATIBILITY):
 <?php
 endif;
 ?>
- <script type="text/javascript" data-cfasync="false" src="js/zlib-1.2.11.js" integrity="sha512-Yey/0yoaVmSbqMEyyff3DIu8kCPwpHvHf7tY1AuZ1lrX9NPCMg87PwzngMi+VNbe4ilCApmePeuKT869RTcyCQ==" crossorigin="anonymous"></script>
+ <script type="text/javascript" data-cfasync="false" src="js/zlib-1.2.12.js" integrity="sha512-Ewve1dyEW/Vf97OY91/aWqMx9NaaUK5d8Z6JB1RR5gFXtMhse/Ya7D/5CE/UrQTwOWqmkvn97JjP4YDUrmq/yA==" crossorigin="anonymous"></script>
 <script type="text/javascript" data-cfasync="false" src="js/base-x-4.0.0.js" integrity="sha512-nNPg5IGCwwrveZ8cA/yMGr5HiRS5Ps2H+s0J/mKTPjCPWUgFGGw7M5nqdnPD3VsRwCVysUh3Y8OWjeSKGkEQJQ==" crossorigin="anonymous"></script>
 <script type="text/javascript" data-cfasync="false" src="js/rawinflate-0.3.js" integrity="sha512-g8uelGgJW9A/Z1tB6Izxab++oj5kdD7B4qC7DHwZkB6DGMXKyzx7v5mvap2HXueI2IIn08YlRYM56jwWdm2ucQ==" crossorigin="anonymous"></script>
 <?php