[php-src] PHP-8.6: Merge branch 'PHP-8.4' into PHP-8.5
| From: | Kamil Tekiela | Date: | Tue, 10 Nov 2026 01:04:54 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.4' into PHP-8.5 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-143508@lists.php.net to get a copy of this message | ||
Author: Kamil Tekiela (kamil-tekiela)
Date: 2026-11-10T01:02:44Z
Commit: https://github.com/php/php-src/commit/3e1903c0944b2fa34d2bb990b7e1171ed317fd74
Raw diff: https://github.com/php/php-src/commit/3e1903c0944b2fa34d2bb990b7e1171ed317fd74.diff
Merge branch 'PHP-8.4' into PHP-8.5
Changed paths:
M NEWS
M main/streams/cast.c
Diff:
diff --git a/NEWS b/NEWS
index c0da02811a2c..1f5d866be567 100644
--- a/NEWS
+++ b/NEWS
@@ -78,6 +78,8 @@ PHP NEWS
brigade. (ndossche, Matthias Goergens, Jakub Zelenka)
. Fixed bug GH-24175 (Use-after-free when pclose() closes a stream from its
user filter). (Edmond)
+ . Fixed bug GH-15701 (Build failure: incompatible funopen() seeker pointer
+ type on 32-bit platforms). (Kamil Tekiela)
19 Nov 2026, PHP 8.5.13
diff --git a/main/streams/cast.c b/main/streams/cast.c
index 4b7183024571..363ffc787f8a 100644
--- a/main/streams/cast.c
+++ b/main/streams/cast.c
@@ -79,10 +79,10 @@ static int stream_cookie_writer(void *cookie, const char *buffer, int size)
return php_stream_write((php_stream *)cookie, (char *)buffer, size);
}
-static PHP_FPOS_T stream_cookie_seeker(void *cookie, zend_off_t position, int whence)
+static PHP_FPOS_T stream_cookie_seeker(void *cookie, PHP_FPOS_T position, int whence)
{
- return (PHP_FPOS_T)php_stream_seek((php_stream *)cookie, position, whence);
+ return (PHP_FPOS_T)php_stream_seek((php_stream *)cookie, (zend_off_t)position, whence);
}
static int stream_cookie_closer(void *cookie)