com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_i ni_scanner.l
| From: | Anatol Belski | Date: | Wed, 10 Jun 2015 08:43:23 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_i ni_scanner.l | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87165@lists.php.net to get a copy of this message | ||
Commit: ca467d5117667737dd482971319358430b95ea97
Author: Anatol Belski <ab@php.net> Wed, 10 Jun 2015 10:43:23 +0200
Parents: b5d5baa8823ab29386c11be1046ddfe7aee43b7f aef5a02ebb87212f9bd5afd44f70a03d23cb62dc
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ca467d5117667737dd482971319358430b95ea97
Log:
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
made failing test more meaningful
added failing test
Changed paths:
MM Zend/zend_ini_scanner.l
Diff: