com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c main/php_streams.h main/streams/streams.c
| From: | Ferenc Kovacs | Date: | Wed, 15 Oct 2014 17:41:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/openssl/xp_ssl.c main/php_streams.h main/streams/streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82358@lists.php.net to get a copy of this message | ||
Commit: d2ab6e1d15f58cb4f53c0a69c438c0721264455a
Author: Ferenc Kovacs <tyrael@php.net> Wed, 15 Oct 2014 19:41:27 +0200
Parents: 7e116a3baa39808696ead8073965239015df1c50 2109f5bfe362fdfe840a7014bd62682de3d95c5c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d2ab6e1d15f58cb4f53c0a69c438c0721264455a
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
Bugs:
https://bugs.php.net/67965
https://bugs.php.net/41631
Changed paths:
MM ext/openssl/xp_ssl.c
MM main/php_streams.h
MM main/streams/streams.c
Diff: