From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Sat, 20 Aug 2016 10:46:08 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.11RC1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39172d44d8cdb9caf76ae851e3bb8f21091564ea;p=php

Merge branch 'PHP-5.6' into PHP-7.0
---

39172d44d8cdb9caf76ae851e3bb8f21091564ea
diff --cc ext/xml/xml.c
index de10194998,5912f9143d..43086934a5
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@@ -1608,9 -1636,9 +1608,9 @@@ PHP_FUNCTION(xml_parser_set_option
  			break;
  		case PHP_XML_OPTION_SKIP_TAGSTART:
  			convert_to_long_ex(val);
 -			parser->toffset = Z_LVAL_PP(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;