diff options
| author | Rob Richards <rrichards@php.net> | 2004-11-21 14:26:26 +0000 |
|---|---|---|
| committer | Rob Richards <rrichards@php.net> | 2004-11-21 14:26:26 +0000 |
| commit | 3bdc15821f8307eb4b6700b9afdbb947152ec957 (patch) | |
| tree | c9918b1d7eb3923bfb913cb19af7a36917544fd7 | |
| parent | 3222f1defb731349e48b651acc4e6ef823fd1216 (diff) | |
| download | php-git-3bdc15821f8307eb4b6700b9afdbb947152ec957.tar.gz | |
MFH: internal entities expanded if no default handler but cdata handler exists
| -rw-r--r-- | ext/xml/compat.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/xml/compat.c b/ext/xml/compat.c index 72a9b4ed01..e0d7f08bd7 100644 --- a/ext/xml/compat.c +++ b/ext/xml/compat.c @@ -278,7 +278,6 @@ _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 || ret->etype == XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) { if (parser->h_default) { @@ -288,6 +287,12 @@ _get_entity(void *user, const xmlChar *name) _build_entity(name, xmlStrlen(name), &entity, &len); parser->h_default(parser->user, (const xmlChar *) entity, len); xmlFree(entity); + } else { + /* expat will not expand internal entities if default handler is present otherwise + it will expand and pass them to cdata handler */ + if (parser->h_cdata && ret) { + parser->h_cdata(parser->user, ret->content, xmlStrlen(ret->content)); + } } } else { if (ret->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY) { |