From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 1 Jul 2014 06:11:13 +0000 (+0400)
Subject: Merge branch 'phpng' into call-frame
X-Git-Tag: POST_PHPNG_MERGE~90^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b1cfdf390632a0bf0b27516399b09813500c299;p=php

Merge branch 'phpng' into call-frame

* phpng: (73 commits)
  refcount in phpng has different meanings
  Suppress warning "cast from pointer to integer of different size"
  Fixed possible crash because of race conditions on modifying constants in shared memory
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
  Fixed compilation problems
  Refactored parameter passing mechanism.
  --enable-fpm for the travis build
  Fixed segfault while info printing
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
  NEWS
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
  adding NEWS entry for the fix for bug #65641
  Updated NEWS file for recent phpdbg fixes
  Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
  Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none The prompt should always ensure it is on a newline
  Fixed test
  ...
---

0b1cfdf390632a0bf0b27516399b09813500c299