diff options
author | Daniel Lowrey <rdlowrey@php.net> | 2014-08-07 12:17:29 -0400 |
---|---|---|
committer | Daniel Lowrey <rdlowrey@php.net> | 2014-08-07 12:17:29 -0400 |
commit | 217c8edd006db9acc9e30c5ed422d8d838cce2e4 (patch) | |
tree | 0a9715740402f3a251c6952a7a6453e6d92e18de /ext/mysql/php_mysql.c | |
parent | 898b5e5d52626d99e50f4a94fc18a44f6bbb9473 (diff) | |
parent | 98e67add15a6b889efe152c23ed15a61f022a63a (diff) | |
download | php-git-217c8edd006db9acc9e30c5ed422d8d838cce2e4.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Bug #41631: Observe socket read timeouts in SSL streams
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions