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.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Revert "Port XML_GetCurrentByteIndex to public APIs"
This commit is contained in:
Niels Dossche
2025-04-23 22:08:10 +02:00
parent 94b58239e8 54e662c6f5
commit 40894bcc49
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ext/xml/compat.c
View File

@@ -689,20 +689,8 @@ XML_GetCurrentColumnNumber(XML_Parser parser)
PHP_XML_API long
XML_GetCurrentByteIndex(XML_Parser parser)
{
/* We have to temporarily disable the encoder to satisfy the note from the manual:
* "This function returns byte index according to UTF-8 encoded text disregarding if input is in another encoding."
* Although that should probably be corrected at one point? (TODO) */
xmlCharEncodingHandlerPtr encoder = NULL;
xmlParserInputPtr input = parser->parser->input;
if (input->buf) {
encoder = input->buf->encoder;
input->buf->encoder = NULL;
}
long result = xmlByteConsumed(parser->parser);
if (encoder) {
input->buf->encoder = encoder;
}
return result;
return parser->parser->input->consumed +
(parser->parser->input->cur - parser->parser->input->base);
}
PHP_XML_API int