Skip to content

Commit 43b6f64

Browse files
committed
Merge branch 'PHP-8.5' into PHP-8.6
2 parents 57e3ec7 + 3e1903c commit 43b6f64

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
@@ -98,6 +98,8 @@ PHP NEWS
9898
brigade. (ndossche, Matthias Goergens, Jakub Zelenka)
9999
. Fixed bug GH-24175 (Use-after-free when pclose() closes a stream from its
100100
user filter). (Edmond)
101+
. Fixed bug GH-15701 (Build failure: incompatible funopen() seeker pointer
102+
type on 32-bit platforms). (Kamil Tekiela)
101103

102104
05 Nov 2026, PHP 8.6.0RC5
103105

‎main/streams/cast.c‎

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

80-
static PHP_FPOS_T stream_cookie_seeker(void *cookie, zend_off_t position, int whence)
80+
static PHP_FPOS_T stream_cookie_seeker(void *cookie, PHP_FPOS_T position, int whence)
8181
{
8282

83-
return (PHP_FPOS_T)php_stream_seek((php_stream *)cookie, position, whence);
83+
return (PHP_FPOS_T)php_stream_seek((php_stream *)cookie, (zend_off_t)position, whence);
8484
}
8585

8686
static int stream_cookie_closer(void *cookie)

0 commit comments

Comments
 (0)