com php-src: Merge remote-tracking branch 'origin/master' into native-tls: Zend/zend.h Zend/zend_API.c Zend/zend_compile.c Zen d/zend_execute_API.c
Zend/zend_virtual_cwd.h ex t/soap/soap.c ext/standard/basic_functions.c win3 2/build/config.w32

Commit: ee4ae7fbc3ba6de5f51f95a621e14a18dd55c95d Author: Anatol Belski <ab@php.net> Fri, 3 Oct 2014 20:30:49 +0200 Parents: 45e23645a42ba939fb1cca9cc099f977af2a4722 1ff094deb481234c0aa2fb5b0ee144b7aba924ff Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ee4ae7fbc3ba6de5f51f95a621e14a18dd55c95d Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: remove the remains of dsp files handling fix EX usage remove misprint parentheses remove misprint parentheses Replaced EG(This) and EX(object) with EX(This). Internal functions now recieves zend_execute_data as the first argument. And this one... It should be in extern c Remove useless condition NEWS entry for previous commit NEWS entry for previous commit add IPv6 support to php-fpm Micro optimization for the most frequency case Add hash to EXTENSIONS file Remove extensions which are long gone we also have xz release tarballs since 5.5 Fix ZTS build improved file size computation in stat() Fixed incorrect compilation 5.5.19 now Changed paths: MM Zend/zend.h MM Zend/zend_API.c MM Zend/zend_compile.c MM Zend/zend_execute_API.c MM Zend/zend_virtual_cwd.h MM ext/soap/soap..c MM ext/standard/basic_functions.c MM win32/build/config.w32 Diff: diff --cc Zend/zend.h index 2c1ebc8,969fa5e..81c1652 --- a/Zend/zend.h +++ b/Zend/zend.h @@@ -52,29 -52,14 +52,28 @@@ # define HANDLE_UNBLOCK_INTERRUPTIONS() ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() #endif - #define INTERNAL_FUNCTION_PARAMETERS uint32_t param_count, zval *return_value TSRMLS_DC - #define INTERNAL_FUNCTION_PARAM_PASSTHRU param_count, return_value TSRMLS_CC + #define INTERNAL_FUNCTION_PARAMETERS zend_execute_data *execute_data, zval *return_value TSRMLS_DC + #define INTERNAL_FUNCTION_PARAM_PASSTHRU execute_data, return_value TSRMLS_CC #define USED_RET() \ - (!EG(current_execute_data) || \ - !EG(current_execute_data)->prev_execute_data || \ - !ZEND_USER_CODE(EG(current_execute_data)->prev_execute_data->func->common.type) || \ - !(EG(current_execute_data)->prev_execute_data->opline->result_type & EXT_TYPE_UNUSED)) + (!EX(prev_execute_data) || \ + !ZEND_USER_CODE(EX(prev_execute_data)->func->common.type) || \ + !(EX(prev_execute_data)->opline->result_type & EXT_TYPE_UNUSED)) +#ifdef ZEND_ENABLE_STATIC_TSRMLS_CACHE +#define ZEND_TSRMG TSRMG_STATIC +#define ZEND_TSRMLS_CACHE_EXTERN TSRMLS_CACHE_EXTERN +#define ZEND_TSRMLS_CACHE_DEFINE TSRMLS_CACHE_DEFINE +#define ZEND_TSRMLS_CACHE_UPDATE TSRMLS_CACHE_UPDATE +#else +#define ZEND_TSRMG TSRMG +#define ZEND_TSRMLS_CACHE_EXTERN +#define ZEND_TSRMLS_CACHE_DEFINE +#define ZEND_TSRMLS_CACHE_UPDATE +#endif + +ZEND_TSRMLS_CACHE_EXTERN; + #ifdef HAVE_NORETURN # if defined(ZEND_WIN32) ZEND_API ZEND_NORETURN void zend_error_noreturn(int type, const char *format, ...);