com php-src: Merge remote-tracking branch 'origin/master' into native-tls: TSRM/tsrm_win32.c TSRM/tsrm_win32.h Zend/ze nd_alloc.c Zend/zend_compile.c
Zend/zend_execute _API.c Zend/zend_ini_parser.y Zend/zend_languag e_parser.y ext/bcmath/bcmath.c ext/com_dotnet/com _extension.c ext/date/php_date.h
ext/gmp/gmp.c ext/iconv/iconv.c ext/opcache/ZendAccelerator.c ext/opc ache/ZendAccelerator.h ext/pcre/php_pcre.h ext/pgsql/ pgsql.c
ext/reflection/php_reflec

From: Date: Tue, 18 Nov 2014 20:18:52 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/master' into native-tls: TSRM/tsrm_win32.c TSRM/tsrm_win32.h Zend/ze nd_alloc.c Zend/zend_compile.c
Zend/zend_execute _API.c Zend/zend_ini_parser.y Zend/zend_languag e_parser.y ext/bcmath/bcmath.c ext/com_dotnet/com _extension.c ext/date/php_date.h
ext/gmp/gmp.c ext/iconv/iconv.c ext/opcache/ZendAccelerator.c ext/opc ache/ZendAccelerator.h ext/pcre/php_pcre.h ext/pgsql/ pgsql.c
ext/reflection/php_reflec
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83146@lists.php.net to get a copy of this message
Commit: c6bad96f306df8e8b656472e618283ced5083cdb Author: Anatol Belski <ab@php.net> Tue, 18 Nov 2014 21:18:52 +0100 Parents: 4262663e4caa82ba17666781a95bdcb872b4e109 64a39dc7b07d4b54d050a3a5c15045fe91c0b651 Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c6bad96f306df8e8b656472e618283ced5083cdb Log: Merge remote-tracking branch 'origin/master' into native-tls * origin/master: (398 commits) NEWS add test for bug #68381 Fixed bug #68381 Set FPM log level earlier during init proper dllexport move to size_t where zend_string is used internally fix some datatype mismatches return after the warning, to fix uninitialized salt usage fix datatype mismatches add missing type specifier fix datatype mismatches fix unsigned check "extern" shouldn't be used for definitions joined identical conditional blocks simplify fpm tests SEND_VAR_NO_REF optimization Add test for bug #68442 Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments. Add new FPM test for IPv4/IPv6 ... Conflicts: win32/build/config.w32 Bugs: https://bugs.php.net/68381 https://bugs.php.net/68442 Changed paths: MM TSRM/tsrm_win32.c MM TSRM/tsrm_win32.h MM Zend/zend_alloc.c MM Zend/zend_compile.c MM Zend/zend_execute_API.c MM Zend/zend_ini_parser.y MM Zend/zend_language_parser.y MM ext/bcmath/bcmath.c MM ext/com_dotnet/com_extension.c MM ext/date/php_date.h MM ext/gmp/gmp.c MM ext/iconv/iconv.c MM ext/opcache/ZendAccelerator.c MM ext/opcache/ZendAccelerator.h MM ext/pcre/php_pcre.h MM ext/pgsql/pgsql.c MM ext/reflection/php_reflection.c MM ext/session/session.c MM ext/soap/soap.c MM ext/standard/basic_functions.h MM ext/zlib/zlib.c MM main/SAPI.c MM main/output.c MM main/php_output.h MM sapi/cli/php_cli_server.c MM win32/build/config.w32 Diff: diff --cc main/php_output.h index 17cec92,535b09b..bf756de --- a/main/php_output.h +++ b/main/php_output.h @@@ -102,13 -102,15 +102,13 @@@ typedef struct _php_output_context int op; php_output_buffer in; php_output_buffer out; -#ifdef ZTS - void ***tsrm_ls; -#endif } php_output_context; -#define PHP_OUTPUT_TSRMLS(ctx) TSRMLS_FETCH_FROM_CTX((ctx)->tsrm_ls) +/* XXX remove this after TLS branch merge */ +#define PHP_OUTPUT_TSRMLS(ctx) /* old-style, stateless callback */ - typedef void (*php_output_handler_func_t)(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC); + typedef void (*php_output_handler_func_t)(char *output, size_t output_len, char **handled_output, size_t *handled_output_len, int mode TSRMLS_DC); /* new-style, opaque context callback */ typedef int (*php_output_handler_context_func_t)(void **handler_context, php_output_context *output_context); /* output handler context dtor */ @@@ -149,9 -151,11 +149,11 @@@ ZEND_BEGIN_MODULE_GLOBALS(output int flags; ZEND_END_MODULE_GLOBALS(output) + PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output); + /* there should not be a need to use OG() from outside of output.c */ #ifdef ZTS -# define OG(v) TSRMG(output_globals_id, zend_output_globals *, v) +# define OG(v) ZEND_TSRMG(output_globals_id, zend_output_globals *, v) #else # define OG(v) (output_globals.v) #endif diff --cc win32/build/config.w32 index d618ccb,7ca0293..47773dc --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@@ -368,9 -132,8 +132,10 @@@ ADD_SOURCES("Zend", "zend_language_pars zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c zend_ast.c \ zend_inheritance.c"); +ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); + - if (VCVERS == 1200) { + /* XXX inspect this for other toolsets */ + if (VS_TOOLSET && VCVERS == 1200) { AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1); }

« previous php.cvs (#83146) next »