Temporarily disable wait/xml protocol...
Added constant expression evaluation for "dirname(__FILE__)".
Improved constant expression evaluation for function calls
Merge remote-tracking branch 'origin/PHP-5.6'
Ignore commit 113f1fd6d5eb286c50f6cca003d18f847bc202cb when merging
Use DECLARE_CONST instruction instead of call to internal define() function when possible
Fixed outof memory (length == -1)
Fixed Bug #68104 (Segfault while pre-evaluating a disabled function)
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Merge branch 'PHP-5.6'

Conflicts:
	Zend/zend_API.c
Update NEWS
Add BEGIN_EXTERN_C() and END_EXTERN_C() to .h files missing them.
Update NEWS after rebase.
Update the VM generation script, per Bob.
Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added PGSQL_TEST_CONNSTR env var support for ext/pgsql tests
  Fixed bug #67462 PDO_PGSQL::beginTransaction() wrongly throws exception when not in transaction
fix datatype mismatch warnings
fix datatype mismatch warnings
fix datatype mismatch warning
fix warning not all control paths return a value