diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-12-13 22:30:19 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-12-13 22:30:19 +0000 |
| commit | 51771ed238fd27b2c756df532a67237d138cc174 (patch) | |
| tree | 5f14bb541fca9e6ddfbae7d7fc73ebd12795c84b /ext/standard/basic_functions.h | |
| parent | 2e5de0c323310bfcbd6e1dba76ec1edeb5e7b6dd (diff) | |
| parent | f804a3614ebc718f647e9205e6f593eba632dcd0 (diff) | |
| download | php-git-51771ed238fd27b2c756df532a67237d138cc174.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix undefined behaviour in strnatcmp
update NEWS
move the test to the right place
Fixed bug #68545 NULL pointer dereference in unserialize.c
Diffstat (limited to 'ext/standard/basic_functions.h')
0 files changed, 0 insertions, 0 deletions