]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b9ac5e2 3728449)
Merge branch 'PHP-5.4' into PHP-5.5
authorDaniel Lowrey <rdlowrey@php.net>
Tue, 9 Sep 2014 15:27:20 +0000 (09:27 -0600)
committerDaniel Lowrey <rdlowrey@php.net>
Tue, 9 Sep 2014 15:27:20 +0000 (09:27 -0600)
commitbf2f80b22356cd93748dd7551dfa0b54fb53e5b5
tree6e92c2abce8ebc686e1081f74d0c7382137f32a0tree | snapshot
parentb9ac5e23fb1b347b5eab250832999e291d65807acommit | diff
parent372844918a318ad712e16f9ec636682424a65403commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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.