diff options
Diffstat (limited to 'ext/xml/compat.c')
| -rw-r--r-- | ext/xml/compat.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/xml/compat.c b/ext/xml/compat.c index d39afacc0b..30b9ff3030 100644 --- a/ext/xml/compat.c +++ b/ext/xml/compat.c @@ -599,6 +599,13 @@ has been defined and none can be detected */ error = xmlParseChunk(parser->parser, (char *) data, data_len, is_final); if (error) { +<<<<<<< HEAD + return 0; + } else { + return 1; + } else if (parser->parser->lastError.level > XML_ERR_WARNING ){ +======= +>>>>>>> PHP-7.1 return 0; } else { return 1; |