diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-20 12:46:08 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-20 12:46:08 +0200 |
| commit | 39172d44d8cdb9caf76ae851e3bb8f21091564ea (patch) | |
| tree | 577fd3adba62f5aebef9583d26dcec823c3b593c /ext | |
| parent | 078f6742127c65cfbeeac4b5aa3290263367822c (diff) | |
| parent | 52793c14d951b12f0eca806bb55a97011a322243 (diff) | |
| download | php-git-39172d44d8cdb9caf76ae851e3bb8f21091564ea.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/xml/tests/bug72714.phpt | 2 | ||||
| -rw-r--r-- | ext/xml/xml.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/xml/tests/bug72714.phpt b/ext/xml/tests/bug72714.phpt index 192c8f6949..7b44e1fd11 100644 --- a/ext/xml/tests/bug72714.phpt +++ b/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=== diff --git a/ext/xml/xml.c b/ext/xml/xml.c index de10194998..43086934a5 100644 --- a/ext/xml/xml.c +++ b/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; |