diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/php81-xml/files/patch-compat.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/textproc/php81-xml/files/patch-compat.c b/textproc/php81-xml/files/patch-compat.c index af608e129191..89925810a65b 100644 --- a/textproc/php81-xml/files/patch-compat.c +++ b/textproc/php81-xml/files/patch-compat.c @@ -1,4 +1,4 @@ ---- compat.c.orig 2025-07-01 21:17:52 UTC +--- compat.c.orig 2025-12-16 18:33:34 UTC +++ compat.c @@ -14,6 +14,10 @@ +----------------------------------------------------------------------+ @@ -11,14 +11,12 @@ #include "php.h" #if defined(HAVE_LIBXML) && (defined(HAVE_XML) || defined(HAVE_XMLRPC)) && !defined(HAVE_LIBEXPAT) #include "expat_compat.h" -@@ -375,7 +379,9 @@ _get_entity(void *user, const xmlChar *name) - if (ret == NULL) +@@ -376,7 +380,7 @@ _get_entity(void *user, const xmlChar *name) ret = xmlGetDocEntity(parser->parser->myDoc, name); + ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations") - if (ret == NULL || (parser->parser->instate != XML_PARSER_ENTITY_VALUE && parser->parser->instate != XML_PARSER_ATTRIBUTE_VALUE)) { -+/* Fix parse error on some XML files so that devel/pear work again. */ -+/* See https://github.com/php/php-src/issues/14834 for details. */ + if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) { + ZEND_DIAGNOSTIC_IGNORED_END if (ret == NULL || ret->etype == XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) { /* Predefined entities will expand unless no cdata handler is present */ - if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) { |