delta/php-git.git/Zend, branch php-7.0.0beta2

fix merge mistake

2015-07-21T12:55:54+00:00

one more test from ef1b588f6a39bcc2c0d5fad9f2094bb011aeaf0b

2015-07-21T12:52:12+00:00

readd test from 3bb70fe2903acf2caf2600345f07943f34a3b23c

2015-07-21T12:51:09+00:00

readd commit 3bb70fe2903acf2caf2600345f07943f34a3b23c

2015-07-21T12:49:36+00:00

Merge branch 'master' into PHP-7.0.0

2015-07-21T10:27:50+00:00

* master: (204 commits)
  Reverted ad4533fdbabcc3e545277e30023b2fdce16297a0
  update UPGRADING
  updated NEWS
  fix comment
  libwebp support for linux
  Replaced libvpx by libwebp (first draft; Windows only)
  update news with bug #70022
  Change E_ERROR and some E_WARNING to E_RECOVERABLE_ERROR.
  Add tests for json_last_error()/json_last_error_msg() failures
  updated NEWS
  updated NEWS
  Exclude opcache from a few opcode related tests
  updated NEWS
  updated NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Fix various Windows issues (e.g. dir separators)
  Remove bogus exception_save() from FETCH_CLASS
  Fix readline/libedit build
  Do not use readline when not having a tty This is important for e.g. run-tests.php
  Add show_unexecuted option to phpdbg_end_oplog()
  ...

Conflicts:
	Zend/tests/temporary_cleaning_001.phpt
	Zend/tests/temporary_cleaning_003.phpt
	Zend/tests/temporary_cleaning_004.phpt
	Zend/tests/temporary_cleaning_005.phpt
	Zend/zend_compile.c
	Zend/zend_compile.h
	sapi/phpdbg/phpdbg_opcode.c

Remove bogus exception_save() from FETCH_CLASS

2015-07-20T20:56:51+00:00

There can't be no exception at the start of the op. Also would miss
the corresponding exception_restore().

fix two clang errors on Windows

2015-07-19T18:06:31+00:00

Fixed signed/unsigned warnings in wddx

2015-07-17T15:19:23+00:00

Also added extra const annotation to zend_memnstr.

Donot use one_char_string

2015-07-17T08:09:11+00:00

Merge branch 'master' of git.php.net:php-src

2015-07-17T07:56:28+00:00