From 70c5e366f69c7af5c1d62e435e7c52ec8428c8de Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Thu, 22 Aug 2024 23:41:34 +0100
Subject: [PATCH] Revert fix for GH-14930: truncating readdir output (#15533)

---
 NEWS                                    | 2 ++
 ext/standard/tests/streams/gh14930.phpt | 2 ++
 main/php_streams.h                      | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index 58f0484fac9..b3cd233aed7 100644
--- a/NEWS
+++ b/NEWS
@@ -81,6 +81,8 @@ PHP                                                                        NEWS
   . Fixed bug GH-15028 (Memory leak in ext/phar/stream.c). (nielsdos)
   . Fixed bug GH-15034 (Integer overflow on stream_notification_callback
     byte_max parameter with files bigger than 2GB). (nielsdos)
+  . Reverted fix for GH-14930 (Custom stream wrapper dir_readdir output
+    truncated to 255 characters). (Jakub Zelenka)
 
 - Tidy:
   . Fix memory leaks in ext/tidy basedir restriction code. (nielsdos)
diff --git a/ext/standard/tests/streams/gh14930.phpt b/ext/standard/tests/streams/gh14930.phpt
index 7e034a81235..54a187332ab 100644
--- a/ext/standard/tests/streams/gh14930.phpt
+++ b/ext/standard/tests/streams/gh14930.phpt
@@ -1,5 +1,7 @@
 --TEST--
 GH-14930: Custom stream wrapper dir_readdir output truncated to 255 characters in PHP 8.3
+--XFAIL--
+Fix is an ABI break so reverted from 8.3
 --FILE--
 <?php
 
diff --git a/main/php_streams.h b/main/php_streams.h
index 33b14ff4eb3..31b80de9860 100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -107,7 +107,11 @@ typedef struct _php_stream_statbuf {
 } php_stream_statbuf;
 
 typedef struct _php_stream_dirent {
+#ifdef NAME_MAX
+	char d_name[NAME_MAX + 1];
+#else
 	char d_name[MAXPATHLEN];
+#endif
 	unsigned char d_type;
 } php_stream_dirent;