diff options
| author | Anatol Belski <ab@php.net> | 2014-12-14 19:44:24 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-14 19:44:24 +0100 |
| commit | a857f3a147a4856807101a66cdfd58befa2cb489 (patch) | |
| tree | 3138c4c6c7705d57526b926eae9ed23e012c80a3 /sapi/apache2handler/php_functions.c | |
| parent | 0a40e6a3dbb311ed25058bb9dae209b998ecaeed (diff) | |
| parent | 855d2966385755435b65d77e1c0dfda17555eab9 (diff) | |
| download | php-git-a857f3a147a4856807101a66cdfd58befa2cb489.tar.gz | |
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
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions