diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-12-13 22:28:45 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-12-13 22:28:45 +0000 |
| commit | f804a3614ebc718f647e9205e6f593eba632dcd0 (patch) | |
| tree | c90312bf4abb6a49e7f9e974cf1aff14fd14922f /sapi/apache2handler/php_functions.c | |
| parent | ba62b9bbf87635e5d12546c426324e095cb1a0bb (diff) | |
| parent | 034e6decb3d1effa85afadcf07973bb8db433960 (diff) | |
| download | php-git-f804a3614ebc718f647e9205e6f593eba632dcd0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
NEWS
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions