diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-08-07 12:07:55 -0400 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-08-07 12:07:55 -0400 |
| commit | 98e67add15a6b889efe152c23ed15a61f022a63a (patch) | |
| tree | 20a15e8f32cc3549e9731942cffc865c6aaabc0d /ext/mysql/php_mysql.c | |
| parent | 2cdc1a2b7473eff27c224c66dcb85118b553a147 (diff) | |
| parent | 5ac2e5f850c483394870dadca465c1322a4a51cf (diff) | |
| download | php-git-98e67add15a6b889efe152c23ed15a61f022a63a.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Bug #41631: Observe socket read timeouts in SSL streams
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions