delta/php-git.git, branch php-7.0.0beta2 git.php.net: repository/php-src.git fix merge mistake 2015-07-21T12:55:54+00:00 Anatol Belski ab@php.net 2015-07-21T12:55:54+00:00 0f60a746e4d80b17cbf1ef09a27fc644bfb2ac47 






one more test from ef1b588f6a39bcc2c0d5fad9f2094bb011aeaf0b
2015-07-21T12:52:12+00:00

Anatol Belski
ab@php.net

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

735a7c6a560101b7c0700719664f64d9fed48557












readd test from 3bb70fe2903acf2caf2600345f07943f34a3b23c
2015-07-21T12:51:09+00:00

Anatol Belski
ab@php.net

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

94e7c770babccfab678211fb9cc8a2e5db8e6d33












readd commit 3bb70fe2903acf2caf2600345f07943f34a3b23c
2015-07-21T12:49:36+00:00

Anatol Belski
ab@php.net

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

26abfc8bc94b2153af0995de3da1c18dbf9dc210












bump versions
2015-07-21T10:40:58+00:00

Anatol Belski
ab@php.net

2015-07-21T10:40:58+00:00

ec4350e4c892a3ecfd95ede0f554bdc91277046d












sync NEWS
2015-07-21T10:34:30+00:00

Anatol Belski
ab@php.net

2015-07-21T10:34:30+00:00

3e971e7d5caf4954b79123b0f7216c2971dcbdb7












Merge branch 'master' into PHP-7.0.0
2015-07-21T10:27:50+00:00

Anatol Belski
ab@php.net

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

b148ef44965651fcbe93e8ee35a14edc087ef17c

* 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





* 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







Reverted ad4533fdbabcc3e545277e30023b2fdce16297a0
2015-07-21T09:18:36+00:00

Anatol Belski
ab@php.net

2015-07-21T09:18:36+00:00

6065b29fe41f09e01dd06ba21980e0344f13230c

The E_ERROR to E_RECOVERABLE_ERROR should be readded with the
proper tests.





The E_ERROR to E_RECOVERABLE_ERROR should be readded with the
proper tests.







update UPGRADING
2015-07-21T09:12:08+00:00

Anatol Belski
ab@php.net

2015-07-21T09:12:08+00:00

1767992e4e5f9d7c82571009b8b7f21f5f6ccd64












updated NEWS
2015-07-21T08:42:06+00:00

Anatol Belski
ab@php.net

2015-07-21T08:42:06+00:00

00361072c6a7af71d2951461e05c8969384fa354