mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 02:15:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source
This commit is contained in:
Nikita Popov 2016-03-03 16:50:47 +01:00
commit f57c0b3249
92 changed files with 97 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TSRM/TSRM.h
View File

@ -170,8 +170,8 @@ TSRM_API void *tsrm_get_ls_cache(void);
#define TSRMG_STATIC(id, type, element) (TSRMG_BULK_STATIC(id, type)->element)
#define TSRMG_BULK_STATIC(id, type) ((type) (*((void ***) TSRMLS_CACHE))[TSRM_UNSHUFFLE_RSRC_ID(id)])
#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL
#define TSRMLS_CACHE_EXTERN() extern TSRM_TLS void *TSRMLS_CACHE;
#define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL;
#if ZEND_DEBUG
#define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache()
#else

2
TSRM/tsrm_win32.h
View File

@ -72,7 +72,7 @@ typedef struct {
#ifdef ZTS
# define TWG(v) TSRMG_STATIC(win32_globals_id, tsrm_win32_globals *, v)
TSRMLS_CACHE_EXTERN();
TSRMLS_CACHE_EXTERN()
#else
# define TWG(v) (win32_globals.v)
#endif

2
Zend/zend.c
View File

@ -148,7 +148,7 @@ static HashTable *global_class_table = NULL;
static HashTable *global_constants_table = NULL;
static HashTable *global_auto_globals_table = NULL;
static HashTable *global_persistent_list = NULL;
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_API zend_utility_values zend_uv;

2
Zend/zend.h
View File

@ -77,7 +77,7 @@
#define ZEND_TSRMLS_CACHE
#endif
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#ifdef HAVE_NORETURN
# ifdef ZEND_NORETURN_ALIAS

2
ext/bcmath/bcmath.c
View File

@ -128,7 +128,7 @@ zend_module_entry bcmath_module_entry = {
#ifdef COMPILE_DL_BCMATH
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(bcmath)
#endif

2
ext/bcmath/php_bcmath.h
View File

@ -52,7 +52,7 @@ ZEND_BEGIN_MODULE_GLOBALS(bcmath)
ZEND_END_MODULE_GLOBALS(bcmath)
#if defined(ZTS) && defined(COMPILE_DL_BCMATH)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
ZEND_EXTERN_MODULE_GLOBALS(bcmath)

2
ext/com_dotnet/com_extension.c
View File

@ -255,7 +255,7 @@ zend_module_entry com_dotnet_module_entry = {
#ifdef COMPILE_DL_COM_DOTNET
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(com_dotnet)
#endif

2
ext/com_dotnet/php_com_dotnet.h
View File

@ -56,7 +56,7 @@ ZEND_BEGIN_MODULE_GLOBALS(com_dotnet)
ZEND_END_MODULE_GLOBALS(com_dotnet)
#if defined(ZTS) && defined(COMPILE_DL_COM_DOTNET)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
extern ZEND_DECLARE_MODULE_GLOBALS(com_dotnet);

2
ext/exif/exif.c
View File

@ -155,7 +155,7 @@ ZEND_DECLARE_MODULE_GLOBALS(exif)
#define EXIF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(exif, v)
#if defined(ZTS) && defined(COMPILE_DL_EXIF)
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
/* {{{ PHP_INI

2
ext/filter/filter.c
View File

@ -152,7 +152,7 @@ zend_module_entry filter_module_entry = {
#ifdef COMPILE_DL_FILTER
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(filter)
#endif

2
ext/filter/php_filter.h
View File

@ -66,7 +66,7 @@ ZEND_BEGIN_MODULE_GLOBALS(filter)
ZEND_END_MODULE_GLOBALS(filter)
#if defined(COMPILE_DL_FILTER) && defined(ZTS)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#define IF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(filter, v)

2
ext/gmp/gmp.c
View File

@ -215,7 +215,7 @@ zend_module_entry gmp_module_entry = {
#ifdef COMPILE_DL_GMP
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(gmp)
#endif

2
ext/gmp/php_gmp.h
View File

@ -98,7 +98,7 @@ ZEND_END_MODULE_GLOBALS(gmp)
#define GMPG(v) ZEND_MODULE_GLOBALS_ACCESSOR(gmp, v)
#if defined(ZTS) && defined(COMPILE_DL_GMP)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#else

2
ext/iconv/iconv.c
View File

@ -165,7 +165,7 @@ zend_module_entry iconv_module_entry = {
#ifdef COMPILE_DL_ICONV
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(iconv)
#endif

2
ext/iconv/php_iconv.h
View File

@ -78,7 +78,7 @@ ZEND_END_MODULE_GLOBALS(iconv)
#define ICONVG(v) ZEND_MODULE_GLOBALS_ACCESSOR(iconv, v)
#if defined(ZTS) && defined(COMPILE_DL_ICONV)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#ifdef HAVE_IBM_ICONV

2
ext/interbase/interbase.c
View File

@ -461,7 +461,7 @@ zend_module_entry ibase_module_entry = {
#ifdef COMPILE_DL_INTERBASE
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(ibase)
#endif

2
ext/interbase/php_ibase_includes.h
View File

@ -130,7 +130,7 @@ enum php_interbase_option {
#define IBG(v) ZEND_MODULE_GLOBALS_ACCESSOR(ibase, v)
#if defined(ZTS) && defined(COMPILE_DL_INTERBASE)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#define BLOB_ID_LEN 18

2
ext/intl/php_intl.c
View File

@ -892,7 +892,7 @@ zend_module_entry intl_module_entry = {
#ifdef COMPILE_DL_INTL
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE( intl )
#endif

2
ext/intl/php_intl.h
View File

@ -56,7 +56,7 @@ ZEND_BEGIN_MODULE_GLOBALS(intl)
ZEND_END_MODULE_GLOBALS(intl)
#if defined(ZTS) && defined(COMPILE_DL_INTL)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
ZEND_EXTERN_MODULE_GLOBALS(intl)

2
ext/json/json.c
View File

@ -176,7 +176,7 @@ zend_module_entry json_module_entry = {
#ifdef COMPILE_DL_JSON
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(json)
#endif

4
ext/json/php_json.h
View File

@ -86,11 +86,11 @@ ZEND_BEGIN_MODULE_GLOBALS(json)
php_json_error_code error_code;
ZEND_END_MODULE_GLOBALS(json)
PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json);
PHP_JSON_API ZEND_EXTERN_MODULE_GLOBALS(json)
#define JSON_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(json, v)
#if defined(ZTS) && defined(COMPILE_DL_JSON)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
PHP_JSON_API void php_json_encode(smart_str *buf, zval *val, int options);

2
ext/libxml/libxml.c
View File

@ -80,7 +80,7 @@ static zend_class_entry *libxmlerror_class_entry;
/* {{{ dynamically loadable module stuff */
#ifdef COMPILE_DL_LIBXML
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(libxml)
#endif /* COMPILE_DL_LIBXML */

2
ext/libxml/php_libxml.h
View File

@ -118,7 +118,7 @@ PHP_LIBXML_API void php_libxml_shutdown(void);
#define LIBXML(v) ZEND_MODULE_GLOBALS_ACCESSOR(libxml, v)
#if defined(ZTS) && defined(COMPILE_DL_LIBXML)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#else /* HAVE_LIBXML */

2
ext/mbstring/mbstring.c
View File

@ -591,7 +591,7 @@ static sapi_post_entry php_post_entries[] = {
#ifdef COMPILE_DL_MBSTRING
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(mbstring)
#endif

2
ext/mbstring/mbstring.h
View File

@ -205,7 +205,7 @@ struct mb_overload_def {
#define MBSTRG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mbstring, v)
#if defined(ZTS) && defined(COMPILE_DL_MBSTRING)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#else /* HAVE_MBSTRING */

2
ext/mcrypt/mcrypt.c
View File

@ -273,7 +273,7 @@ zend_module_entry mcrypt_module_entry = {
#ifdef COMPILE_DL_MCRYPT
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(mcrypt)
#endif

2
ext/mysqli/mysqli.c
View File

@ -1024,7 +1024,7 @@ zend_module_entry mysqli_module_entry = {
#ifdef COMPILE_DL_MYSQLI
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(mysqli)
#endif

2
ext/mysqli/php_mysqli_structs.h
View File

@ -341,7 +341,7 @@ ZEND_END_MODULE_GLOBALS(mysqli)
#define MyG(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqli, v)
#if defined(ZTS) && defined(COMPILE_DL_MYSQLI)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#define my_estrdup(x) (x) ? estrdup(x) : NULL

2
ext/mysqlnd/mysqlnd.h
View File

@ -332,7 +332,7 @@ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(mysqlnd)
#define MYSQLND_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mysqlnd, v)
#if defined(ZTS) && defined(COMPILE_DL_MYSQLND)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif

2
ext/mysqlnd/php_mysqlnd.c
View File

@ -360,7 +360,7 @@ zend_module_entry mysqlnd_module_entry = {
/* {{{ COMPILE_DL_MYSQLND */
#ifdef COMPILE_DL_MYSQLND
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(mysqlnd)
#endif

2
ext/odbc/php_odbc.c
View File

@ -412,7 +412,7 @@ zend_module_entry odbc_module_entry = {
#ifdef COMPILE_DL_ODBC
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(odbc)
#endif

2
ext/odbc/php_odbc_includes.h
View File

@ -308,7 +308,7 @@ PHP_ODBC_API ZEND_EXTERN_MODULE_GLOBALS(odbc)
#define ODBCG(v) ZEND_MODULE_GLOBALS_ACCESSOR(odbc, v)
#if defined(ZTS) && defined(COMPILE_DL_ODBC)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#endif /* HAVE_UODBC */

2
ext/opcache/ZendAccelerator.c
View File

@ -97,7 +97,7 @@ zend_accel_globals accel_globals;
#else
int accel_globals_id;
#if defined(COMPILE_DL_OPCACHE)
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
#endif

2
ext/opcache/ZendAccelerator.h
View File

@ -286,7 +286,7 @@ extern zend_accel_shared_globals *accel_shared_globals;
# define ZCG(v) ZEND_TSRMG(accel_globals_id, zend_accel_globals *, v)
extern int accel_globals_id;
# ifdef COMPILE_DL_OPCACHE
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
# endif
#else
# define ZCG(v) (accel_globals.v)

2
ext/pcre/php_pcre.h
View File

@ -81,7 +81,7 @@ ZEND_BEGIN_MODULE_GLOBALS(pcre)
int error_code;
ZEND_END_MODULE_GLOBALS(pcre)
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre);
PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre)
#define PCRE_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pcre, v)
#else

2
ext/pdo_dblib/php_pdo_dblib_int.h
View File

@ -137,7 +137,7 @@ ZEND_END_MODULE_GLOBALS(dblib)
# define DBLIB_G(v) (dblib_globals.v)
#endif
ZEND_EXTERN_MODULE_GLOBALS(dblib);
ZEND_EXTERN_MODULE_GLOBALS(dblib)
#endif

2
ext/pdo_mysql/pdo_mysql.c
View File

@ -33,7 +33,7 @@
#ifdef COMPILE_DL_PDO_MYSQL
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(pdo_mysql)
#endif

2
ext/pdo_mysql/php_pdo_mysql_int.h
View File

@ -89,7 +89,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql)
#define PDO_MYSQL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pdo_mysql, v)
#if defined(ZTS) && defined(COMPILE_DL_PDO_MYSQL)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif

2
ext/pgsql/pgsql.c
View File

@ -780,7 +780,7 @@ zend_module_entry pgsql_module_entry = {
#ifdef COMPILE_DL_PGSQL
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(pgsql)
#endif

2
ext/pgsql/php_pgsql.h
View File

@ -325,7 +325,7 @@ ZEND_EXTERN_MODULE_GLOBALS(pgsql)
# define PGG(v) ZEND_MODULE_GLOBALS_ACCESSOR(pgsql, v)
#if defined(ZTS) && defined(COMPILE_DL_PGSQL)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#endif

2
ext/phar/phar.c
View File

@ -3212,7 +3212,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv
#ifdef COMPILE_DL_PHAR
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(phar)
#endif

2
ext/phar/phar_internal.h
View File

@ -196,7 +196,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phar)
#define PHAR_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(phar, v)
#if defined(ZTS) && defined(COMPILE_DL_PHAR)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#include "pharzip.h"

2
ext/session/php_session.h
View File

@ -220,7 +220,7 @@ extern zend_module_entry session_module_entry;
#ifdef ZTS
#define PS(v) ZEND_TSRMG(ps_globals_id, php_ps_globals *, v)
#ifdef COMPILE_DL_SESSION
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#else
#define PS(v) (ps_globals.v)

2
ext/session/session.c
View File

@ -3120,7 +3120,7 @@ zend_module_entry session_module_entry = {
#ifdef COMPILE_DL_SESSION
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(session)
#endif

2
ext/session/tests/bug69111.phpt
View File

@ -1,8 +1,8 @@
--TEST--
Bug #69111 Crash in SessionHandler::read()
--SKIPIF--
--XFAIL--
It is still a leak
--SKIPIF--
<?php include('skipif.inc'); ?>
--FILE--
<?php

2
ext/skeleton/php_skeleton.h
View File

@ -37,7 +37,7 @@ ZEND_END_MODULE_GLOBALS(extname)
#define EXTNAME_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(extname, v)
#if defined(ZTS) && defined(COMPILE_DL_EXTNAME)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#endif /* PHP_EXTNAME_H */

2
ext/skeleton/skeleton.c
View File

@ -153,7 +153,7 @@ zend_module_entry extname_module_entry = {
#ifdef COMPILE_DL_EXTNAME
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(extname)
#endif

2
ext/soap/php_soap.h
View File

@ -192,7 +192,7 @@ ZEND_EXTERN_MODULE_GLOBALS(soap)
#define SOAP_GLOBAL(v) ZEND_MODULE_GLOBALS_ACCESSOR(soap, v)
#if defined(ZTS) && defined(COMPILE_DL_SOAP)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
extern zend_class_entry* soap_var_class_entry;

2
ext/soap/soap.c
View File

@ -467,7 +467,7 @@ zend_module_entry soap_module_entry = {
#ifdef COMPILE_DL_SOAP
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(soap)
#endif

2
ext/sockets/php_sockets.h
View File

@ -92,7 +92,7 @@ ZEND_BEGIN_MODULE_GLOBALS(sockets)
char *strerror_buf;
ZEND_END_MODULE_GLOBALS(sockets)
ZEND_EXTERN_MODULE_GLOBALS(sockets);
ZEND_EXTERN_MODULE_GLOBALS(sockets)
#define SOCKETS_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(sockets, v)
enum sockopt_return {

2
ext/sockets/sockets.c
View File

@ -371,7 +371,7 @@ zend_module_entry sockets_module_entry = {
#ifdef COMPILE_DL_SOCKETS
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(sockets)
#endif

2
ext/spl/php_spl.h
View File

@ -68,7 +68,7 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
int autoload_running;
ZEND_END_MODULE_GLOBALS(spl)
ZEND_EXTERN_MODULE_GLOBALS(spl);
ZEND_EXTERN_MODULE_GLOBALS(spl)
#define SPL_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(spl, v)
PHP_FUNCTION(spl_classes);

2
ext/sqlite3/php_sqlite3.h
View File

@ -33,7 +33,7 @@ ZEND_END_MODULE_GLOBALS(sqlite3)
#ifdef ZTS
# define SQLITE3G(v) TSRMG(sqlite3_globals_id, zend_sqlite3_globals *, v)
# ifdef COMPILE_DL_SQLITE3
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
# endif
#else
# define SQLITE3G(v) (sqlite3_globals.v)

2
ext/sqlite3/sqlite3.c
View File

@ -2293,7 +2293,7 @@ zend_module_entry sqlite3_module_entry = {
#ifdef COMPILE_DL_SQLITE3
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(sqlite3)
#endif

2
ext/tidy/php_tidy.h
View File

@ -45,7 +45,7 @@ ZEND_END_MODULE_GLOBALS(tidy)
#define TG(v) ZEND_MODULE_GLOBALS_ACCESSOR(tidy, v)
#if defined(ZTS) && defined(COMPILE_DL_TIDY)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#endif

2
ext/tidy/tidy.c
View File

@ -466,7 +466,7 @@ zend_module_entry tidy_module_entry = {
#ifdef COMPILE_DL_TIDY
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(tidy)
#endif

2
ext/xml/php_xml.h
View File

@ -147,7 +147,7 @@ PHP_XML_API zend_string *xml_utf8_encode(const char *, size_t, const XML_Char *)
#define XML(v) ZEND_MODULE_GLOBALS_ACCESSOR(xml, v)
#if defined(ZTS) && defined(COMPILE_DL_XML)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
#endif /* PHP_XML_H */

2
ext/xml/xml.c
View File

@ -63,7 +63,7 @@ ZEND_DECLARE_MODULE_GLOBALS(xml)
/* {{{ dynamically loadable module stuff */
#ifdef COMPILE_DL_XML
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(xml)
#endif /* COMPILE_DL_XML */

2
ext/zlib/zlib.c
View File

@ -1187,7 +1187,7 @@ PHP_FUNCTION(deflate_add)
#ifdef COMPILE_DL_ZLIB
#ifdef ZTS
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_GET_MODULE(php_zlib)
#endif

2
main/php_output.h
View File

@ -146,7 +146,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output)
int flags;
ZEND_END_MODULE_GLOBALS(output)
PHPAPI ZEND_EXTERN_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

2
sapi/apache2handler/php_apache.h
View File

@ -80,7 +80,7 @@ extern zend_module_entry apache2_module_entry;
#ifdef ZTS
extern int php_apache2_info_id;
#define AP2(v) ZEND_TSRMG(php_apache2_info_id, php_apache2_info_struct *, v)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#else
extern php_apache2_info_struct php_apache2_info;
#define AP2(v) (php_apache2_info.v)

2
sapi/apache2handler/sapi_apache2.c
View File

@ -66,7 +66,7 @@
/* A way to specify the location of the php.ini dir in an apache directive */
char *apache2_php_ini_path_override = NULL;
#if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
static size_t

2
sapi/cgi/cgi_main.c
View File

@ -203,7 +203,7 @@ static void user_config_cache_entry_dtor(zval *el)
static int php_cgi_globals_id;
#define CGIG(v) ZEND_TSRMG(php_cgi_globals_id, php_cgi_globals_struct *, v)
#if defined(PHP_WIN32)
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
#else
static php_cgi_globals_struct php_cgi_globals;

2
sapi/cli/php_cli.c
View File

@ -103,7 +103,7 @@ PHPAPI extern char *php_ini_scanned_path;
PHPAPI extern char *php_ini_scanned_files;
#if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
#ifndef O_BINARY

2
sapi/cli/php_cli_server.h
View File

@ -33,7 +33,7 @@ ZEND_END_MODULE_GLOBALS(cli_server)
#ifdef ZTS
#define CLI_SERVER_G(v) ZEND_TSRMG(cli_server_globals_id, zend_cli_server_globals *, v)
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#else
#define CLI_SERVER_G(v) (cli_server_globals.v)
#endif

4
sapi/cli/tests/upload_2G.phpt
View File

@ -21,6 +21,10 @@ if ($f = fopen("/proc/meminfo","r")) {
if (empty($enough_free_ram)) {
die("skip need +3G free RAM");
}
if (getenv('TRAVIS')) {
die("skip Fails intermittently on travis");
}
?>
--FILE--
<?php

2
sapi/embed/php_embed.c
View File

@ -34,7 +34,7 @@ const char HARDCODED_INI[] =
"max_input_time=-1\n\0";
#if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
static char* php_embed_read_cookies(void)

2
sapi/embed/php_embed.h
View File

@ -45,7 +45,7 @@
#endif
#ifdef ZTS
ZEND_TSRMLS_CACHE_EXTERN();
ZEND_TSRMLS_CACHE_EXTERN()
#endif
BEGIN_EXTERN_C()

2
sapi/phpdbg/phpdbg.c
View File

@ -53,7 +53,7 @@
#endif
#if defined(PHP_WIN32) && defined(ZTS)
ZEND_TSRMLS_CACHE_DEFINE();
ZEND_TSRMLS_CACHE_DEFINE()
#endif
ZEND_DECLARE_MODULE_GLOBALS(phpdbg);

2
sapi/phpdbg/phpdbg_bp.c
View File

@ -26,7 +26,7 @@
#include "phpdbg_opcode.h"
#include "zend_globals.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
/* {{{ private api functions */
static inline phpdbg_breakbase_t *phpdbg_find_breakpoint_file(zend_op_array*);

2
sapi/phpdbg/phpdbg_break.c
View File

@ -26,7 +26,7 @@
#include "phpdbg_bp.h"
#include "phpdbg_prompt.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
#define PHPDBG_BREAK_COMMAND_D(f, h, a, m, l, s, flags) \
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[9], flags)

2
sapi/phpdbg/phpdbg_cmd.c
View File

@ -25,7 +25,7 @@
#include "phpdbg_prompt.h"
#include "phpdbg_io.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
static inline const char *phpdbg_command_name(const phpdbg_command_t *command, char *buffer) {
size_t pos = 0;

2
sapi/phpdbg/phpdbg_eol.c
View File

@ -23,7 +23,7 @@
#include "phpdbg.h"
#include "phpdbg_eol.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
#define EOL_LIST_LEN 4
struct phpdbg_eol_rep phpdbg_eol_list[EOL_LIST_LEN] = {

2
sapi/phpdbg/phpdbg_frame.c
View File

@ -24,7 +24,7 @@
#include "phpdbg_frame.h"
#include "phpdbg_list.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
void phpdbg_restore_frame(void) /* {{{ */
{

2
sapi/phpdbg/phpdbg_help.c
View File

@ -25,7 +25,7 @@
#include "phpdbg_eol.h"
#include "zend.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
/* {{{ Commands Table */
#define PHPDBG_COMMAND_HELP_D(name, tip, alias, action) \

2
sapi/phpdbg/phpdbg_info.c
View File

@ -25,7 +25,7 @@
#include "phpdbg_bp.h"
#include "phpdbg_prompt.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
#define PHPDBG_INFO_COMMAND_D(f, h, a, m, l, s, flags) \
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[13], flags)

2
sapi/phpdbg/phpdbg_io.c
View File

@ -45,7 +45,7 @@
#include <poll.h>
#endif
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
/* is easy to generalize ... but not needed for now */
PHPDBG_API int phpdbg_consume_stdin_line(char *buf) {

2
sapi/phpdbg/phpdbg_lexer.c
View File

@ -28,7 +28,7 @@
#define RAW 2
#define INITIAL 3
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) {
PHPDBG_G(parser_stack) = stack;

2
sapi/phpdbg/phpdbg_lexer.l
View File

@ -26,7 +26,7 @@
#define RAW 2
#define INITIAL 3
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) {
PHPDBG_G(parser_stack) = stack;

2
sapi/phpdbg/phpdbg_list.c
View File

@ -33,7 +33,7 @@
#include "php_streams.h"
#include "zend_exceptions.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
#define PHPDBG_LIST_COMMAND_D(f, h, a, m, l, s, flags) \
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[12], flags)

2
sapi/phpdbg/phpdbg_opcode.c
View File

@ -25,7 +25,7 @@
#include "phpdbg_utils.h"
#include "ext/standard/php_string.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
static inline const char *phpdbg_decode_opcode(zend_uchar opcode) /* {{{ */
{

2
sapi/phpdbg/phpdbg_out.c
View File

@ -30,7 +30,7 @@
# include "win32/time.h"
#endif
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
/* copied from php-src/main/snprintf.c and slightly modified */
/*

2
sapi/phpdbg/phpdbg_parser.c
View File

@ -94,7 +94,7 @@
#undef yyerror
static int yyerror(const char *msg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
#ifdef _MSC_VER
#define YYMALLOC malloc

2
sapi/phpdbg/phpdbg_parser.y
View File

@ -21,7 +21,7 @@
#undef yyerror
static int yyerror(const char *msg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
#ifdef _MSC_VER
#define YYMALLOC malloc

2
sapi/phpdbg/phpdbg_print.c
View File

@ -24,7 +24,7 @@
#include "phpdbg_opcode.h"
#include "phpdbg_prompt.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
#define PHPDBG_PRINT_COMMAND_D(f, h, a, m, l, s, flags) \
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[8], flags)

2
sapi/phpdbg/phpdbg_prompt.c
View File

@ -48,7 +48,7 @@
#error "phpdbg can only be built with CALL zend vm kind"
#endif
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
extern int phpdbg_startup_run;
#ifdef HAVE_LIBDL

2
sapi/phpdbg/phpdbg_set.c
View File

@ -25,7 +25,7 @@
#include "phpdbg_bp.h"
#include "phpdbg_prompt.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
#define PHPDBG_SET_COMMAND_D(f, h, a, m, l, s, flags) \
PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[17], flags)

2
sapi/phpdbg/phpdbg_sigio_win32.c
View File

@ -23,7 +23,7 @@
#include "phpdbg_sigio_win32.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
VOID

2
sapi/phpdbg/phpdbg_sigsafe.c
View File

@ -1,7 +1,7 @@
#include "phpdbg_sigsafe.h"
#include "phpdbg.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
#define STR(x) #x
#define EXP_STR(x) STR(x)

2
sapi/phpdbg/phpdbg_utils.c
View File

@ -38,7 +38,7 @@
# endif
#endif
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
/* {{{ color structures */
const static phpdbg_color_t colors[] = {

2
sapi/phpdbg/phpdbg_wait.c
View File

@ -21,7 +21,7 @@
#include "ext/standard/php_var.h"
#include "ext/standard/basic_functions.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
static void phpdbg_rebuild_http_globals_array(int type, const char *name) {
zval *zvp;

2
sapi/phpdbg/phpdbg_watch.c
View File

@ -80,7 +80,7 @@
# include <sys/mman.h>
#endif
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
const phpdbg_command_t phpdbg_watch_commands[] = {
PHPDBG_COMMAND_D_EX(array, "create watchpoint on an array", 'a', watch_array, &phpdbg_prompt_commands[24], "s", 0),