diff options
| author | Anatol Belski <ab@php.net> | 2014-12-10 11:54:31 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-10 11:54:31 +0100 |
| commit | aeb30576f6e6f4458c922a5c7ac15ec1a25625f9 (patch) | |
| tree | 8c03d2880ddd3a1b4d16105ef9ac4bc545a12db4 /sapi/apache2handler/php_functions.c | |
| parent | c4c9f7456b271a73b26e883f463cd6442ac28289 (diff) | |
| parent | a96957f0da8e733a13f20327c12f876e8966aff1 (diff) | |
| download | php-git-aeb30576f6e6f4458c922a5c7ac15ec1a25625f9.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fixed bug #68545 NULL pointer dereference in unserialize.c
Updated NEWS
Updated NEWS
Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions