From 89d0fe64f0fb2d5c05b2a2951aabc4875e1b7809 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Fri, 22 Oct 2021 16:47:29 +0200
Subject: [PATCH] Announce 7.4.25

---
 ChangeLog-7.php                  | 45 ++++++++++++++++++++++++++++++++
 archive/archive.xml              |  1 +
 archive/entries/2021-10-22-1.xml | 21 +++++++++++++++
 include/releases.inc             | 37 ++++++++++++++++++++++++++
 include/version.inc              | 10 +++----
 releases/7_4_25.php              | 16 ++++++++++++
 6 files changed, 125 insertions(+), 5 deletions(-)
 create mode 100644 archive/entries/2021-10-22-1.xml
 create mode 100644 releases/7_4_25.php

diff --git a/ChangeLog-7.php b/ChangeLog-7.php
index d0b0714e0..513939a0d 100644
--- a/ChangeLog-7.php
+++ b/ChangeLog-7.php
@@ -8,6 +8,51 @@ changelog_header(7, $MINOR_VERSIONS);
 ?>
 <a id="PHP_7_4"></a>
 
+<section class="version" id="7.4.25"><!-- {{{ 7.4.25 -->
+<h3>Version 7.4.25</h3>
+<b><?php release_date('21-Oct-2021'); ?></b>
+<ul><li>DOM:
+<ul>
+  <li><?php bugfix(81433); ?> (DOMElement::setIdAttribute() called twice may remove ID).</li>
+</ul></li>
+<li>FFI:
+<ul>
+  <li><?php bugfix(79576); ?> ("TYPE *" shows unhelpful message when type is not defined).</li>
+</ul></li>
+<li>Fileinfo:
+<ul>
+  <li><?php bugfix(78987); ?> (High memory usage during encoding detection).</li>
+</ul></li>
+<li>Filter:
+<ul>
+  <li><?php bugfix(61700); ?> (FILTER_FLAG_IPV6/FILTER_FLAG_NO_PRIV|RES_RANGE failing).</li>
+</ul></li>
+<li>FPM:
+<ul>
+  <li><?php bugfix(81026); ?> (PHP-FPM oob R/W in root process leading to privilege escalation) (CVE-2021-21703).</li>
+</ul></li>
+<li>SPL:
+<ul>
+  <li><?php bugfix(80663); ?> (Recursive SplFixedArray::setSize() may cause double-free).</li>
+</ul></li>
+<li>Streams:
+<ul>
+  <li><?php bugfix(81475); ?> (stream_isatty emits warning with attached stream wrapper).</li>
+</ul></li>
+<li>XML:
+<ul>
+  <li><?php bugfix(70962); ?> (XML_OPTION_SKIP_WHITE strips embedded whitespace).</li>
+</ul></li>
+<li>Zip:
+<ul>
+  <li><?php bugfix(81490); ?> (ZipArchive::extractTo() may leak memory).</li>
+  <li><?php bugfix(77978); ?> (Dirname ending in colon unzips to wrong dir).</li>
+</ul></li>
+</ul>
+<!-- }}} --></section>
+
+
+
 <section class="version" id="7.4.24"><!-- {{{ 7.4.24 -->
 <h3>Version 7.4.24</h3>
 <b><?php release_date('23-Sep-2021'); ?></b>
diff --git a/archive/archive.xml b/archive/archive.xml
index b48cb98bd..3a5b10fb4 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
     <uri>http://php.net/contact</uri>
     <email>php-webmaster@lists.php.net</email>
   </author>
+  <xi:include href="entries/2021-10-22-1.xml"/>
   <xi:include href="entries/2021-10-21-1.xml"/>
   <xi:include href="entries/2021-10-14-1.xml"/>
   <xi:include href="entries/2021-09-30-1.xml"/>
diff --git a/archive/entries/2021-10-22-1.xml b/archive/entries/2021-10-22-1.xml
new file mode 100644
index 000000000..f8434727b
--- /dev/null
+++ b/archive/entries/2021-10-22-1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom">
+  <title>PHP 7.4.25 Released!</title>
+  <id>https://www.php.net/archive/2021.php#2021-10-22-1</id>
+  <published>2021-10-22T14:43:45+00:00</published>
+  <updated>2021-10-22T14:43:45+00:00</updated>
+  <link href="https://www.php.net/index.php#id2021-10-22-1" rel="alternate" type="text/html"/>
+  <link href="https://www.php.net/archive/2021.php#2021-10-22-1" rel="via" type="text/html"/>
+  <category term="releases" label="New PHP release"/>
+  <category term="frontpage" label="PHP.net frontpage news"/>
+  <content type="xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml"><p>The PHP development team announces the immediate availability of PHP 7.4.25. This is a security release.</p>
+
+<p>All PHP 7.4 users are encouraged to upgrade to this version.</p>
+
+<p>For source downloads of PHP 7.4.25 please visit our <a href="https://www.php.net/downloads.php">downloads page</a>,
+Windows source and binaries can be found on <a href="https://windows.php.net/download/">windows.php.net/download/</a>.
+The list of changes is recorded in the <a href="https://www.php.net/ChangeLog-7.php#7.4.25">ChangeLog</a>.
+</p>    </div>
+  </content>
+</entry>
diff --git a/include/releases.inc b/include/releases.inc
index 31543d520..65540379a 100644
--- a/include/releases.inc
+++ b/include/releases.inc
@@ -403,6 +403,43 @@ $OLDRELEASES = array (
   ),
   7 => 
   array (
+    '7.4.24' => 
+    array (
+      'announcement' => 
+      array (
+        'English' => '/releases/7_4_24.php',
+      ),
+      'tags' => 
+      array (
+        0 => 'security',
+      ),
+      'date' => '23 Sep 2021',
+      'source' => 
+      array (
+        0 => 
+        array (
+          'filename' => 'php-7.4.24.tar.gz',
+          'name' => 'PHP 7.4.24 (tar.gz)',
+          'sha256' => '8cc1758cf7ff45428c17641b1be84cd917a2909ba40c770f06a814d8b7f36333',
+          'date' => '23 Sep 2021',
+        ),
+        1 => 
+        array (
+          'filename' => 'php-7.4.24.tar.bz2',
+          'name' => 'PHP 7.4.24 (tar.bz2)',
+          'sha256' => 'f50e32b788864349041f19e31dcc65b1fcc65bc19122918f607526432edf2f32',
+          'date' => '23 Sep 2021',
+        ),
+        2 => 
+        array (
+          'filename' => 'php-7.4.24.tar.xz',
+          'name' => 'PHP 7.4.24 (tar.xz)',
+          'sha256' => 'ff7658ee2f6d8af05b48c21146af5f502e121def4e76e862df5ec9fa06e98734',
+          'date' => '23 Sep 2021',
+        ),
+      ),
+      'museum' => false,
+    ),
     '7.4.23' => 
     array (
       'announcement' => 
diff --git a/include/version.inc b/include/version.inc
index 249bcabdf..dc96f7306 100644
--- a/include/version.inc
+++ b/include/version.inc
@@ -32,13 +32,13 @@ $RELEASES = (function() {
 
     /* PHP 7.4 Release */
     $data['7.4'] = [
-        'version' => '7.4.24',
-        'date'    => '23 Sep 2021',
+        'version' => '7.4.25',
+        'date'    => '21 Oct 2021',
         'tags'    => ['security'], // Set to ['security'] for security releases
         'sha256'  => [
-            'tar.gz'  => '8cc1758cf7ff45428c17641b1be84cd917a2909ba40c770f06a814d8b7f36333',
-            'tar.bz2' => 'f50e32b788864349041f19e31dcc65b1fcc65bc19122918f607526432edf2f32',
-            'tar.xz'  => 'ff7658ee2f6d8af05b48c21146af5f502e121def4e76e862df5ec9fa06e98734',
+            'tar.gz'  => '3b2632252c933cac489a20f68b8f4ab769e5a0a3bf22b6ef47427aff6922e31f',
+            'tar.bz2' => '27992570caf3e2e5323ab7b37853c44c1529b1d31ea94d9776efa91d5a781313',
+            'tar.xz'  => '12a758f1d7fee544387a28d3cf73226f47e3a52fb3049f07fcc37d156d393c0a',
         ]
     ];
 
diff --git a/releases/7_4_25.php b/releases/7_4_25.php
new file mode 100644
index 000000000..c46af6c7d
--- /dev/null
+++ b/releases/7_4_25.php
@@ -0,0 +1,16 @@
+<?php
+$_SERVER['BASE_PAGE'] = 'releases/7_4_25.php';
+include_once __DIR__ . '/../include/prepend.inc';
+site_header('PHP 7.4.25 Release Announcement');
+?>
+<h1>PHP 7.4.25 Release Announcement</h1>
+
+<p>The PHP development team announces the immediate availability of PHP 7.4.25. This is a security release.</p>
+
+<p>All PHP 7.4 users are encouraged to upgrade to this version.</p>
+
+<p>For source downloads of PHP 7.4.25 please visit our <a href="https://www.php.net/downloads.php">downloads page</a>,
+Windows source and binaries can be found on <a href="https://windows.php.net/download/">windows.php.net/download/</a>.
+The list of changes is recorded in the <a href="https://www.php.net/ChangeLog-7.php#7.4.25">ChangeLog</a>.
+</p>
+<?php site_footer();