From: Stanislav Malyshev <stas@php.net>
Date: Mon, 1 Sep 2014 19:11:42 +0000 (-0700)
Subject: Merge branch 'pull-request/770' into PHP-5.4
X-Git-Tag: php-5.4.33RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=197095c29ecd643a9d8c8187fa9e87a6d92ceacd;p=php

Merge branch 'pull-request/770' into PHP-5.4

* pull-request/770:
  Only destruct if EG(active) in zend_shutdown(). (bug #65463, #66036)
  Fix typo from commit 32314f6b6
  Fix destruction order in zend_shutdown (bug #65463, #66036)
---

197095c29ecd643a9d8c8187fa9e87a6d92ceacd