php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  libxml: Fix input buffer deprecation
This commit is contained in:
Niels Dossche
2025-11-19 18:41:50 +01:00
parent a21783c73c 6eb10dc433
commit aa9619e437
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/libxml/libxml.c
View File

@@ -526,6 +526,7 @@ static int php_libxml_streams_IO_close(void *context)
return php_stream_close((php_stream*)context);
}
/* TODO: This needs to be replaced by context-specific APIs in the future! */
static xmlParserInputBufferPtr
php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
{
@@ -560,13 +561,10 @@ php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
}
/* Allocate the Input buffer front-end. */
ret = xmlAllocParserInputBuffer(enc);
if (ret != NULL) {
ret->context = context;
ret->readcallback = php_libxml_streams_IO_read;
ret->closecallback = php_libxml_streams_IO_close;
} else
ret = xmlParserInputBufferCreateIO(php_libxml_streams_IO_read, php_libxml_streams_IO_close, context, enc);
if (ret == NULL) {
php_libxml_streams_IO_close(context);
}
return ret;
}