From 04399430645eab61aa2a200d352fabc2d920a724 Mon Sep 17 00:00:00 2001 From: Christian Heel <66922325+heelc29@users.noreply.github.com> Date: Thu, 28 Mar 2024 13:34:40 +0100 Subject: [PATCH 1/2] [4.4] add PHP8.3 to PhpVersionCheck quickicon (#43145) --- .../phpversioncheck/src/Extension/PhpVersionCheck.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php b/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php index 3e5d3f9cbd80e..f282cca9a3f94 100644 --- a/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php +++ b/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php @@ -143,6 +143,10 @@ private function getPhpSupport() 'security' => '2024-12-08', 'eos' => '2025-12-08', ], + '8.3' => [ + 'security' => '2025-11-23', + 'eos' => '2026-11-23', + ], ]; // Fill our return array with default values From bdb23b84b83368a324e417c0ce8c9865cfdeca36 Mon Sep 17 00:00:00 2001 From: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:56:48 +0100 Subject: [PATCH 2/2] [4.4] Postinstallation-Message htaccess.txt brotli change (#43173) * [4.4] Postinstallation-Message htaccess.txt brotli change * Fix copyright year Co-authored-by: Quy --------- Co-authored-by: Richard Fath Co-authored-by: Quy --- .../com_admin/postinstall/htaccessbrotli.php | 30 +++++++++++++++++++ .../sql/updates/mysql/4.4.4-2024-03-28.sql | 5 ++++ .../updates/postgresql/4.4.4-2024-03-28.sql | 6 ++++ administrator/language/en-GB/com_admin.ini | 2 ++ 4 files changed, 43 insertions(+) create mode 100644 administrator/components/com_admin/postinstall/htaccessbrotli.php create mode 100644 administrator/components/com_admin/sql/updates/mysql/4.4.4-2024-03-28.sql create mode 100644 administrator/components/com_admin/sql/updates/postgresql/4.4.4-2024-03-28.sql diff --git a/administrator/components/com_admin/postinstall/htaccessbrotli.php b/administrator/components/com_admin/postinstall/htaccessbrotli.php new file mode 100644 index 0000000000000..bc6383f63813b --- /dev/null +++ b/administrator/components/com_admin/postinstall/htaccessbrotli.php @@ -0,0 +1,30 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + * + * This file contains post-installation message handling for notifying users of a change + * in the default .htaccess file regarding setting the Content-Encoding header. + */ + +// phpcs:disable PSR1.Files.SideEffects +\defined('_JEXEC') or die; +// phpcs:enable PSR1.Files.SideEffects + +/** + * Notifies users of a change in the default .htaccess file regarding setting for brotli to prevent double compression + * + * This check returns true regardless of condition. + * + * @return boolean + * + * @since 4.4.4 + */ +function admin_postinstall_htaccessbrotli_condition() +{ + return true; +} diff --git a/administrator/components/com_admin/sql/updates/mysql/4.4.4-2024-03-28.sql b/administrator/components/com_admin/sql/updates/mysql/4.4.4-2024-03-28.sql new file mode 100644 index 0000000000000..0d1ce76be7c38 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/4.4.4-2024-03-28.sql @@ -0,0 +1,5 @@ +-- +-- Add post-installation message about setting the Content-Encoding header in .htaccess +-- +INSERT IGNORE INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) +SELECT `extension_id`, 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccessbrotli.php', 'admin_postinstall_htaccessbrotli_condition', '4.4.4', 1 FROM `#__extensions` WHERE `name` = 'files_joomla'; diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.4.4-2024-03-28.sql b/administrator/components/com_admin/sql/updates/postgresql/4.4.4-2024-03-28.sql new file mode 100644 index 0000000000000..b59b29a4a2813 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/4.4.4-2024-03-28.sql @@ -0,0 +1,6 @@ +-- +-- Add post-installation message about setting the Content-Encoding header in .htaccess +-- +INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") +SELECT "extension_id", 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccessbrotli.php', 'admin_postinstall_htaccessbrotli_condition', '4.4.4', 1 FROM "#__extensions" WHERE "name" = 'files_joomla' + ON CONFLICT DO NOTHING; diff --git a/administrator/language/en-GB/com_admin.ini b/administrator/language/en-GB/com_admin.ini index 58ee08cbc6466..2ace7b2d5f786 100644 --- a/administrator/language/en-GB/com_admin.ini +++ b/administrator/language/en-GB/com_admin.ini @@ -172,6 +172,8 @@ COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_DESCRIPTION="

Before 3.9.22 the d COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_TITLE=".htaccess Update Concerning Directory Listings" COM_ADMIN_POSTINSTALL_MSG_HTACCESS_SETCE_DESCRIPTION="

Before 4.2.9 the default htaccess.txt file contained erroneous code for appending the \"Content-Encoding\" HTTP header. This could result in double encoding errors when Joomla is installed in a subdirectory and both this directory and its parent directory contain an .htaccess file with this code. You should manually apply the necessary changes to any existing .htaccess file, as this file can not be updated automatically.

The old code:

Header append Content-Encoding gzip

The new code:

Header set Content-Encoding gzip
" COM_ADMIN_POSTINSTALL_MSG_HTACCESS_SETCE_TITLE=".htaccess Update Concerning Setting the Content-Encoding Header" +COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_DESCRIPTION="

Before 4.4.4 the default htaccess.txt did not support Brotli compression. This could result in double compression errors when Joomla is installed on a server that uses Brotli compression. You should manually apply the necessary changes to any existing .htaccess file, as this file can not be updated automatically.

The old code:

RewriteRule \"\.css\.gz$\" \"-\" [T=text/css,E=no-gzip:1]
RewriteRule \"\.js\.gz$\" \"-\" [T=text/javascript,E=no-gzip:1]

The new code:

RewriteRule \"\.css\.gz$\" \"-\" [T=text/css,E=no-gzip:1,E=no-brotli:1]
RewriteRule \"\.js\.gz$\" \"-\" [T=text/javascript,E=no-gzip:1,E=no-brotli:1]
" +COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE=".htaccess Update Brotli Compression" COM_ADMIN_SAVE_SUCCESS="Profile saved." COM_ADMIN_SESSION_AUTO_START="Session Auto Start" COM_ADMIN_SESSION_SAVE_PATH="Session Save Path"