com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c
| From: | Daniel Lowrey | Date: | Tue, 14 Apr 2015 15:27:37 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86234@lists.php.net to get a copy of this message | ||
Commit: 4f07330e798a4e7b12bcc1811c3c71d17b71f22c
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 14 Apr 2015 09:27:37 -0600
Parents: a7059f1eac383a8e42f06586d06ffd5193ed61ef 81f356b4aea79cd8f86e16096c7ccfbc455bfc3c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4f07330e798a4e7b12bcc1811c3c71d17b71f22c
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix Bug #69402: Reading empty SSL stream hangs until timeout
Conflicts:
ext/openssl/xp_ssl.c
Bugs:
https://bugs.php.net/69402
Changed paths:
MM ext/openssl/xp_ssl.c
Diff: