From: Stanislav Malyshev <stas@php.net>
Date: Tue, 14 Apr 2015 18:12:58 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d7b5e30ebbac1a250e794da1e845db800ec20ce;p=php

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
---

9d7b5e30ebbac1a250e794da1e845db800ec20ce