Merge branch 'PHP-5.6' into PHP-7.0

Author: cmb69

ext/xml/tests/bug72714.phpt

@@ -29,7 +29,7 @@ parse(20);
 ?>
 ===DONE===
 --EXPECTF--
-Notice: xml_parser_set_option(): tagstart ignored in %s%ebug72714.php on line %d
+Notice: xml_parser_set_option(): tagstart ignored, because it is out of range in %s%ebug72714.php on line %d
 string(9) "NS1:TOTAL"
 string(0) ""
 ===DONE===

ext/xml/xml.c

@@ -70,7 +70,7 @@ ZEND_GET_MODULE(xml)
 /* }}} */
 
 
-#define SKIP_TAGSTART(str) ((str) + (parser->toffset > strlen(str) ? strlen(str) : + parser->toffset))
+#define SKIP_TAGSTART(str) ((str) + (parser->toffset > strlen(str) ? strlen(str) : parser->toffset))
 
 
 /* {{{ function prototypes */
@@ -1610,7 +1610,7 @@ PHP_FUNCTION(xml_parser_set_option)
 			convert_to_long_ex(val);
 			parser->toffset = Z_LVAL_P(val);
 			if (parser->toffset < 0) {
-				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "tagstart ignored");
+				php_error_docref(NULL TSRMLS_CC, E_NOTICE, "tagstart ignored, because it is out of range");
 				parser->toffset = 0;
 			}
 			break;