diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-13 05:37:49 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-13 05:37:49 +0000 |
| commit | f77be645bccd73ace0ea3a0870b907523746181c (patch) | |
| tree | a738474c81c259d425fbb2552296c608a39a16cf /ext/xml/compat.c | |
| parent | 450a596ed3b724e60fa55f73bde4a47e05030538 (diff) | |
| parent | 77efe76bf7a39a3320c0d40924c001e14f671482 (diff) | |
| download | php-git-f77be645bccd73ace0ea3a0870b907523746181c.tar.gz | |
news entry for #1787
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 0bb7b28410..30b9ff3030 100644 --- a/ext/xml/compat.c +++ b/ext/xml/compat.c @@ -593,12 +593,19 @@ has been defined and none can be detected */ } #endif + if (parser->parser->lastError.level >= XML_ERR_WARNING) { + return 0; + } + 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; |