]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b192ff1 edb2799)
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Tue, 9 Sep 2014 16:25:36 +0000 (10:25 -0600)
committerDaniel Lowrey <rdlowrey@php.net>
Tue, 9 Sep 2014 16:25:36 +0000 (10:25 -0600)
* PHP-5.6:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams

1  2 
ext/openssl/xp_ssl.c patch | diff1 | diff2 | blob | history

diff --cc ext/openssl/xp_ssl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.