From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 29 Oct 2015 17:07:37 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha2~40^2~36^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb85f570c8536b61e891f1b3a09f0cd70b8b7ac6;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed memory leak in php_stream_context_set_option()
---

cb85f570c8536b61e891f1b3a09f0cd70b8b7ac6