From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 26 Nov 2013 17:59:19 +0000 (+0400)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~173^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d6120242705c65e4a9241eadc50e512e259a9a9;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed opcahce_reset() crash when opcache.protect_memory is set
---

0d6120242705c65e4a9241eadc50e512e259a9a9