]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9940ab df33731)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 14 Apr 2015 18:12:58 +0000 (11:12 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 14 Apr 2015 18:12:58 +0000 (11:12 -0700)
* PHP-5.5:
  Fixed recently introduced memory leak
  Fix Bug #69402: Reading empty SSL stream hangs until timeout


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.