com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_operators.c
| From: | Anatol Belski | Date: | Sun, 14 Dec 2014 18:44:24 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend_operators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83715@lists.php.net to get a copy of this message | ||
Commit: a857f3a147a4856807101a66cdfd58befa2cb489
Author: Anatol Belski <ab@php.net> Sun, 14 Dec 2014 19:44:24 +0100
Parents: 0a40e6a3dbb311ed25058bb9dae209b998ecaeed 855d2966385755435b65d77e1c0dfda17555eab9
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a857f3a147a4856807101a66cdfd58befa2cb489
Log:
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Fix bug #67106 split main fpm config
split fpm config to two parts. PR#903
fix typo
Fix undefined behaviour in strnatcmp
Fix undefined behaviour in strnatcmp
Fixed memory leak introduced by 73458e8f
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
Bugs:
https://bugs..php.net/67106
https://bugs.php.net/903
https://bugs.php.net/68545
Changed paths:
MM Zend/zend_operators.c
Diff: