Merge branch 'PHP-5.6'

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

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge