com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c
| From: | rdlowrey@php.net | Date: | Tue, 09 Sep 2014 16:25:36 +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-81480@lists.php.net to get a copy of this message | ||
Commit: 13695a5ead2e65990d702139088101789c57e929
Author: Daniel Lowrey <rdlowrey@php.net> Tue, 9 Sep 2014 10:25:36 -0600
Parents: b192ff155d49cbe54a221d41f1626f8dcaf47390 edb27993336545409d73335f3ac96d5895be13de
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=13695a5ead2e65990d702139088101789c57e929
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Bug #41631: Fix regression from first attempt (6569db8)
Bug #67965: Fix blocking behavior in non-blocking crypto streams
Bugs:
https://bugs.php.net/41631
https://bugs..php.net/67965
Changed paths:
MM ext/openssl/xp_ssl.c
Diff: