com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/string.c
| From: | JulienPauli | Date: | Fri, 08 Jul 2016 13:05:13 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92878@lists.php.net to get a copy of this message | ||
Commit: 87fe485c3562eaba4c04b5cd03d1b234ab7b2e90
Author: Julien Pauli <jpauli@php.net> Fri, 8 Jul 2016 15:05:13 +0200
Parents: 7ae00f08cf519cbfb14152600a994cdbc26d7868 1071a2655f22912fda662a76467bd4bb7fd22faf
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=87fe485c3562eaba4c04b5cd03d1b234ab7b2e90
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Backported bug #71144 (Segmentation fault when using cURL with ZTS)
fix bug #72024 (microtime() leaks memory)
Conflicts:
ext/curl/interface.c
Bugs:
https://bugs.php.net/71144
https://bugs.php.net/72024
Changed paths:
MM ext/standard/string.c
Diff: