]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Mon, 9 Mar 2015 22:02:04 +0000 (16:02 -0600)
committerDaniel Lowrey <rdlowrey@php.net>
Mon, 9 Mar 2015 22:02:04 +0000 (16:02 -0600)
commit748433e7bcedba58fa7057a048b8b257279a2569
tree64d99b240040edbb828ed9b7ea5cd6c3afb37740
parentf174859acdb9d99176440a30b6608388a383de3f
parent69691cc8cae4ac23aeeac7170458de63c5cf9267
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix crypto stream timeout regressions

Conflicts:
ext/openssl/xp_ssl.c
ext/openssl/xp_ssl.c