[php-src] master: Merge branch 'PHP-8.5' into PHP-8.6
| From: | Kamil Tekiela | Date: | Tue, 10 Nov 2026 01:04:55 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.5' into PHP-8.6 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-143509@lists.php.net to get a copy of this message | ||
Author: Kamil Tekiela (kamil-tekiela)
Date: 2026-11-10T01:03:14Z
Commit: https://github.com/php/php-src/commit/43b6f644f7d7b29ee5aff4dbbea02fe0d885e20e
Raw diff: https://github.com/php/php-src/commit/43b6f644f7d7b29ee5aff4dbbea02fe0d885e20e.diff
Merge branch 'PHP-8.5' into PHP-8.6
Changed paths:
M NEWS
M main/streams/cast.c
Diff:
diff --git a/NEWS b/NEWS
index 09876838bc36..468191a7b90f 100644
--- a/NEWS
+++ b/NEWS
@@ -98,6 +98,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)
05 Nov 2026, PHP 8.6.0RC5
diff --git a/main/streams/cast.c b/main/streams/cast.c
index 269bb9e21784..0d390d1f674c 100644
--- a/main/streams/cast.c
+++ b/main/streams/cast.c
@@ -77,10 +77,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)