]> granicus.if.org Git - php/commit
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)
commit9d7b5e30ebbac1a250e794da1e845db800ec20ce
tree73d276e34f91a28c0390593d7798ad2495f0786c
parentb9940ab1bd03716459b48e0d21a63ecad283f460
parentdf33731812e1ac83a4f25c92b9a05d23f4b12550
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed recently introduced memory leak
  Fix Bug #69402: Reading empty SSL stream hangs until timeout