summaryrefslogtreecommitdiff
path: root/ext/xml/compat.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/xml/compat.c')
-rw-r--r--ext/xml/compat.c7
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;