com php-src: Merge branch 'master' into PHP-7.0.0: Zend/zend_ compile.c Zend/zend_compile.h Zend/zend_vm_def. h Zend/zend_vm_execute.h configure.in
ext/opcache /zend_file_cache.c sapi/phpdbg/phpdbg_opcode.c
| From: | Anatol Belski | Date: | Tue, 21 Jul 2015 10:27:50 +0000 |
| Subject: | com php-src: Merge branch 'master' into PHP-7.0.0: Zend/zend_ compile.c Zend/zend_compile.h Zend/zend_vm_def. h Zend/zend_vm_execute.h configure.in ext/opcache /zend_file_cache.c sapi/phpdbg/phpdbg_opcode.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88098@lists.php.net to get a copy of this message | ||
Commit: b148ef44965651fcbe93e8ee35a14edc087ef17c
Author: Anatol Belski <ab@php.net> Tue, 21 Jul 2015 12:27:50 +0200
Parents: ad8a73dd55c087de465ad80e8715611693bb1460 6065b29fe41f09e01dd06ba21980e0344f13230c
Branches: PHP-7.0.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b148ef44965651fcbe93e8ee35a14edc087ef17c
Log:
Merge branch 'master' into PHP-7.0.0
* 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
Bugs:
https://bugs.php.net/70022
https://bugs.php.net/66387
Changed paths:
MM Zend/zend_compile..c
MM Zend/zend_compile.h
MM Zend/zend_vm_def.h
MM Zend/zend_vm_execute.h
MM configure.in
MM ext/opcache/zend_file_cache.c
MM sapi/phpdbg/phpdbg_opcode.c
Diff:
diff --cc sapi/phpdbg/phpdbg_opcode.c
index 3af52f1,75c91e0..128dc59
--- a/sapi/phpdbg/phpdbg_opcode.c
+++ b/sapi/phpdbg/phpdbg_opcode.c
@@@ -56,9 -84,8 +84,9 @@@ char *phpdbg_decode_opline(zend_op_arra
/* OP1 */
switch (op->opcode) {
case ZEND_JMP:
+ case ZEND_GOTO:
case ZEND_FAST_CALL:
- asprintf(&decode[1], "J%ld", OP_JMP_ADDR(op, op->op1) - ops->opcodes);
+ spprintf(&decode[1], 0, "J%td", OP_JMP_ADDR(op, op->op1) - ops->opcodes);
break;
case ZEND_INIT_FCALL: