com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/x p_ssl.c
| From: | rdlowrey@php.net | Date: | Thu, 07 Aug 2014 15:51:42 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/openssl/x p_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79780@lists.php.net to get a copy of this message | ||
Commit: 5ac2e5f850c483394870dadca465c1322a4a51cf
Author: Daniel Lowrey <rdlowrey@php.net> Thu, 7 Aug 2014 11:51:42 -0400
Parents: 58088c24eb55cfec3bebd1cb78cf1f5d89ac94ec 6569db88081562f68a4f79e52cba83482bdf05fc
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5ac2e5f850c483394870dadca465c1322a4a51cf
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #41631: Observe socket read timeouts in SSL streams
Bugs:
https://bugs.php.net/41631
Changed paths:
MM ext/openssl/xp_ssl.c
Diff: