From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 30 Jun 2014 20:22:05 +0000 (+0400)
Subject: Merge branch 'master' into test
X-Git-Tag: POST_PHPNG_MERGE~98^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd62771fe5f209790c292c8917e8ee0b6053c283;p=php

Merge branch 'master' into test

* master:
  Fixed possible crash because of race conditions on modifying constants in shared memory
---

fd62771fe5f209790c292c8917e8ee0b6053c283