com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/xml/xml.c
| From: | Christoph Michael Becker | Date: | Sat, 20 Aug 2016 10:46:08 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/xml/xml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94014@lists.php.net to get a copy of this message | ||
Commit: 39172d44d8cdb9caf76ae851e3bb8f21091564ea
Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 20 Aug 2016 12:46:08 +0200
Parents: 078f6742127c65cfbeeac4b5aa3290263367822c 52793c14d951b12f0eca806bb55a97011a322243
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=39172d44d8cdb9caf76ae851e3bb8f21091564ea
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Changed paths:
MM ext/xml/xml.c
Diff:
diff --cc ext/xml/xml.c
index de10194,5912f91..4308693
--- 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;