You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
BjarneDM
94ff02c67b
This is a combination of commits. php74: implicit ints problem libxml2 is now @2.13.5_2 php-openssl: fix for Dependency path specified multiple times in depends_build Closes: #30533 Closes: #29866 Closes: https://trac.macports.org/ticket/72208 Closes: https://trac.macports.org/ticket/71999
13 lines
879 B
Diff
13 lines
879 B
Diff
https://github.com/php/php-src/commit/67259e4
|
|
--- php-src/ext/xml/compat.c.orig 2025-03-29 11:04:03.000000000 -0600
|
|
+++ php-src/ext/xml/compat.c 2025-03-29 16:00:42.000000000 -0600
|
|
@@ -376,7 +376,7 @@ _get_entity(void *user, const xmlChar *name)
|
|
if (ret == NULL)
|
|
ret = xmlGetDocEntity(parser->parser->myDoc, name);
|
|
|
|
- if (ret == NULL || (parser->parser->instate != XML_PARSER_ENTITY_VALUE && parser->parser->instate != XML_PARSER_ATTRIBUTE_VALUE)) {
|
|
+ if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) {
|
|
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)) {
|