From 5acff0e61dd9a62ddff52bea25d552db45fb32e6 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Tue, 11 Feb 2025 21:57:50 +0100
Subject: [PATCH] Update NEWS and UPGRADING for zlib flock() support

[ci skip]

Closes GH-17752.
---
 NEWS      | 1 +
 UPGRADING | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index c10ef7b24c4de..aa539b4f40733 100644
--- a/NEWS
+++ b/NEWS
@@ -165,6 +165,7 @@ PHP                                                                        NEWS
     is now a boolean. (David Carlier)
   . Fixed bug GH-16883 (gzopen() does not use the default stream context when
     opening HTTP URLs). (nielsdos)
+  . Implemented GH-17668 (zlib streams should support locking). (nielsdos)
 
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/UPGRADING b/UPGRADING
index eca064f3e4855..86b3dfe66ad92 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -107,6 +107,10 @@ PHP 8.5 UPGRADE NOTES
     and is not a QName because in those cases the namespace is taken
     from the namespace href or prefix respectively.
 
+- Zlib:
+  . flock() is now supported on zlib streams. Previously, this always
+    failed to perform any locking action.
+
 ========================================
 3. Changes in SAPI modules
 ========================================