]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit13695a5ead2e65990d702139088101789c57e929
tree8383343fe36579e0eb8211a66da4f72420a8915etree | snapshot
parentb192ff155d49cbe54a221d41f1626f8dcaf47390commit | diff
parentedb27993336545409d73335f3ac96d5895be13decommit | diff
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
ext/openssl/xp_ssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.