com php-src: Fixed bug #66471 (Keep backward compatibility): ext/opcache/Optimizer/block_pass.c ext/opcache/ZendAccele rator.c ext/opcache/config.m4
ext/opcache/zend_acce lerator_module.c

From: Date: Mon, 13 Jan 2014 11:34:25 +0000
Subject: com php-src: Fixed bug #66471 (Keep backward compatibility): ext/opcache/Optimizer/block_pass.c ext/opcache/ZendAccele rator.c ext/opcache/config.m4
ext/opcache/zend_acce lerator_module.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75588@lists.php.net to get a copy of this message
Commit: ca550248f18c842c22f3db880b8ea66c553da343 Author: Dmitry Stogov <dmitry@zend.com> Mon, 13 Jan 2014 15:34:25 +0400 Parents: d09d64c15c282f91ce5af7791d52a8e2d1833aa9 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ca550248f18c842c22f3db880b8ea66c553da343 Log: Fixed bug #66471 (Keep backward compatibility) Bugs: https://bugs.php.net/66471 Changed paths: M ext/opcache/Optimizer/block_pass.c M ext/opcache/ZendAccelerator.c M ext/opcache/config.m4 M ext/opcache/zend_accelerator_module.c Diff: diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index 47f9872..fff5d7e 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -1895,7 +1895,9 @@ static void zend_t_usage(zend_code_block *block, zend_op_array *op_array, char * if (RESULT_USED(opline)) { if (!defined_here[VAR_NUM(ZEND_RESULT(opline).var)] && !used_ext[VAR_NUM(ZEND_RESULT(opline).var)] && (opline->opcode == ZEND_RECV || opline->opcode == ZEND_RECV_INIT || +#if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO opline->opcode == ZEND_RECV_VARIADIC || +#endif (opline->opcode == ZEND_OP_DATA && ZEND_RESULT_TYPE(opline) == IS_TMP_VAR) || opline->opcode == ZEND_ADD_ARRAY_ELEMENT)) { /* these opcodes use the result as argument */ @@ -1980,7 +1982,9 @@ static void zend_t_usage(zend_code_block *block, zend_op_array *op_array, char * if (opline->opcode == ZEND_RECV || opline->opcode == ZEND_RECV_INIT || +#if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO opline->opcode == ZEND_RECV_VARIADIC || +#endif opline->opcode == ZEND_ADD_ARRAY_ELEMENT) { if (ZEND_OP1_TYPE(opline) == IS_VAR || ZEND_OP1_TYPE(opline) == IS_TMP_VAR) { usage[VAR_NUM(ZEND_RESULT(opline).var)] = 1; diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index abb01b5..81ab482 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -36,7 +36,11 @@ #include "main/php_open_temporary_file.h" #include "zend_API.h" #include "zend_ini.h" -#include "zend_virtual_cwd.h" +#if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO +# include "zend_virtual_cwd.h" +#else +# include "TSRM/tsrm_virtual_cwd.h" +#endif #include "zend_accelerator_util_funcs..h" #include "zend_accelerator_hash.h" @@ -387,8 +391,10 @@ static void accel_use_shm_interned_strings(TSRMLS_D) { Bucket *p, *q; +#if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO /* empty string */ CG(interned_empty_string) = accel_new_interned_string("", sizeof(""), 0 TSRMLS_CC); +#endif /* function table hash keys */ p = CG(function_table)->pListHead; diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 60edeed..f6e6ca9 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 @@ -362,7 +362,7 @@ AC_TRY_RUN([ if test "$flock_type" == "unknown"; then AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) fi - + PHP_NEW_EXTENSION(opcache, ZendAccelerator.c \ zend_accelerator_blacklist.c \ diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c index ff21b01..83e7d4c 100644 --- a/ext/opcache/zend_accelerator_module.c +++ b/ext/opcache/zend_accelerator_module.c @@ -28,7 +28,11 @@ #include "zend_accelerator_blacklist.h" #include "php_ini.h" #include "SAPI.h" -#include "zend_virtual_cwd.h" +#if ZEND_EXTENSION_API_NO > PHP_5_5_X_API_NO +# include "zend_virtual_cwd.h" +#else +# include "TSRM/tsrm_virtual_cwd.h" +#endif #include "ext/standard/info.h" #include "ext/standard/php_filestat.h"

« previous php.cvs (#75588) next »