diff options
author | Anatol Belski <ab@php.net> | 2014-04-26 01:27:13 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-04-26 01:27:13 +0200 |
commit | 92a73b042f80c914e02ddf78f91562bd321b58b8 (patch) | |
tree | 5b011f9fbfa51b4b71e11629981ea12f76d774e7 /sapi/phpdbg/phpdbg_help.c | |
parent | 2b6be486859faf1bf03fc6246f3d505c377623e9 (diff) | |
parent | 5dbe7c98e43f9347fd970e9258af41492a0f96dc (diff) | |
download | php-git-92a73b042f80c914e02ddf78f91562bd321b58b8.tar.gz |
Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
Fix #66908: php-fpm reload leaks epoll_create() file descriptor
fix file descriptor leak of epollfd
Fix a compiler warning in php_rand.h
Fix #50444: PDO-ODBC changes for 64-bit
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions