diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-08-07 11:51:42 -0400 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-08-07 11:51:42 -0400 |
| commit | 5ac2e5f850c483394870dadca465c1322a4a51cf (patch) | |
| tree | 817f423a71945e6a482ff9776ce1ab0c81aa2f0c /ext/mysql/php_mysql.c | |
| parent | 58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec (diff) | |
| parent | 6569db88081562f68a4f79e52cba83482bdf05fc (diff) | |
| download | php-git-5ac2e5f850c483394870dadca465c1322a4a51cf.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #41631: Observe socket read timeouts in SSL streams
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions