Skip to content

Commit 3e1903c

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
2 parents 5df5e4a + ba22640 commit 3e1903c

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

‎NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ PHP NEWS
7878
brigade. (ndossche, Matthias Goergens, Jakub Zelenka)
7979
. Fixed bug GH-24175 (Use-after-free when pclose() closes a stream from its
8080
user filter). (Edmond)
81+
. Fixed bug GH-15701 (Build failure: incompatible funopen() seeker pointer
82+
type on 32-bit platforms). (Kamil Tekiela)
8183

8284
19 Nov 2026, PHP 8.5.13
8385

‎main/streams/cast.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ static int stream_cookie_writer(void *cookie, const char *buffer, int size)
7979
return php_stream_write((php_stream *)cookie, (char *)buffer, size);
8080
}
8181

82-
static PHP_FPOS_T stream_cookie_seeker(void *cookie, zend_off_t position, int whence)
82+
static PHP_FPOS_T stream_cookie_seeker(void *cookie, PHP_FPOS_T position, int whence)
8383
{
8484

85-
return (PHP_FPOS_T)php_stream_seek((php_stream *)cookie, position, whence);
85+
return (PHP_FPOS_T)php_stream_seek((php_stream *)cookie, (zend_off_t)position, whence);
8686
}
8787

8888
static int stream_cookie_closer(void *cookie)

0 commit comments

Comments
 (0)