cvs: php4 /ext/com COM.c /ext/ctype ctype.c /ext/curl curl.c /ext/db db.c /ext/fdf fdf.c /ext/hyperwave hg_comm.c /ext/java java.c
/ext/mailparse mailparse.c /ext/mbstring mbstring.c /ext/mhash mhash.c /ext/mssql php_mssql.c /ext/oci8 oci8.c /ext/odbc php_odbc.c /ext/oracle
oracle.c /ext/pcre php_pcre.c /ext/pgsql pgsql.c /ext/sablot sablot.c /ext/session mod_user.c php_session.h session.c /ext/standard array.c
assert.c basic_functions.c dir.c dl.c file.c http_fopen_wrapper.c info.c lcg.c reg.c string.c syslog.c var.c /ext/sybase php_sybase_db.c
/ext/sybase_ct php_sybase_ct.c /ext/wddx wddx.c /ext/xml xml.c /ext/xslt xslt.c /ext/yp yp.c /ext/zlib zlib.c /main SAPI.c SAPI.h
fopen_wrappers.c main.c output.c php_content_types.c php_ini.c php_main.h php_variables.c php_variables.h rfc1867.c /sapi/aolserver aolserver.c
/sapi/apache mod_php4.c php_apache.c sapi_apache.c /sapi/apache2filter sapi_apache2.c /sapi/caudium caudium.c /sapi/cgi cgi_main.c /sapi/fastcgi
fastcgi.c /sapi/isapi php4isapi.c /sapi/nsapi nsapi.c /sapi/phttpd phttpd.c /sapi/pi3web pi3web_sapi.c /sapi/roxen roxen.c /sapi/servlet
servlet.c /sapi/thttpd thttpd.c /sapi/tux php_tux.c

zeev Fri Jul 27 06:16:45 2001 EDT Modified files: /php4/ext/com COM.c /php4/ext/ctype ctype.c /php4/ext/curl curl.c /php4/ext/db db.c /php4/ext/fdf fdf.c /php4/ext/hyperwave hg_comm.c /php4/ext/java java.c /php4/ext/mailparse mailparse.c /php4/ext/mbstring mbstring.c /php4/ext/mhash mhash.c /php4/ext/mssql php_mssql.c /php4/ext/oci8 oci8.c /php4/ext/odbc php_odbc.c /php4/ext/oracle oracle.c /php4/ext/pcre php_pcre.c /php4/ext/pgsql pgsql.c /php4/ext/sablot sablot.c /php4/ext/session mod_user.c php_session.h session.c /php4/ext/standard array.c assert.c basic_functions.c dir.c dl.c file.c http_fopen_wrapper.c info.c lcg.c reg.c string.c syslog.c var.c /php4/ext/sybase php_sybase_db.c /php4/ext/sybase_ct php_sybase_ct.c /php4/ext/wddx wddx.c /php4/ext/xml xml.c /php4/ext/xslt xslt.c /php4/ext/yp yp.c /php4/ext/zlib zlib.c /php4/main SAPI.c SAPI.h fopen_wrappers.c main.c output.c php_content_types.c php_ini.c php_main.h php_variables.c php_variables.h rfc1867.c /php4/sapi/aolserver aolserver.c /php4/sapi/apache mod_php4.c php_apache.c sapi_apache.c /php4/sapi/apache2filter sapi_apache2.c /php4/sapi/caudium caudium.c /php4/sapi/cgi cgi_main.c /php4/sapi/fastcgi fastcgi.c /php4/sapi/isapi php4isapi.c /php4/sapi/nsapi nsapi.c /php4/sapi/phttpd phttpd.c /php4/sapi/pi3web pi3web_sapi.c /php4/sapi/roxen roxen.c /php4/sapi/servlet servlet.c /php4/sapi/thttpd thttpd.c /php4/sapi/tux php_tux.c Log: - Get rid of ELS_*(), and use TSRMLS_*() instead. - Move to the new ts_allocate_id() API This patch is *bound* to break some files, as I must have had typos somewhere. If you use any uncommon extension, please try to build it...

Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.30 php4/ext/com/COM.c:1.31 --- php4/ext/com/COM.c:1.30 Sun Jul 15 10:08:58 2001 +++ php4/ext/com/COM.c Fri Jul 27 06:16:17 2001 @@ -1577,7 +1577,7 @@ ITypeComp *TypeComp; int i; int interfaces; - ELS_FETCH(); + TSRMLS_FETCH(); if(NULL == TypeLib) { @@ -1646,7 +1646,7 @@ /* Before registering the contsnt, let's see if we can find it */ { - zend_register_constant(&c ELS_CC); + zend_register_constant(&c TSRMLS_CC); } j++; } Index: php4/ext/ctype/ctype.c diff -u php4/ext/ctype/ctype.c:1.7 php4/ext/ctype/ctype.c:1.8 --- php4/ext/ctype/ctype.c:1.7 Wed Jun 6 09:05:42 2001 +++ php4/ext/ctype/ctype.c Fri Jul 27 06:16:18 2001 @@ -85,7 +85,7 @@ */ PHP_MINFO_FUNCTION(ctype) { - ELS_FETCH(); + TSRMLS_FETCH(); SLS_FETCH(); php_info_print_table_start(); Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.71 php4/ext/curl/curl.c:1.72 --- php4/ext/curl/curl.c:1.71 Wed Jul 18 06:47:54 2001 +++ php4/ext/curl/curl.c Fri Jul 27 06:16:18 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.71 2001/07/18 10:47:54 stas Exp $ */ +/* $Id: curl.c,v 1.72 2001/07/27 10:16:18 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -259,7 +259,7 @@ php_curl *ch = (php_curl *) ctx; php_curl_write *t = ch->handlers->write; size_t length = size * nmemb; - ELS_FETCH(); + TSRMLS_FETCH(); switch (t->method) { case PHP_CURL_STDOUT: @@ -274,7 +274,7 @@ zval *argv[2]; zval *retval; int error; - ELS_FETCH(); + TSRMLS_FETCH(); MAKE_STD_ZVAL(argv[0]); MAKE_STD_ZVAL(argv[1]); @@ -315,7 +315,7 @@ php_curl *ch = (php_curl *) ctx; php_curl_read *t = ch->handlers->read; int length = -1; - ELS_FETCH(); + TSRMLS_FETCH(); switch (t->method) { case PHP_CURL_DIRECT: @@ -371,7 +371,7 @@ php_curl_write *t = ch->handlers->write_header; int error; int length; - ELS_FETCH(); + TSRMLS_FETCH(); switch (t->method) { case PHP_CURL_STDOUT: @@ -437,7 +437,7 @@ zval *retval; int error; int ret = 0; - ELS_FETCH(); + TSRMLS_FETCH(); MAKE_STD_ZVAL(argv[0]); MAKE_STD_ZVAL(argv[1]); Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.53 php4/ext/db/db.c:1.54 --- php4/ext/db/db.c:1.53 Wed Jun 6 09:05:43 2001 +++ php4/ext/db/db.c Fri Jul 27 06:16:19 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.53 2001/06/06 13:05:43 rasmus Exp $ */ +/* $Id: db.c,v 1.54 2001/07/27 10:16:19 zeev Exp $ */ #define IS_EXT_MODULE #if 1 @@ -174,7 +174,7 @@ dbm_info *info; int numitems, i; int info_type; - ELS_FETCH(); + TSRMLS_FETCH(); if (Z_TYPE_P(id) == IS_STRING) { numitems = zend_hash_num_elements(&EG(regular_list)); Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.50 php4/ext/fdf/fdf.c:1.51 --- php4/ext/fdf/fdf.c:1.50 Fri Jul 13 12:58:09 2001 +++ php4/ext/fdf/fdf.c Fri Jul 27 06:16:19 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.50 2001/07/13 16:58:09 rasmus Exp $ */ +/* $Id: fdf.c,v 1.51 2001/07/27 10:16:19 zeev Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -731,7 +731,7 @@ FDFErc err; ASInt32 nBytes; zval *array_ptr = (zval *) arg; - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); fp=php_open_temporary_file(NULL,"fdfdata.",&filename); @@ -774,7 +774,7 @@ for(p=value;*p;p++) if(*p=='\r') *p='\n'; if(lastfieldname) efree(lastfieldname); lastfieldname = estrdup(name); - php_register_variable(name, value, array_ptr ELS_CC PLS_CC); + php_register_variable(name, value, array_ptr TSRMLS_CC PLS_CC); } } } Index: php4/ext/hyperwave/hg_comm.c diff -u php4/ext/hyperwave/hg_comm.c:1.42 php4/ext/hyperwave/hg_comm.c:1.43 --- php4/ext/hyperwave/hg_comm.c:1.42 Wed Jun 6 10:47:59 2001 +++ php4/ext/hyperwave/hg_comm.c Fri Jul 27 06:16:20 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hg_comm.c,v 1.42 2001/06/06 14:47:59 steinm Exp $ */ +/* $Id: hg_comm.c,v 1.43 2001/07/27 10:16:20 zeev Exp $ */ /* #define HW_DEBUG */ @@ -632,7 +632,7 @@ int laststart=0; char emptystring[BUFFERLEN]; int i; - ELS_FETCH(); + TSRMLS_FETCH(); emptystring[0] = '\0'; Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.47 php4/ext/java/java.c:1.48 --- php4/ext/java/java.c:1.47 Sun Jul 15 15:03:03 2001 +++ php4/ext/java/java.c Fri Jul 27 06:16:21 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.47 2001/07/15 19:03:03 zeev Exp $ */ +/* $Id: java.c,v 1.48 2001/07/27 10:16:21 zeev Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -599,7 +599,7 @@ } #ifdef ZTS -static void alloc_java_globals_ctor(php_java_globals *java_globals) { +static void alloc_java_globals_ctor(php_java_globals *java_globals TSRMLS_DC) { memset(java_globals, 0, sizeof(php_java_globals)); } #endif @@ -624,7 +624,7 @@ } #ifdef ZTS - java_globals_id = ts_allocate_id(sizeof(php_java_globals), + ts_allocate_id(&java_globals_id, sizeof(php_java_globals), (ts_allocate_ctor)alloc_java_globals_ctor, NULL); #endif Index: php4/ext/mailparse/mailparse.c diff -u php4/ext/mailparse/mailparse.c:1.5 php4/ext/mailparse/mailparse.c:1.6 --- php4/ext/mailparse/mailparse.c:1.5 Fri Jul 20 15:36:35 2001 +++ php4/ext/mailparse/mailparse.c Fri Jul 27 06:16:22 2001 @@ -18,7 +18,7 @@ | the support routines for this extension were based upon. | +----------------------------------------------------------------------+ */ -/* $Id: mailparse.c,v 1.5 2001/07/20 19:36:35 thies Exp $ */ +/* $Id: mailparse.c,v 1.6 2001/07/27 10:16:22 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -498,7 +498,7 @@ { zval * retval; zval * arg; - ELS_FETCH(); + TSRMLS_FETCH(); MAKE_STD_ZVAL(retval); retval->type = IS_BOOL; Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.21 php4/ext/mbstring/mbstring.c:1.22 --- php4/ext/mbstring/mbstring.c:1.21 Fri Jul 20 15:37:19 2001 +++ php4/ext/mbstring/mbstring.c Fri Jul 27 06:16:22 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.21 2001/07/20 19:37:19 thies Exp $ */ +/* $Id: mbstring.c,v 1.22 2001/07/27 10:16:22 zeev Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -819,7 +819,7 @@ mbfl_encoding_detector *identd; mbfl_buffer_converter *convd; MBSTRLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); mbfl_string_init(&string); @@ -919,10 +919,10 @@ ret = mbfl_buffer_converter_feed_result(convd, &string, &result); } if (ret != NULL) { - php_register_variable_safe(val_list[n], ret->val, ret->len, array_ptr ELS_CC PLS_CC); + php_register_variable_safe(val_list[n], ret->val, ret->len, array_ptr TSRMLS_CC PLS_CC); efree(ret->val); } else { - php_register_variable_safe(val_list[n], val_list[n+1], len_list[n+1], array_ptr ELS_CC PLS_CC); + php_register_variable_safe(val_list[n], val_list[n+1], len_list[n+1], array_ptr TSRMLS_CC PLS_CC); } n+=2; } @@ -954,7 +954,7 @@ } /* http input processing */ -void mbstr_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC) +void mbstr_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC) { char *res = NULL, *var, *val, *separator=NULL; const char *c_var; @@ -1239,7 +1239,7 @@ } n++; /* add variable to symbol table */ - php_register_variable_safe(var, val, val_len, track_vars_array ELS_CC PLS_CC); + php_register_variable_safe(var, val, val_len, track_vars_array TSRMLS_CC PLS_CC); mbfl_string_clear(&resvar); mbfl_string_clear(&resval); } Index: php4/ext/mhash/mhash.c diff -u php4/ext/mhash/mhash.c:1.29 php4/ext/mhash/mhash.c:1.30 --- php4/ext/mhash/mhash.c:1.29 Sun Jul 1 07:20:56 2001 +++ php4/ext/mhash/mhash.c Fri Jul 27 06:16:22 2001 @@ -71,7 +71,7 @@ snprintf(buf, 127, "MHASH_%s", name); zend_register_long_constant(buf, strlen(buf) + 1, i, CONST_PERSISTENT, - module_number ELS_CC); + module_number TSRMLS_CC); free(name); } } Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.55 php4/ext/mssql/php_mssql.c:1.56 --- php4/ext/mssql/php_mssql.c:1.55 Wed Jul 11 08:42:22 2001 +++ php4/ext/mssql/php_mssql.c Fri Jul 27 06:16:23 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.55 2001/07/11 12:42:22 thies Exp $ */ +/* $Id: php_mssql.c,v 1.56 2001/07/27 10:16:23 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -227,7 +227,7 @@ { mssql_link *mssql_ptr = (mssql_link *)rsrc->ptr; MSSQLLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); mssql_ptr->valid = 0; zend_hash_apply(&EG(regular_list),(int (*)(void *))_clean_invalid_results); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.136 php4/ext/oci8/oci8.c:1.137 --- php4/ext/oci8/oci8.c:1.136 Wed Jul 25 18:34:25 2001 +++ php4/ext/oci8/oci8.c Fri Jul 27 06:16:24 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.136 2001/07/25 22:34:25 thies Exp $ */ +/* $Id: oci8.c,v 1.137 2001/07/27 10:16:24 zeev Exp $ */ /* TODO list: * @@ -395,7 +395,7 @@ /* }}} */ /* {{{ startup, shutdown and info functions */ -static void php_oci_init_globals(OCILS_D) +static void php_oci_init_globals(OCILS_D TSRMLS_DC) { OCI(shutdown) = 0; @@ -433,9 +433,9 @@ #endif #ifdef ZTS - oci_globals_id = ts_allocate_id(sizeof(php_oci_globals), (ts_allocate_ctor) php_oci_init_globals, NULL); + ts_allocate_id(&oci_globals_id, sizeof(php_oci_globals), (ts_allocate_ctor) php_oci_init_globals, NULL); #else - php_oci_init_globals(OCILS_C); + php_oci_init_globals(OCILS_C TSRMLS_CC); #endif le_stmt = zend_register_list_destructors_ex(_oci_stmt_list_dtor, NULL, "oci8 statement", module_number); @@ -581,7 +581,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.136 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.137 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); @@ -2360,7 +2360,7 @@ char *dbname; int oldopen; OCILS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); oldopen = server->is_open; server->is_open = 2; Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.94 php4/ext/odbc/php_odbc.c:1.95 --- php4/ext/odbc/php_odbc.c:1.94 Tue Jun 19 13:58:09 2001 +++ php4/ext/odbc/php_odbc.c Fri Jul 27 06:16:25 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.94 2001/06/19 17:58:09 kalowsky Exp $ */ +/* $Id: php_odbc.c,v 1.95 2001/07/27 10:16:25 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -348,7 +348,7 @@ PHP_INI_END() #ifdef ZTS -static void php_odbc_init_globals(php_odbc_globals *odbc_globals) +static void php_odbc_init_globals(php_odbc_globals *odbc_globals TSRMLS_DC) { ODBCG(num_persistent) = 0; } @@ -363,7 +363,7 @@ #endif #ifdef ZTS - odbc_globals_id = ts_allocate_id(sizeof(php_odbc_globals), php_odbc_init_globals, NULL); + ts_allocate_id(&odbc_globals_id, sizeof(php_odbc_globals), php_odbc_init_globals, NULL); odbc_globals = ts_resource(odbc_globals_id); #else ODBCG(num_persistent) = 0; Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.64 php4/ext/oracle/oracle.c:1.65 --- php4/ext/oracle/oracle.c:1.64 Tue Jun 19 12:03:33 2001 +++ php4/ext/oracle/oracle.c Fri Jul 27 06:16:26 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.64 2001/06/19 16:03:33 andi Exp $ */ +/* $Id: oracle.c,v 1.65 2001/07/27 10:16:26 zeev Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -286,7 +286,7 @@ /* {{{ php_ora_init_globals */ -static void php_ora_init_globals(ORALS_D) +static void php_ora_init_globals(ORALS_D TSRMLS_DC) { if (cfg_get_long("oracle.allow_persistent", &ORA(allow_persistent)) @@ -319,9 +319,9 @@ { #ifdef ZTS - ora_globals_id = ts_allocate_id(sizeof(php_ora_globals), (ts_allocate_ctor) php_ora_init_globals, NULL); + ts_allocate_id(&ora_globals_id, sizeof(php_ora_globals), (ts_allocate_ctor) php_ora_init_globals, NULL); #else - php_ora_init_globals(ORALS_C); + php_ora_init_globals(ORALS_C TSRMLS_CC); #endif le_cursor = zend_register_list_destructors_ex(php_close_ora_cursor, NULL, "oracle cursor", module_number); @@ -1742,7 +1742,7 @@ pval **pdata; int i, len, plen; - ELS_FETCH(); + TSRMLS_FETCH(); zend_hash_internal_pointer_reset(cursor->params); Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.101 php4/ext/pcre/php_pcre.c:1.102 --- php4/ext/pcre/php_pcre.c:1.101 Thu Jul 12 23:37:18 2001 +++ php4/ext/pcre/php_pcre.c Fri Jul 27 06:16:27 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.101 2001/07/13 03:37:18 hirokawa Exp $ */ +/* $Id: php_pcre.c,v 1.102 2001/07/27 10:16:27 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -76,7 +76,7 @@ } -static void php_pcre_shutdown_globals(php_pcre_globals *pcre_globals) +static void php_pcre_shutdown_globals(php_pcre_globals *pcre_globals TSRMLS_DC) { zend_hash_destroy(&PCRE_G(pcre_cache)); } @@ -97,10 +97,11 @@ static PHP_MINIT_FUNCTION(pcre) { #ifdef ZTS - pcre_globals_id = ts_allocate_id( - sizeof(php_pcre_globals), - (ts_allocate_ctor) php_pcre_init_globals, - (ts_allocate_dtor) php_pcre_shutdown_globals); + ts_allocate_id( + &pcre_globals_id, + sizeof(php_pcre_globals), + (ts_allocate_ctor) php_pcre_init_globals, + (ts_allocate_dtor) php_pcre_shutdown_globals); #else zend_hash_init(&PCRE_G(pcre_cache), 0, NULL, php_free_pcre_cache, 1); #endif @@ -565,7 +566,7 @@ zval *subpats; /* Captured subpatterns */ int result_len; /* Return value length */ int i; - ELS_FETCH(); + TSRMLS_FETCH(); MAKE_STD_ZVAL(subpats); array_init(subpats); @@ -609,7 +610,7 @@ char *compiled_string_description; smart_str code = {0}; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); eval_str_end = eval_str + eval_str_len; walk = segment = eval_str; @@ -663,7 +664,7 @@ compiled_string_description = zend_make_compiled_string_description("regexp code"); /* Run the code */ - if (zend_eval_string(code.c, &retval, compiled_string_description CLS_CC ELS_CC) == FAILURE) { + if (zend_eval_string(code.c, &retval, compiled_string_description CLS_CC TSRMLS_CC) == FAILURE) { efree(compiled_string_description); zend_error(E_ERROR, "Failed evaluating code:\n%s\n", code); /* zend_error() does not return in this case */ Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.114 php4/ext/pgsql/pgsql.c:1.115 --- php4/ext/pgsql/pgsql.c:1.114 Fri Jul 13 13:13:00 2001 +++ php4/ext/pgsql/pgsql.c Fri Jul 27 06:16:27 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.114 2001/07/13 17:13:00 rasmus Exp $ */ +/* $Id: pgsql.c,v 1.115 2001/07/27 10:16:27 zeev Exp $ */ #include <stdlib.h> @@ -235,7 +235,7 @@ /* {{{ php_pgsql_init_globals */ -static void php_pgsql_init_globals(PGLS_D) +static void php_pgsql_init_globals(PGLS_D TSRMLS_DC) { PGG(num_persistent) = 0; PGG(ignore_notices) = 0; @@ -248,9 +248,9 @@ PHP_MINIT_FUNCTION(pgsql) { #ifdef ZTS - pgsql_globals_id = ts_allocate_id(sizeof(php_pgsql_globals), (ts_allocate_ctor) php_pgsql_init_globals, NULL); + ts_allocate_id(&pgsql_globals_id, sizeof(php_pgsql_globals), (ts_allocate_ctor) php_pgsql_init_globals, NULL); #else - php_pgsql_init_globals(PGLS_C); + php_pgsql_init_globals(PGLS_C TSRMLS_CC); #endif REGISTER_INI_ENTRIES(); @@ -295,7 +295,7 @@ */ PHP_RSHUTDOWN_FUNCTION(pgsql) { - ELS_FETCH(); + TSRMLS_FETCH(); zend_hash_apply(&EG(persistent_list), (apply_func_t) _rollback_transactions); return SUCCESS; } Index: php4/ext/sablot/sablot.c diff -u php4/ext/sablot/sablot.c:1.41 php4/ext/sablot/sablot.c:1.42 --- php4/ext/sablot/sablot.c:1.41 Fri Jul 20 15:42:26 2001 +++ php4/ext/sablot/sablot.c Fri Jul 27 06:16:28 2001 @@ -214,7 +214,7 @@ ZEND_GET_MODULE(sablot) #endif -static void php_sablot_init_globals(SABLOTLS_D) +static void php_sablot_init_globals(SABLOTLS_D TSRMLS_DC) { SABLOTG(processor) = NULL; SABLOTG(errors) = NULL; @@ -227,9 +227,9 @@ PHP_MINIT_FUNCTION(sablot) { #ifdef ZTS - sablot_globals_id = ts_allocate_id(sizeof(php_sablot_globals), (ts_allocate_ctor)php_sablot_init_globals, NULL); + ts_allocate_id(&sablot_globals_id, sizeof(php_sablot_globals), (ts_allocate_ctor)php_sablot_init_globals, NULL); #else - php_sablot_init_globals(SABLOTLS_C); + php_sablot_init_globals(SABLOTLS_C TSRMLS_CC); #endif le_sablot = zend_register_list_destructors_ex(_php_sablot_free_processor, NULL, "Sablotron XSLT", module_number); @@ -1161,7 +1161,7 @@ { zval *retval; int i; - ELS_FETCH(); + TSRMLS_FETCH(); MAKE_STD_ZVAL(retval); if (call_user_function(EG(function_table), NULL, handlerName, retval, argc, args) == FAILURE) { @@ -1427,7 +1427,7 @@ if (errorHandler) { zval *retval; - ELS_FETCH(); + TSRMLS_FETCH(); MAKE_STD_ZVAL(retval); @@ -1520,7 +1520,7 @@ static int _php_sablot_sh_getAll(void *userData, SablotHandle p, const char *scheme, const char *rest, char **buffer, int *byteCount) { php_sablot *handle = (php_sablot *) userData; - ELS_FETCH(); + TSRMLS_FETCH(); if (handle->getAllHandler) { zval *retval, Index: php4/ext/session/mod_user.c diff -u php4/ext/session/mod_user.c:1.15 php4/ext/session/mod_user.c:1.16 --- php4/ext/session/mod_user.c:1.15 Wed Jun 6 10:32:23 2001 +++ php4/ext/session/mod_user.c Fri Jul 27 06:16:28 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mod_user.c,v 1.15 2001/06/06 14:32:23 rasmus Exp $ */ +/* $Id: mod_user.c,v 1.16 2001/07/27 10:16:28 zeev Exp $ */ #include "php.h" #include "php_session.h" @@ -55,7 +55,7 @@ { int i; zval *retval = NULL; - ELS_FETCH(); + TSRMLS_FETCH(); MAKE_STD_ZVAL(retval); if (call_user_function(EG(function_table), NULL, func, retval, Index: php4/ext/session/php_session.h diff -u php4/ext/session/php_session.h:1.45 php4/ext/session/php_session.h:1.46 --- php4/ext/session/php_session.h:1.45 Wed Jul 11 09:27:25 2001 +++ php4/ext/session/php_session.h Fri Jul 27 06:16:28 2001 @@ -164,7 +164,7 @@ #endif void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash PSLS_DC); -int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC ELS_DC); +int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC TSRMLS_DC); int php_session_register_module(ps_module *); @@ -187,7 +187,7 @@ ulong key_length; \ ulong num_key; \ zval **struc; \ - ELS_FETCH(); \ + TSRMLS_FETCH(); \ PLS_FETCH() #define PS_ENCODE_LOOP(code) \ @@ -195,7 +195,7 @@ zend_hash_get_current_key_ex(&PS(vars), &key, &key_length, &num_key, 0, NULL) == HASH_KEY_IS_STRING; \ zend_hash_move_forward(&PS(vars))) { \ key_length--; \ - if (php_get_session_var(key, key_length, &struc PLS_CC PSLS_CC ELS_CC) == SUCCESS) { \ + if (php_get_session_var(key, key_length, &struc PLS_CC PSLS_CC TSRMLS_CC) == SUCCESS) { \ code; \ } \ } Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.221 php4/ext/session/session.c:1.222 --- php4/ext/session/session.c:1.221 Wed Jul 25 15:02:13 2001 +++ php4/ext/session/session.c Fri Jul 27 06:16:28 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.221 2001/07/25 19:02:13 sas Exp $ */ +/* $Id: session.c,v 1.222 2001/07/27 10:16:28 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -234,7 +234,7 @@ void php_set_session_var(char *name, size_t namelen, zval *state_val,HashTable *var_hash PSLS_DC) { PLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); if (PG(register_globals)) { zval **old_symbol; @@ -267,7 +267,7 @@ } } -int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC ELS_DC) +int php_get_session_var(char *name, size_t namelen, zval ***state_var PLS_DC PSLS_DC TSRMLS_DC) { HashTable *ht = &EG(symbol_table); @@ -448,7 +448,7 @@ { zval **old_vars = NULL; PSLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); if (zend_hash_find(&EG(symbol_table), "HTTP_SESSION_VARS", sizeof("HTTP_SESSION_VARS"), (void **)&old_vars) == SUCCESS && Z_TYPE_PP(old_vars) == IS_ARRAY) { PS(http_session_vars) = *old_vars; @@ -809,7 +809,7 @@ int module_number = PS(module_number); int nrand; int lensess; - ELS_FETCH(); + TSRMLS_FETCH(); if (PS(session_status) != php_session_none) return; @@ -1448,7 +1448,7 @@ #ifdef ZTS php_ps_globals *ps_globals; - ps_globals_id = ts_allocate_id(sizeof(php_ps_globals), NULL, NULL); + ts_allocate_id(&ps_globals_id, sizeof(php_ps_globals), NULL, NULL); ps_globals = ts_resource(ps_globals_id); #endif Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.114 php4/ext/standard/array.c:1.115 --- php4/ext/standard/array.c:1.114 Mon Jul 9 16:36:47 2001 +++ php4/ext/standard/array.c Fri Jul 27 06:16:29 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.114 2001/07/09 20:36:47 rasmus Exp $ */ +/* $Id: array.c,v 1.115 2001/07/27 10:16:29 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -68,7 +68,7 @@ PHP_MINIT_FUNCTION(array) { #ifdef ZTS - array_globals_id = ts_allocate_id(sizeof(php_array_globals), NULL, NULL); + ts_allocate_id(&array_globals_id, sizeof(php_array_globals), NULL, NULL); #endif REGISTER_LONG_CONSTANT("EXTR_OVERWRITE", EXTR_OVERWRITE, CONST_CS | CONST_PERSISTENT); @@ -522,7 +522,7 @@ Bucket *s; pval **args[2]; pval *retval_ptr; - ELS_FETCH(); + TSRMLS_FETCH(); BLS_FETCH(); f = *((Bucket **) a); @@ -610,7 +610,7 @@ pval *args[2]; pval retval; int status; - ELS_FETCH(); + TSRMLS_FETCH(); BLS_FETCH(); args[0] = &key1; @@ -959,7 +959,7 @@ ulong num_key; HashPosition pos; BLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); /* Allocate space for key */ MAKE_STD_ZVAL(key); Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.35 php4/ext/standard/assert.c:1.36 --- php4/ext/standard/assert.c:1.35 Mon Jul 23 23:52:16 2001 +++ php4/ext/standard/assert.c Fri Jul 27 06:16:29 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.35 2001/07/24 03:52:16 andi Exp $ */ +/* $Id: assert.c,v 1.36 2001/07/27 10:16:29 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -86,7 +86,7 @@ STD_PHP_INI_ENTRY("assert.quiet_eval", "0", PHP_INI_ALL, OnUpdateInt, quiet_eval, php_assert_globals, assert_globals) PHP_INI_END() -static void php_assert_init_globals(ASSERTLS_D) +static void php_assert_init_globals(ASSERTLS_D TSRMLS_DC) { ASSERT(callback) = NULL; } @@ -95,9 +95,9 @@ { #ifdef ZTS - assert_globals_id = ts_allocate_id(sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL); + ts_allocate_id(&assert_globals_id, sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL); #else - php_assert_init_globals(ASSERTLS_C); + php_assert_init_globals(ASSERTLS_C TSRMLS_CC); #endif REGISTER_INI_ENTRIES(); @@ -173,7 +173,7 @@ } compiled_string_description = zend_make_compiled_string_description("assert code"); - if (zend_eval_string(myeval, &retval, compiled_string_description CLS_CC ELS_CC) == FAILURE) { + if (zend_eval_string(myeval, &retval, compiled_string_description CLS_CC TSRMLS_CC) == FAILURE) { efree(compiled_string_description); zend_error(E_ERROR, "Failure evaluating code:\n%s\n", myeval); /* zend_error() does not return in this case. */ @@ -199,8 +199,8 @@ zval *args[4]; zval *retval; int i; - uint lineno = zend_get_executed_lineno(ELS_C); - char *filename = zend_get_executed_filename(ELS_C); + uint lineno = zend_get_executed_lineno(TSRMLS_C); + char *filename = zend_get_executed_filename(TSRMLS_C); MAKE_STD_ZVAL(args[0]); MAKE_STD_ZVAL(args[1]); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.360 php4/ext/standard/basic_functions.c:1.361 --- php4/ext/standard/basic_functions.c:1.360 Mon Jul 23 12:13:33 2001 +++ php4/ext/standard/basic_functions.c Fri Jul 27 06:16:29 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.360 2001/07/23 16:13:33 thies Exp $ */ +/* $Id: basic_functions.c,v 1.361 2001/07/27 10:16:29 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -691,7 +691,7 @@ void test_class_startup(void); -static void basic_globals_ctor(BLS_D) +static void basic_globals_ctor(BLS_D TSRMLS_DC) { BG(next) = NULL; BG(left) = -1; @@ -709,7 +709,7 @@ #endif } -static void basic_globals_dtor(BLS_D) +static void basic_globals_dtor(BLS_D TSRMLS_DC) { zend_hash_destroy(&BG(sm_protected_env_vars)); if (BG(sm_allowed_env_vars)) { @@ -726,9 +726,9 @@ PLS_FETCH(); #ifdef ZTS - basic_globals_id = ts_allocate_id(sizeof(php_basic_globals), (ts_allocate_ctor) basic_globals_ctor, (ts_allocate_dtor) basic_globals_dtor); + ts_allocate_id(&basic_globals_id, sizeof(php_basic_globals), (ts_allocate_ctor) basic_globals_ctor, (ts_allocate_dtor) basic_globals_dtor); #else - basic_globals_ctor(BLS_C); + basic_globals_ctor(BLS_C TSRMLS_CC); #endif REGISTER_LONG_CONSTANT("CONNECTION_ABORTED", PHP_CONNECTION_ABORTED, CONST_CS | CONST_PERSISTENT); @@ -804,8 +804,9 @@ { PLS_FETCH(); BLS_FETCH(); + TSRMLS_FETCH(); - basic_globals_dtor(BLS_C); + basic_globals_dtor(BLS_C TSRMLS_CC); #ifdef ZTS ts_free_id(basic_globals_id); @@ -1824,7 +1825,7 @@ static int user_shutdown_function_call(php_shutdown_function_entry *shutdown_function_entry) { zval retval; - ELS_FETCH(); + TSRMLS_FETCH(); if (call_user_function(EG(function_table), NULL, shutdown_function_entry->arguments[0], &retval, shutdown_function_entry->arg_count-1, shutdown_function_entry->arguments+1)==SUCCESS) { zval_dtor(&retval); @@ -1839,7 +1840,7 @@ { zval retval; zval *function = tick_fe->arguments[0]; - ELS_FETCH(); + TSRMLS_FETCH(); if (call_user_function(EG(function_table), NULL, function, &retval, tick_fe->arg_count - 1, tick_fe->arguments + 1) == SUCCESS) { @@ -1888,7 +1889,7 @@ void php_call_shutdown_functions(void) { BLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); if (BG(user_shutdown_function_names)) zend_try { zend_hash_apply(BG(user_shutdown_function_names), (apply_func_t)user_shutdown_function_call); Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.70 php4/ext/standard/dir.c:1.71 --- php4/ext/standard/dir.c:1.70 Fri Jul 13 14:21:21 2001 +++ php4/ext/standard/dir.c Fri Jul 27 06:16:30 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.70 2001/07/13 18:21:21 jflemer Exp $ */ +/* $Id: dir.c,v 1.71 2001/07/27 10:16:30 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -137,7 +137,7 @@ dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry); #ifdef ZTS - dir_globals_id = ts_allocate_id(sizeof(php_dir_globals), NULL, NULL); + ts_allocate_id(&dir_globals_id, sizeof(php_dir_globals), NULL, NULL); #endif tmpstr[0] = DEFAULT_SLASH; tmpstr[1] = '\0'; Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.54 php4/ext/standard/dl.c:1.55 --- php4/ext/standard/dl.c:1.54 Wed Jun 6 09:05:51 2001 +++ php4/ext/standard/dl.c Fri Jul 27 06:16:30 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.54 2001/06/06 13:05:51 rasmus Exp $ */ +/* $Id: dl.c,v 1.55 2001/07/27 10:16:30 zeev Exp $ */ #include "php.h" #include "dl.h" @@ -102,7 +102,7 @@ int error_type; char *extension_dir; PLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); if (type==MODULE_PERSISTENT) { @@ -177,7 +177,7 @@ module_entry->type = type; module_entry->module_number = zend_next_free_module(); if (module_entry->module_startup_func) { - if (module_entry->module_startup_func(type, module_entry->module_number ELS_CC)==FAILURE) { + if (module_entry->module_startup_func(type, module_entry->module_number TSRMLS_CC)==FAILURE) { php_error(error_type, "%s: Unable to initialize module", module_entry->name); DL_UNLOAD(handle); RETURN_FALSE; @@ -186,7 +186,7 @@ zend_register_module(module_entry); if ((type == MODULE_TEMPORARY) && module_entry->request_startup_func) { - if (module_entry->request_startup_func(type, module_entry->module_number ELS_CC)) { + if (module_entry->request_startup_func(type, module_entry->module_number TSRMLS_CC)) { php_error(error_type, "%s: Unable to initialize module", module_entry->name); DL_UNLOAD(handle); RETURN_FALSE; Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.168 php4/ext/standard/file.c:1.169 --- php4/ext/standard/file.c:1.168 Mon Jul 16 11:44:36 2001 +++ php4/ext/standard/file.c Fri Jul 27 06:16:30 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.168 2001/07/16 15:44:36 stas Exp $ */ +/* $Id: file.c,v 1.169 2001/07/27 10:16:30 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -168,7 +168,7 @@ } -static void file_globals_ctor(FLS_D) +static void file_globals_ctor(FLS_D TSRMLS_DC) { zend_hash_init(&FG(ht_fsock_keys), 0, NULL, NULL, 1); zend_hash_init(&FG(ht_fsock_socks), 0, NULL, (void (*)(void *))php_msock_destroy, 1); @@ -179,7 +179,7 @@ } -static void file_globals_dtor(FLS_D) +static void file_globals_dtor(FLS_D TSRMLS_DC) { zend_hash_destroy(&FG(ht_fsock_socks)); zend_hash_destroy(&FG(ht_fsock_keys)); @@ -198,9 +198,9 @@ #endif #ifdef ZTS - file_globals_id = ts_allocate_id(sizeof(php_file_globals), (ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) file_globals_dtor); + ts_allocate_id(&file_globals_id, sizeof(php_file_globals), (ts_allocate_ctor) file_globals_ctor, (ts_allocate_dtor) file_globals_dtor); #else - file_globals_ctor(FLS_C); + file_globals_ctor(FLS_C TSRMLS_CC); #endif REGISTER_LONG_CONSTANT("SEEK_SET", SEEK_SET, CONST_CS | CONST_PERSISTENT); @@ -220,8 +220,9 @@ { #ifndef ZTS FLS_FETCH(); + TSRMLS_FETCH(); - file_globals_dtor(FLS_C); + file_globals_dtor(FLS_C TSRMLS_CC); #endif return SUCCESS; } Index: php4/ext/standard/http_fopen_wrapper.c diff -u php4/ext/standard/http_fopen_wrapper.c:1.12 php4/ext/standard/http_fopen_wrapper.c:1.13 --- php4/ext/standard/http_fopen_wrapper.c:1.12 Sat Jul 14 12:41:58 2001 +++ php4/ext/standard/http_fopen_wrapper.c Fri Jul 27 06:16:30 2001 @@ -17,7 +17,7 @@ | Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: http_fopen_wrapper.c,v 1.12 2001/07/14 16:41:58 andi Exp $ */ +/* $Id: http_fopen_wrapper.c,v 1.13 2001/07/27 10:16:30 zeev Exp $ */ #include "php.h" #include "php_globals.h" @@ -274,7 +274,7 @@ php_url_free(resource); if (location[0] != '\0') { zval **response_header_new, *entry, **entryp; - ELS_FETCH(); + TSRMLS_FETCH(); fp = php_fopen_url_wrap_http(location, mode, options, issock, socketd, opened_path); if (zend_hash_find(EG(active_symbol_table), "http_response_header", sizeof("http_response_header"), (void **) &response_header_new) == SUCCESS) { @@ -299,7 +299,7 @@ *issock = 1; out: { - ELS_FETCH(); + TSRMLS_FETCH(); ZEND_SET_SYMBOL(EG(active_symbol_table), "http_response_header", response_header); } return (fp); Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.142 php4/ext/standard/info.c:1.143 --- php4/ext/standard/info.c:1.142 Tue Jun 19 11:21:28 2001 +++ php4/ext/standard/info.c Fri Jul 27 06:16:30 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.142 2001/06/19 15:21:28 sbergmann Exp $ */ +/* $Id: info.c,v 1.143 2001/07/27 10:16:30 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -58,7 +58,7 @@ /* {{{ php_print_gpcse_array */ -static void php_print_gpcse_array(char *name, uint name_length ELS_DC) +static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC) { zval **data, **tmp, tmp2; char *string_key; @@ -152,7 +152,7 @@ int expose_php = INI_INT("expose_php"); time_t the_time; struct tm *ta, tmbuf; - ELS_FETCH(); + TSRMLS_FETCH(); SLS_FETCH(); the_time = time(NULL); @@ -244,7 +244,7 @@ PUTS("</a></h1>\n"); } - zend_ini_sort_entries(ELS_C); + zend_ini_sort_entries(TSRMLS_C); if (flag & PHP_INFO_CONFIGURATION) { php_info_print_hr(); @@ -303,12 +303,12 @@ if (zend_hash_find(&EG(symbol_table), "PHP_AUTH_PW", sizeof("PHP_AUTH_PW"), (void **) &data) != FAILURE) { php_info_print_table_row(2, "PHP_AUTH_PW", (*data)->value.str.val); } - php_print_gpcse_array("HTTP_GET_VARS", sizeof("HTTP_GET_VARS")-1 ELS_CC); - php_print_gpcse_array("HTTP_POST_VARS", sizeof("HTTP_POST_VARS")-1 ELS_CC); - php_print_gpcse_array("HTTP_POST_FILES", sizeof("HTTP_POST_FILES")-1 ELS_CC); - php_print_gpcse_array("HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS")-1 ELS_CC); - php_print_gpcse_array("HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS")-1 ELS_CC); - php_print_gpcse_array("HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS")-1 ELS_CC); + php_print_gpcse_array("HTTP_GET_VARS", sizeof("HTTP_GET_VARS")-1 TSRMLS_CC); + php_print_gpcse_array("HTTP_POST_VARS", sizeof("HTTP_POST_VARS")-1 TSRMLS_CC); + php_print_gpcse_array("HTTP_POST_FILES", sizeof("HTTP_POST_FILES")-1 TSRMLS_CC); + php_print_gpcse_array("HTTP_COOKIE_VARS", sizeof("HTTP_COOKIE_VARS")-1 TSRMLS_CC); + php_print_gpcse_array("HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS")-1 TSRMLS_CC); + php_print_gpcse_array("HTTP_ENV_VARS", sizeof("HTTP_ENV_VARS")-1 TSRMLS_CC); php_info_print_table_end(); } Index: php4/ext/standard/lcg.c diff -u php4/ext/standard/lcg.c:1.19 php4/ext/standard/lcg.c:1.20 --- php4/ext/standard/lcg.c:1.19 Wed Jul 18 18:55:52 2001 +++ php4/ext/standard/lcg.c Fri Jul 27 06:16:31 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: lcg.c,v 1.19 2001/07/18 22:55:52 sas Exp $ */ +/* $Id: lcg.c,v 1.20 2001/07/27 10:16:31 zeev Exp $ */ #include "php.h" #include "php_lcg.h" @@ -63,7 +63,7 @@ return z * 4.656613e-10; } -static void lcg_init_globals(LCGLS_D) +static void lcg_init_globals(LCGLS_D TSRMLS_DC) { LCG(s1) = 1; #ifdef ZTS @@ -76,7 +76,7 @@ #ifdef ZTS PHP_MINIT_FUNCTION(lcg) { - lcg_globals_id = ts_allocate_id(sizeof(php_lcg_globals), (ts_allocate_ctor) lcg_init_globals, NULL); + ts_allocate_id(&lcg_globals_id, sizeof(php_lcg_globals), (ts_allocate_ctor) lcg_init_globals, NULL); return SUCCESS; } #else Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.43 php4/ext/standard/reg.c:1.44 --- php4/ext/standard/reg.c:1.43 Wed Jun 6 09:05:51 2001 +++ php4/ext/standard/reg.c Fri Jul 27 06:16:31 2001 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.43 2001/06/06 13:05:51 rasmus Exp $ */ +/* $Id: reg.c,v 1.44 2001/07/27 10:16:31 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -84,7 +84,7 @@ #undef regcomp #define regcomp(a,b,c) _php_regcomp(a,b,c) -static void php_reg_init_globals(php_reg_globals *reg_globals) +static void php_reg_init_globals(php_reg_globals *reg_globals TSRMLS_DC) { zend_hash_init(&reg_globals->ht_rc, 0, NULL, (void (*)(void *)) _free_reg_cache, 1); } @@ -92,9 +92,9 @@ PHP_MINIT_FUNCTION(regex) { #ifdef ZTS - reg_globals_id = ts_allocate_id(sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL); + ts_allocate_id(&reg_globals_id, sizeof(php_reg_globals), (ts_allocate_ctor) php_reg_init_globals, NULL); #else - php_reg_init_globals(&reg_globals); + php_reg_init_globals(&reg_globals TSRMLS_CC); #endif return SUCCESS; Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.206 php4/ext/standard/string.c:1.207 --- php4/ext/standard/string.c:1.206 Thu Jul 19 21:22:29 2001 +++ php4/ext/standard/string.c Fri Jul 27 06:16:31 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.206 2001/07/20 01:22:29 sas Exp $ */ +/* $Id: string.c,v 1.207 2001/07/27 10:16:31 zeev Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -2994,14 +2994,14 @@ old_rg = PG(register_globals); if(argCount == 1) { PG(register_globals) = 1; - php_treat_data(PARSE_STRING, res, NULL ELS_CC PLS_CC SLS_CC); + php_treat_data(PARSE_STRING, res, NULL TSRMLS_CC PLS_CC SLS_CC); } else { PG(register_globals) = 0; /* Clear out the array that was passed in. */ zval_dtor(*arrayArg); array_init(*arrayArg); - php_treat_data(PARSE_STRING, res, *arrayArg ELS_CC PLS_CC SLS_CC); + php_treat_data(PARSE_STRING, res, *arrayArg TSRMLS_CC PLS_CC SLS_CC); } PG(register_globals) = old_rg; } Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.28 php4/ext/standard/syslog.c:1.29 --- php4/ext/standard/syslog.c:1.28 Wed Jun 6 09:05:51 2001 +++ php4/ext/standard/syslog.c Fri Jul 27 06:16:31 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.28 2001/06/06 13:05:51 rasmus Exp $ */ +/* $Id: syslog.c,v 1.29 2001/07/27 10:16:31 zeev Exp $ */ #include "php.h" @@ -130,7 +130,7 @@ */ static void start_syslog(BLS_D) { - ELS_FETCH(); + TSRMLS_FETCH(); /* error levels */ SET_VAR_LONG("LOG_EMERG", LOG_EMERG); /* system unusable */ Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.96 php4/ext/standard/var.c:1.97 --- php4/ext/standard/var.c:1.96 Sun Jul 15 18:49:25 2001 +++ php4/ext/standard/var.c Fri Jul 27 06:16:31 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.96 2001/07/15 22:49:25 zeev Exp $ */ +/* $Id: var.c,v 1.97 2001/07/27 10:16:31 zeev Exp $ */ /* {{{ includes @@ -72,7 +72,7 @@ php_printf("%sint(%ld)\n", COMMON, Z_LVAL_PP(struc)); break; case IS_DOUBLE: { - ELS_FETCH(); + TSRMLS_FETCH(); php_printf("%sfloat(%.*G)\n", COMMON, (int) EG(precision), Z_DVAL_PP(struc)); } @@ -208,7 +208,7 @@ return; case IS_DOUBLE: { - ELS_FETCH(); + TSRMLS_FETCH(); slen = sprintf(s, "d:%.*G;",(int) EG(precision), Z_DVAL_PP(struc)); STR_CAT(buf, s, slen); } @@ -366,7 +366,7 @@ HashTable *myht; zval **rval_ref; - ELS_FETCH(); + TSRMLS_FETCH(); BLS_FETCH(); if (var_hash && **p != 'R') { /* references aren't counted by serializer! */ Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.20 php4/ext/sybase/php_sybase_db.c:1.21 --- php4/ext/sybase/php_sybase_db.c:1.20 Tue Jul 17 04:16:56 2001 +++ php4/ext/sybase/php_sybase_db.c Fri Jul 27 06:16:31 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.20 2001/07/17 08:16:56 joey Exp $ */ +/* $Id: php_sybase_db.c,v 1.21 2001/07/27 10:16:31 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -167,7 +167,7 @@ static void _close_sybase_link(zend_rsrc_list_entry *rsrc) { sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr; - ELS_FETCH(); + TSRMLS_FETCH(); sybase_ptr->valid = 0; Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.52 php4/ext/sybase_ct/php_sybase_ct.c:1.53 --- php4/ext/sybase_ct/php_sybase_ct.c:1.52 Mon Jul 23 12:10:10 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Fri Jul 27 06:16:32 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.52 2001/07/23 16:10:10 pwmoosman Exp $ */ +/* $Id: php_sybase_ct.c,v 1.53 2001/07/27 10:16:32 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -145,7 +145,7 @@ { sybase_link *sybase_ptr = (sybase_link *)rsrc->ptr; CS_INT con_status; - ELS_FETCH(); + TSRMLS_FETCH(); SybCtLS_FETCH(); sybase_ptr->valid = 0; Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.70 php4/ext/wddx/wddx.c:1.71 --- php4/ext/wddx/wddx.c:1.70 Tue Jul 10 23:58:51 2001 +++ php4/ext/wddx/wddx.c Fri Jul 27 06:16:33 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.70 2001/07/11 03:58:51 andrei Exp $ */ +/* $Id: wddx.c,v 1.71 2001/07/27 10:16:33 zeev Exp $ */ #include "php.h" #include "php_wddx.h" @@ -641,7 +641,7 @@ { zval **val; HashTable *target_hash; - ELS_FETCH(); + TSRMLS_FETCH(); if (Z_TYPE_P(name_var) == IS_STRING) { @@ -783,7 +783,7 @@ zend_class_entry *ce; zval *obj; zval *tmp; - ELS_FETCH(); + TSRMLS_FETCH(); if (stack->top == 0) return; Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.83 php4/ext/xml/xml.c:1.84 --- php4/ext/xml/xml.c:1.83 Wed Jul 11 08:42:24 2001 +++ php4/ext/xml/xml.c Fri Jul 27 06:16:33 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.83 2001/07/11 12:42:24 thies Exp $ */ +/* $Id: xml.c,v 1.84 2001/07/27 10:16:33 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -160,7 +160,7 @@ #ifdef ZTS -static void php_xml_init_globals(php_xml_globals *xml_globals) +static void php_xml_init_globals(php_xml_globals *xml_globals TSRMLS_DC) { XML(default_encoding) = "ISO-8859-1"; } @@ -171,7 +171,7 @@ le_xml_parser = zend_register_list_destructors_ex(xml_parser_dtor, NULL, "xml", module_number); #ifdef ZTS - xml_globals_id = ts_allocate_id(sizeof(php_xml_globals), (ts_allocate_ctor) php_xml_init_globals, NULL); + ts_allocate_id(&xml_globals_id, sizeof(php_xml_globals), (ts_allocate_ctor) php_xml_init_globals, NULL); #else XML(default_encoding) = "ISO-8859-1"; #endif @@ -367,7 +367,7 @@ static zval * xml_call_handler(xml_parser *parser, zval *handler, int argc, zval **argv) { - ELS_FETCH(); + TSRMLS_FETCH(); if (parser && handler) { zval *retval; Index: php4/ext/xslt/xslt.c diff -u php4/ext/xslt/xslt.c:1.10 php4/ext/xslt/xslt.c:1.11 --- php4/ext/xslt/xslt.c:1.10 Wed Jun 6 09:05:52 2001 +++ php4/ext/xslt/xslt.c Fri Jul 27 06:16:34 2001 @@ -216,7 +216,7 @@ zval ***argv; /* Argument container, maps around for call_user_function_ex() */ int error; /* Error container */ int idx; /* Idx, when looping through and free'ing the arguments */ - ELS_FETCH(); /* For TS mode, fetch the executor globals */ + TSRMLS_FETCH(); /* For TS mode, fetch the executor globals */ /* Allocate and initialize return value from the function */ MAKE_STD_ZVAL(*retval); Index: php4/ext/yp/yp.c diff -u php4/ext/yp/yp.c:1.22 php4/ext/yp/yp.c:1.23 --- php4/ext/yp/yp.c:1.22 Wed Jun 6 10:32:23 2001 +++ php4/ext/yp/yp.c Fri Jul 27 06:16:34 2001 @@ -16,7 +16,7 @@ | Fredrik Ohrn | +----------------------------------------------------------------------+ */ -/* $Id: yp.c,v 1.22 2001/06/06 14:32:23 rasmus Exp $ */ +/* $Id: yp.c,v 1.23 2001/07/27 10:16:34 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -366,7 +366,7 @@ PHP_MINIT_FUNCTION(yp) { #ifdef ZTS - yp_globals_id = ts_allocate_id(sizeof(php_yp_globals), NULL, NULL); + ts_allocate_id(&yp_globals_id, sizeof(php_yp_globals), NULL, NULL); #endif REGISTER_LONG_CONSTANT("YPERR_BADARGS", YPERR_BADARGS, CONST_CS | CONST_PERSISTENT); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.83 php4/ext/zlib/zlib.c:1.84 --- php4/ext/zlib/zlib.c:1.83 Fri Jul 13 11:48:37 2001 +++ php4/ext/zlib/zlib.c Fri Jul 27 06:16:34 2001 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.83 2001/07/13 15:48:37 thies Exp $ */ +/* $Id: zlib.c,v 1.84 2001/07/27 10:16:34 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -147,7 +147,7 @@ #ifdef ZTS /* {{{ php_zlib_init_globals */ -static void php_zlib_init_globals(ZLIBLS_D) +static void php_zlib_init_globals(ZLIBLS_D TSRMLS_DC) { ZLIBG(gzgetss_state) = 0; } @@ -161,9 +161,9 @@ PLS_FETCH(); #ifdef ZTS - zlib_globals_id = ts_allocate_id(sizeof(php_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL); + ts_allocate_id(&zlib_globals_id, sizeof(php_zlib_globals), (ts_allocate_ctor) php_zlib_init_globals, NULL); #else - ZLIBG(gzgetss_state)=0; + ZLIBG(gzgetss_state)=0; #endif le_zp = zend_register_list_destructors_ex(phpi_destructor_gzclose, NULL, "zlib", module_number); @@ -1257,7 +1257,7 @@ int php_enable_output_compression(int buffer_size) { zval **a_encoding, **data; - ELS_FETCH(); + TSRMLS_FETCH(); ZLIBLS_FETCH(); if (zend_hash_find(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), (void **) &data)==FAILURE Index: php4/main/SAPI.c diff -u php4/main/SAPI.c:1.108 php4/main/SAPI.c:1.109 --- php4/main/SAPI.c:1.108 Tue Jul 24 16:30:33 2001 +++ php4/main/SAPI.c Fri Jul 27 06:16:35 2001 @@ -48,7 +48,7 @@ sapi_globals_struct sapi_globals; #endif -static void sapi_globals_ctor(sapi_globals_struct *sapi_globals) +static void sapi_globals_ctor(sapi_globals_struct *sapi_globals TSRMLS_DC) { memset(sapi_globals,0,sizeof(*sapi_globals)); } @@ -64,9 +64,9 @@ zend_hash_init_ex(&known_post_content_types, 5, NULL, NULL, 1, 0); #ifdef ZTS - sapi_globals_id = ts_allocate_id(sizeof(sapi_globals_struct), (ts_allocate_ctor) sapi_globals_ctor, NULL); + ts_allocate_id(&sapi_globals_id, sizeof(sapi_globals_struct), (ts_allocate_ctor) sapi_globals_ctor, NULL); #else - sapi_globals_ctor(&sapi_globals); + sapi_globals_ctor(&sapi_globals TSRMLS_CC); #endif #ifdef VIRTUAL_DIR Index: php4/main/SAPI.h diff -u php4/main/SAPI.h:1.69 php4/main/SAPI.h:1.70 --- php4/main/SAPI.h:1.69 Mon Apr 16 19:20:47 2001 +++ php4/main/SAPI.h Fri Jul 27 06:16:35 2001 @@ -184,7 +184,7 @@ int (*read_post)(char *buffer, uint count_bytes SLS_DC); char *(*read_cookies)(SLS_D); - void (*register_server_variables)(zval *track_vars_array ELS_DC SLS_DC PLS_DC); + void (*register_server_variables)(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC); void (*log_message)(char *message); char *php_ini_path_override; Index: php4/main/fopen_wrappers.c diff -u php4/main/fopen_wrappers.c:1.127 php4/main/fopen_wrappers.c:1.128 --- php4/main/fopen_wrappers.c:1.127 Sat Jul 21 11:13:19 2001 +++ php4/main/fopen_wrappers.c Fri Jul 27 06:16:35 2001 @@ -16,7 +16,7 @@ | Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: fopen_wrappers.c,v 1.127 2001/07/21 15:13:19 andi Exp $ */ +/* $Id: fopen_wrappers.c,v 1.128 2001/07/27 10:16:35 zeev Exp $ */ /* {{{ includes */ @@ -401,7 +401,7 @@ int safe_mode_include_dir_length; int exec_fname_length; PLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); if (opened_path) { *opened_path = NULL; @@ -466,7 +466,7 @@ * as a fall back case */ if (zend_is_executing()) { - exec_fname = zend_get_executed_filename(ELS_C); + exec_fname = zend_get_executed_filename(TSRMLS_C); exec_fname_length = strlen(exec_fname); path_length = strlen(path); Index: php4/main/main.c diff -u php4/main/main.c:1.384 php4/main/main.c:1.385 --- php4/main/main.c:1.384 Tue Jul 24 16:30:33 2001 +++ php4/main/main.c Fri Jul 27 06:16:35 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.384 2001/07/24 20:30:33 zeev Exp $ */ +/* $Id: main.c,v 1.385 2001/07/27 10:16:35 zeev Exp $ */ /* {{{ includes */ @@ -83,7 +83,7 @@ PHPAPI int core_globals_id; #endif -static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC); +static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC PLS_DC); #define SAFE_FILENAME(f) ((f)?(f):"-") @@ -91,7 +91,7 @@ */ static PHP_INI_MH(OnSetPrecision) { - ELS_FETCH(); + TSRMLS_FETCH(); EG(precision) = atoi(new_value); return SUCCESS; @@ -119,7 +119,7 @@ */ static PHP_INI_MH(OnUpdateErrorReporting) { - ELS_FETCH(); + TSRMLS_FETCH(); if (!new_value) { EG(error_reporting) = E_ALL & ~E_NOTICE; @@ -151,7 +151,7 @@ */ static PHP_INI_MH(OnUpdateTimeout) { - ELS_FETCH(); + TSRMLS_FETCH(); EG(timeout_seconds) = atoi(new_value); if (stage==PHP_INI_STAGE_STARTUP) { @@ -343,7 +343,7 @@ { char buffer[1024]; int buffer_len; - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); buffer_len = vsnprintf(buffer, sizeof(buffer)-1, format, args); @@ -553,7 +553,7 @@ break; case ZMSG_MEMORY_LEAK_DETECTED: case ZMSG_MEMORY_LEAK_REPEATED: { - ELS_FETCH(); + TSRMLS_FETCH(); if (EG(error_reporting)&E_WARNING) { #if ZEND_DEBUG @@ -614,11 +614,11 @@ /* }}} */ #endif -static int php_hash_environment(ELS_D SLS_DC PLS_DC); +static int php_hash_environment(TSRMLS_D SLS_DC PLS_DC); /* {{{ php_request_startup */ -int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC) +int php_request_startup(CLS_D TSRMLS_DC PLS_DC SLS_DC) { int retval = SUCCESS; @@ -636,7 +636,7 @@ PG(header_is_being_sent) = 0; PG(connection_status) = PHP_CONNECTION_NORMAL; - zend_activate(CLS_C ELS_CC); + zend_activate(CLS_C TSRMLS_CC); sapi_activate(SLS_C); zend_set_timeout(EG(timeout_seconds)); @@ -662,7 +662,7 @@ /* We turn this off in php_execute_script() */ /* PG(during_request_startup) = 0; */ - php_hash_environment(ELS_C SLS_CC PLS_CC); + php_hash_environment(TSRMLS_C SLS_CC PLS_CC); zend_activate_modules(); PG(modules_activated)=1; } zend_catch { @@ -688,10 +688,12 @@ void php_request_shutdown(void *dummy) { CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); SLS_FETCH(); PLS_FETCH(); + return; + zend_try { php_end_ob_buffers((zend_bool)(SG(request_info).headers_only?0:1)); } zend_end_try(); @@ -708,7 +710,7 @@ zend_deactivate_modules(); } - zend_deactivate(CLS_C ELS_CC); + zend_deactivate(CLS_C TSRMLS_CC); zend_try { sapi_deactivate(SLS_C); @@ -743,7 +745,7 @@ #ifdef ZTS /* {{{ core_globals_ctor */ -static void core_globals_ctor(php_core_globals *core_globals) +static void core_globals_ctor(php_core_globals *core_globals TSRMLS_DC) { memset(core_globals,0,sizeof(*core_globals)); } @@ -779,6 +781,7 @@ char *php_os; #ifdef ZTS zend_executor_globals *executor_globals; + void ***tsrm_ls; php_core_globals *core_globals; sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id); #endif @@ -826,7 +829,8 @@ #ifdef ZTS executor_globals = ts_resource(executor_globals_id); - core_globals_id = ts_allocate_id(sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, NULL); + tsrm_ls = ts_resource(0); + ts_allocate_id(&core_globals_id, sizeof(php_core_globals), (ts_allocate_ctor) core_globals_ctor, NULL); core_globals = ts_resource(core_globals_id); #endif EG(bailout_set) = 0; @@ -951,6 +955,7 @@ int module_number=0; /* for UNREGISTER_INI_ENTRIES() */ PLS_FETCH(); + return; if (!module_initialized) { return; } @@ -971,7 +976,7 @@ php_shutdown_info_logos(); UNREGISTER_INI_ENTRIES(); #ifndef ZTS - zend_ini_shutdown(ELS_C); + zend_ini_shutdown(TSRMLS_C); #endif shutdown_memory_manager(0, 1); module_initialized = 0; @@ -980,7 +985,7 @@ /* {{{ php_register_server_variables */ -static inline void php_register_server_variables(ELS_D SLS_DC PLS_DC) +static inline void php_register_server_variables(TSRMLS_D SLS_DC PLS_DC) { zval *array_ptr=NULL; @@ -991,27 +996,27 @@ /* Server variables */ if (sapi_module.register_server_variables) { - sapi_module.register_server_variables(array_ptr ELS_CC SLS_CC PLS_CC); + sapi_module.register_server_variables(array_ptr TSRMLS_CC SLS_CC PLS_CC); } /* argv/argc support */ if (PG(register_argc_argv)) { - php_build_argv(SG(request_info).query_string, array_ptr ELS_CC PLS_CC); + php_build_argv(SG(request_info).query_string, array_ptr TSRMLS_CC PLS_CC); } /* PHP Authentication support */ if (SG(request_info).auth_user) { - php_register_variable("PHP_AUTH_USER", SG(request_info).auth_user, array_ptr ELS_CC PLS_CC); + php_register_variable("PHP_AUTH_USER", SG(request_info).auth_user, array_ptr TSRMLS_CC PLS_CC); } if (SG(request_info).auth_password) { - php_register_variable("PHP_AUTH_PW", SG(request_info).auth_password, array_ptr ELS_CC PLS_CC); + php_register_variable("PHP_AUTH_PW", SG(request_info).auth_password, array_ptr TSRMLS_CC PLS_CC); } } /* }}} */ /* {{{ php_hash_environment */ -static int php_hash_environment(ELS_D SLS_DC PLS_DC) +static int php_hash_environment(TSRMLS_D SLS_DC PLS_DC) { char *p; unsigned char _gpc_flags[3] = {0,0,0}; @@ -1051,7 +1056,7 @@ ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]); array_init(PG(http_globals)[TRACK_VARS_ENV]); INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]); - php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] ELS_CC PLS_CC); + php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC PLS_CC); } while(p && *p) { @@ -1059,21 +1064,21 @@ case 'p': case 'P': if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcasecmp(SG(request_info).request_method, "POST")) { - php_treat_data(PARSE_POST, NULL, NULL ELS_CC PLS_CC SLS_CC); /* POST Data */ + php_treat_data(PARSE_POST, NULL, NULL TSRMLS_CC PLS_CC SLS_CC); /* POST Data */ _gpc_flags[0]=1; } break; case 'c': case 'C': if (!_gpc_flags[1]) { - php_treat_data(PARSE_COOKIE, NULL, NULL ELS_CC PLS_CC SLS_CC); /* Cookie Data */ + php_treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC PLS_CC SLS_CC); /* Cookie Data */ _gpc_flags[1]=1; } break; case 'g': case 'G': if (!_gpc_flags[2]) { - php_treat_data(PARSE_GET, NULL, NULL ELS_CC PLS_CC SLS_CC); /* GET Data */ + php_treat_data(PARSE_GET, NULL, NULL TSRMLS_CC PLS_CC SLS_CC); /* GET Data */ _gpc_flags[2]=1; } break; @@ -1083,20 +1088,20 @@ ALLOC_ZVAL(PG(http_globals)[TRACK_VARS_ENV]); array_init(PG(http_globals)[TRACK_VARS_ENV]); INIT_PZVAL(PG(http_globals)[TRACK_VARS_ENV]); - php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] ELS_CC PLS_CC); + php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC PLS_CC); } else { php_error(E_WARNING, "Unsupported 'e' element (environment) used in gpc_order - use variables_order instead"); } break; case 's': case 'S': - php_register_server_variables(ELS_C SLS_CC PLS_CC); + php_register_server_variables(TSRMLS_C SLS_CC PLS_CC); break; } } if (!have_variables_order) { - php_register_server_variables(ELS_C SLS_CC PLS_CC); + php_register_server_variables(TSRMLS_C SLS_CC PLS_CC); } for (i=0; i<6; i++) { @@ -1119,7 +1124,7 @@ /* {{{ php_build_argv */ -static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC) +static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC PLS_DC) { pval *arr, *argc, *tmp; int count = 0; @@ -1195,7 +1200,7 @@ /* {{{ php_execute_script */ -PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC) +PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC TSRMLS_DC PLS_DC) { zend_file_handle *prepend_file_p, *append_file_p; zend_file_handle prepend_file, append_file; @@ -1241,7 +1246,7 @@ } else { append_file_p = NULL; } - zend_execute_scripts(ZEND_REQUIRE CLS_CC ELS_CC, 3, prepend_file_p, primary_file, append_file_p); + zend_execute_scripts(ZEND_REQUIRE CLS_CC TSRMLS_CC, 3, prepend_file_p, primary_file, append_file_p); } zend_end_try(); if (old_cwd[0] != '\0') { @@ -1301,7 +1306,7 @@ /* {{{ php_lint_script */ -PHPAPI int php_lint_script(zend_file_handle *file CLS_DC ELS_DC PLS_DC) +PHPAPI int php_lint_script(zend_file_handle *file CLS_DC TSRMLS_DC PLS_DC) { zend_op_array *op_array; Index: php4/main/output.c diff -u php4/main/output.c:1.65 php4/main/output.c:1.66 --- php4/main/output.c:1.65 Fri Jul 20 10:40:30 2001 +++ php4/main/output.c Fri Jul 27 06:16:36 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: output.c,v 1.65 2001/07/20 14:40:30 zeev Exp $ */ +/* $Id: output.c,v 1.66 2001/07/27 10:16:36 zeev Exp $ */ #include "php.h" #include "ext/standard/head.h" @@ -50,7 +50,7 @@ } -static void php_output_init_globals(OLS_D) +static void php_output_init_globals(OLS_D TSRMLS_DC) { OG(php_body_write) = php_default_output_func; OG(php_header_write) = php_default_output_func; @@ -64,9 +64,9 @@ PHPAPI void php_output_startup(void) { #ifdef ZTS - output_globals_id = ts_allocate_id(sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL); + ts_allocate_id(&output_globals_id, sizeof(php_output_globals), (ts_allocate_ctor) php_output_init_globals, NULL); #else - php_output_init_globals(OLS_C); + php_output_init_globals(OLS_C TSRMLS_CC); #endif } @@ -93,7 +93,7 @@ void php_output_register_constants() { - ELS_FETCH(); + TSRMLS_FETCH(); REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_START", PHP_OUTPUT_HANDLER_START, CONST_CS | CONST_PERSISTENT); REGISTER_MAIN_LONG_CONSTANT("PHP_OUTPUT_HANDLER_CONT", PHP_OUTPUT_HANDLER_CONT, CONST_CS | CONST_PERSISTENT); @@ -499,10 +499,10 @@ OG(output_start_filename) = zend_get_compiled_filename(CLS_C); OG(output_start_lineno) = zend_get_compiled_lineno(CLS_C); } else if (zend_is_executing()) { - ELS_FETCH(); + TSRMLS_FETCH(); - OG(output_start_filename) = zend_get_executed_filename(ELS_C); - OG(output_start_lineno) = zend_get_executed_lineno(ELS_C); + OG(output_start_filename) = zend_get_executed_filename(TSRMLS_C); + OG(output_start_lineno) = zend_get_executed_lineno(TSRMLS_C); } OG(php_body_write) = php_ub_body_write_no_header; Index: php4/main/php_content_types.c diff -u php4/main/php_content_types.c:1.12 php4/main/php_content_types.c:1.13 --- php4/main/php_content_types.c:1.12 Tue Jul 17 12:46:06 2001 +++ php4/main/php_content_types.c Fri Jul 27 06:16:36 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_content_types.c,v 1.12 2001/07/17 16:46:06 rasmus Exp $ */ +/* $Id: php_content_types.c,v 1.13 2001/07/27 10:16:36 zeev Exp $ */ #include "php.h" #include "SAPI.h" @@ -38,7 +38,7 @@ SAPI_POST_READER_FUNC(php_default_post_reader) { char *data; - ELS_FETCH(); + TSRMLS_FETCH(); if(!SG(request_info).post_data) sapi_read_standard_form_data(SLS_C); data = estrndup(SG(request_info).post_data,SG(request_info).post_data_length); Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.62 php4/main/php_ini.c:1.63 --- php4/main/php_ini.c:1.62 Tue Jun 19 11:21:26 2001 +++ php4/main/php_ini.c Fri Jul 27 06:16:36 2001 @@ -100,7 +100,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module) { int module_number; - ELS_FETCH(); + TSRMLS_FETCH(); if (module) { module_number = module->module_number; Index: php4/main/php_main.h diff -u php4/main/php_main.h:1.12 php4/main/php_main.h:1.13 --- php4/main/php_main.h:1.12 Tue Jul 24 16:30:34 2001 +++ php4/main/php_main.h Fri Jul 27 06:16:36 2001 @@ -18,7 +18,7 @@ */ -/* $Id: php_main.h,v 1.12 2001/07/24 20:30:34 zeev Exp $ */ +/* $Id: php_main.h,v 1.13 2001/07/27 10:16:36 zeev Exp $ */ #ifndef PHP_MAIN_H @@ -28,7 +28,7 @@ #include "php_globals.h" #include "SAPI.h" -PHPAPI int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC); +PHPAPI int php_request_startup(CLS_D TSRMLS_DC PLS_DC SLS_DC); PHPAPI void php_request_shutdown(void *dummy); PHPAPI void php_request_shutdown_for_exec(void *dummy); PHPAPI int php_module_startup(sapi_module_struct *sf); @@ -38,9 +38,9 @@ PHPAPI int php_startup_extensions(zend_module_entry **ptr, int count); -PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_DC); +PHPAPI int php_execute_script(zend_file_handle *primary_file CLS_DC TSRMLS_DC PLS_DC); PHPAPI int php_handle_special_queries(SLS_D PLS_DC); -PHPAPI int php_lint_script(zend_file_handle *file CLS_DC ELS_DC PLS_DC); +PHPAPI int php_lint_script(zend_file_handle *file CLS_DC TSRMLS_DC PLS_DC); PHPAPI void php_handle_aborted_connection(void); PHPAPI int php_handle_auth_data(const char *auth SLS_DC); Index: php4/main/php_variables.c diff -u php4/main/php_variables.c:1.27 php4/main/php_variables.c:1.28 --- php4/main/php_variables.c:1.27 Wed Jun 6 09:05:53 2001 +++ php4/main/php_variables.c Fri Jul 27 06:16:36 2001 @@ -16,7 +16,7 @@ | Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_variables.c,v 1.27 2001/06/06 13:05:53 rasmus Exp $ */ +/* $Id: php_variables.c,v 1.28 2001/07/27 10:16:36 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -29,12 +29,13 @@ #include "zend_globals.h" -PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_array ELS_DC PLS_DC) { - php_register_variable_safe(var, strval, strlen(strval), track_vars_array ELS_CC PLS_CC); +PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_array TSRMLS_DC PLS_DC) +{ + php_register_variable_safe(var, strval, strlen(strval), track_vars_array TSRMLS_CC PLS_CC); } /* binary-safe version */ -PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array ELS_DC PLS_DC) +PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array TSRMLS_DC PLS_DC) { zval new_entry; @@ -47,11 +48,11 @@ } new_entry.type = IS_STRING; - php_register_variable_ex(var, &new_entry, track_vars_array ELS_CC PLS_CC); + php_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC PLS_CC); } -PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array ELS_DC PLS_DC) +PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC PLS_DC) { char *p = NULL; char *ip; /* index pointer */ @@ -195,7 +196,7 @@ char *var, *val; char *strtok_buf = NULL; zval *array_ptr = (zval *) arg; - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); var = php_strtok_r(SG(request_info).post_data, "&", &strtok_buf); @@ -208,14 +209,14 @@ *val++ = '\0'; php_url_decode(var, strlen(var)); val_len = php_url_decode(val, strlen(val)); - php_register_variable_safe(var, val, val_len, array_ptr ELS_CC PLS_CC); + php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC PLS_CC); } var = php_strtok_r(NULL, "&", &strtok_buf); } } -void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC) +void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC) { char *res = NULL, *var, *val, *separator=NULL; const char *c_var; @@ -297,7 +298,7 @@ *val++ = '\0'; php_url_decode(var, strlen(var)); val_len = php_url_decode(val, strlen(val)); - php_register_variable_safe(var, val, val_len, array_ptr ELS_CC PLS_CC); + php_register_variable_safe(var, val, val_len, array_ptr TSRMLS_CC PLS_CC); } var = php_strtok_r(NULL, separator, &strtok_buf); } @@ -312,7 +313,7 @@ } -void php_import_environment_variables(zval *array_ptr ELS_DC PLS_DC) +void php_import_environment_variables(zval *array_ptr TSRMLS_DC PLS_DC) { char **env, *p, *t; @@ -322,7 +323,7 @@ continue; } t = estrndup(*env, p - *env); - php_register_variable(t, p+1, array_ptr ELS_CC PLS_CC); + php_register_variable(t, p+1, array_ptr TSRMLS_CC PLS_CC); efree(t); } } Index: php4/main/php_variables.h diff -u php4/main/php_variables.h:1.10 php4/main/php_variables.h:1.11 --- php4/main/php_variables.h:1.10 Mon Feb 26 01:07:31 2001 +++ php4/main/php_variables.h Fri Jul 27 06:16:36 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_variables.h,v 1.10 2001/02/26 06:07:31 andi Exp $ */ +/* $Id: php_variables.h,v 1.11 2001/07/27 10:16:36 zeev Exp $ */ #ifndef PHP_VARIABLES_H #define PHP_VARIABLES_H @@ -30,12 +30,12 @@ #define PARSE_COOKIE 2 #define PARSE_STRING 3 -void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC); -PHPAPI void php_import_environment_variables(zval *array_ptr ELS_DC PLS_DC); -PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array ELS_DC PLS_DC); +void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC PLS_DC SLS_DC); +PHPAPI void php_import_environment_variables(zval *array_ptr TSRMLS_DC PLS_DC); +PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array TSRMLS_DC PLS_DC); /* binary-safe version */ -PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, pval *track_vars_array ELS_DC PLS_DC); -PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array ELS_DC PLS_DC); +PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, pval *track_vars_array TSRMLS_DC PLS_DC); +PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array TSRMLS_DC PLS_DC); #endif /* PHP_VARIABLES_H */ Index: php4/main/rfc1867.c diff -u php4/main/rfc1867.c:1.67 php4/main/rfc1867.c:1.68 --- php4/main/rfc1867.c:1.67 Mon Jul 16 16:43:18 2001 +++ php4/main/rfc1867.c Fri Jul 27 06:16:36 2001 @@ -15,7 +15,7 @@ | Authors: Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: rfc1867.c,v 1.67 2001/07/16 20:43:18 zeev Exp $ */ +/* $Id: rfc1867.c,v 1.68 2001/07/27 10:16:36 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -47,38 +47,38 @@ } -static void safe_php_register_variable(char *var, char *strval, zval *track_vars_array, zend_bool override_protection ELS_DC PLS_DC) +static void safe_php_register_variable(char *var, char *strval, zval *track_vars_array, zend_bool override_protection TSRMLS_DC PLS_DC) { if (override_protection || !is_protected_variable(var PLS_CC)) { - php_register_variable(var, strval, track_vars_array ELS_CC PLS_CC); + php_register_variable(var, strval, track_vars_array TSRMLS_CC PLS_CC); } } -static void safe_php_register_variable_ex(char *var, zval *val, pval *track_vars_array, zend_bool override_protection ELS_DC PLS_DC) +static void safe_php_register_variable_ex(char *var, zval *val, pval *track_vars_array, zend_bool override_protection TSRMLS_DC PLS_DC) { if (override_protection || !is_protected_variable(var PLS_CC)) { - php_register_variable_ex(var, val, track_vars_array ELS_CC PLS_CC); + php_register_variable_ex(var, val, track_vars_array TSRMLS_CC PLS_CC); } } -static void register_http_post_files_variable(char *strvar, char *val, zval *http_post_files, zend_bool override_protection ELS_DC PLS_DC) +static void register_http_post_files_variable(char *strvar, char *val, zval *http_post_files, zend_bool override_protection TSRMLS_DC PLS_DC) { int register_globals = PG(register_globals); PG(register_globals) = 0; - safe_php_register_variable(strvar, val, http_post_files, override_protection ELS_CC PLS_CC); + safe_php_register_variable(strvar, val, http_post_files, override_protection TSRMLS_CC PLS_CC); PG(register_globals) = register_globals; } -static void register_http_post_files_variable_ex(char *var, zval *val, zval *http_post_files, zend_bool override_protection ELS_DC PLS_DC) +static void register_http_post_files_variable_ex(char *var, zval *val, zval *http_post_files, zend_bool override_protection TSRMLS_DC PLS_DC) { int register_globals = PG(register_globals); PG(register_globals) = 0; - safe_php_register_variable_ex(var, val, http_post_files, override_protection ELS_CC PLS_CC); + safe_php_register_variable_ex(var, val, http_post_files, override_protection TSRMLS_CC PLS_CC); PG(register_globals) = register_globals; } @@ -113,7 +113,7 @@ zval *http_post_files=NULL; zend_bool upload_successful; zend_bool magic_quotes_gpc; - ELS_FETCH(); + TSRMLS_FETCH(); zend_hash_init(&PG(rfc1867_protected_variables), 5, NULL, NULL, 0); @@ -247,9 +247,9 @@ } s = strrchr(filenamebuf, '\\'); if (s && s > filenamebuf) { - safe_php_register_variable(lbuf, s+1, NULL, 0 ELS_CC PLS_CC); + safe_php_register_variable(lbuf, s+1, NULL, 0 TSRMLS_CC PLS_CC); } else { - safe_php_register_variable(lbuf, filenamebuf, NULL, 0 ELS_CC PLS_CC); + safe_php_register_variable(lbuf, filenamebuf, NULL, 0 TSRMLS_CC PLS_CC); } /* Add $foo[name] */ @@ -259,9 +259,9 @@ sprintf(lbuf, "%s[name]", namebuf); } if (s && s > filenamebuf) { - register_http_post_files_variable(lbuf, s+1, http_post_files, 0 ELS_CC PLS_CC); + register_http_post_files_variable(lbuf, s+1, http_post_files, 0 TSRMLS_CC PLS_CC); } else { - register_http_post_files_variable(lbuf, filenamebuf, http_post_files, 0 ELS_CC PLS_CC); + register_http_post_files_variable(lbuf, filenamebuf, http_post_files, 0 TSRMLS_CC PLS_CC); } state = 3; @@ -291,7 +291,7 @@ } else { sprintf(lbuf, "%s_type", namebuf); } - safe_php_register_variable(lbuf, s, NULL, 0 ELS_CC PLS_CC); + safe_php_register_variable(lbuf, s, NULL, 0 TSRMLS_CC PLS_CC); /* Add $foo[type] */ if (is_arr_upload) { @@ -299,7 +299,7 @@ } else { sprintf(lbuf, "%s[type]", namebuf); } - register_http_post_files_variable(lbuf, s, http_post_files, 0 ELS_CC PLS_CC); + register_http_post_files_variable(lbuf, s, http_post_files, 0 TSRMLS_CC PLS_CC); if(*s != '\0') { *(loc2 - 1) = '\n'; } @@ -324,7 +324,7 @@ /* Check to make sure we are not overwriting special file * upload variables */ - safe_php_register_variable(namebuf, ptr, array_ptr, 0 ELS_CC PLS_CC); + safe_php_register_variable(namebuf, ptr, array_ptr, 0 TSRMLS_CC PLS_CC); /* And a little kludge to pick out special MAX_FILE_SIZE */ itype = php_check_ident_type(namebuf); @@ -401,7 +401,7 @@ magic_quotes_gpc = PG(magic_quotes_gpc); PG(magic_quotes_gpc) = 0; - safe_php_register_variable(namebuf, temp_filename, NULL, 1 ELS_CC PLS_CC); + safe_php_register_variable(namebuf, temp_filename, NULL, 1 TSRMLS_CC PLS_CC); /* Add $foo[tmp_name] */ if(is_arr_upload) { sprintf(lbuf, "%s[tmp_name][%s]", abuf, arr_index); @@ -409,7 +409,7 @@ sprintf(lbuf, "%s[tmp_name]", namebuf); } add_protected_variable(lbuf PLS_CC); - register_http_post_files_variable(lbuf, temp_filename, http_post_files, 1 ELS_CC PLS_CC); + register_http_post_files_variable(lbuf, temp_filename, http_post_files, 1 TSRMLS_CC PLS_CC); PG(magic_quotes_gpc) = magic_quotes_gpc; { @@ -424,7 +424,7 @@ } else { sprintf(lbuf, "%s_size", namebuf); } - safe_php_register_variable_ex(lbuf, &file_size, NULL, 0 ELS_CC PLS_CC); + safe_php_register_variable_ex(lbuf, &file_size, NULL, 0 TSRMLS_CC PLS_CC); /* Add $foo[size] */ if(is_arr_upload) { @@ -432,7 +432,7 @@ } else { sprintf(lbuf, "%s[size]", namebuf); } - register_http_post_files_variable_ex(lbuf, &file_size, http_post_files, 0 ELS_CC PLS_CC); + register_http_post_files_variable_ex(lbuf, &file_size, http_post_files, 0 TSRMLS_CC PLS_CC); } state = 0; rem -= (loc - ptr); Index: php4/sapi/aolserver/aolserver.c diff -u php4/sapi/aolserver/aolserver.c:1.56 php4/sapi/aolserver/aolserver.c:1.57 --- php4/sapi/aolserver/aolserver.c:1.56 Mon Feb 26 01:07:31 2001 +++ php4/sapi/aolserver/aolserver.c Fri Jul 27 06:16:37 2001 @@ -22,7 +22,7 @@ * - CGI/1.1 conformance */ -/* $Id: aolserver.c,v 1.56 2001/02/26 06:07:31 andi Exp $ */ +/* $Id: aolserver.c,v 1.57 2001/07/27 10:16:37 zeev Exp $ */ /* conflict between PHP and AOLserver headers */ #define Debug php_Debug @@ -218,7 +218,7 @@ NSLS_FETCH(); php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.56 2001/02/26 06:07:31 andi Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 1.57 2001/07/27 10:16:37 zeev Exp $"); php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -305,13 +305,13 @@ */ #define ADD_STRINGX(name,buf) \ - php_register_variable(name, buf, track_vars_array ELS_CC PLS_CC) + php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC) #define ADD_STRING(name) \ ADD_STRINGX(name, buf) static void -php_ns_sapi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +php_ns_sapi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { int i; char buf[NS_BUF_SIZE + 1]; @@ -418,7 +418,7 @@ { zend_file_handle file_handle; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); file_handle.type = ZEND_HANDLE_FILENAME; @@ -427,11 +427,11 @@ file_handle.opened_path = NULL; php_ns_config(global_context, 0); - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) { return NS_ERROR; } - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); return NS_OK; @@ -617,7 +617,7 @@ sapi_module.startup(&aolserver_sapi_module); /* TSRM is used to allocate a per-thread structure */ - ns_globals_id = ts_allocate_id(sizeof(ns_globals_struct), NULL, NULL); + ts_allocate_id(&ns_globals_id, sizeof(ns_globals_struct), NULL, NULL); /* the context contains data valid for all threads */ ctx = malloc(sizeof *ctx); Index: php4/sapi/apache/mod_php4.c diff -u php4/sapi/apache/mod_php4.c:1.108 php4/sapi/apache/mod_php4.c:1.109 --- php4/sapi/apache/mod_php4.c:1.108 Tue Jul 24 16:30:37 2001 +++ php4/sapi/apache/mod_php4.c Fri Jul 27 06:16:37 2001 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: mod_php4.c,v 1.108 2001/07/24 20:30:37 zeev Exp $ */ +/* $Id: mod_php4.c,v 1.109 2001/07/27 10:16:37 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -64,7 +64,7 @@ /* {{{ Prototypes */ -int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC); +int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC TSRMLS_DC PLS_DC SLS_DC); void php_save_umask(void); void php_restore_umask(void); int sapi_apache_read_post(char *buffer, uint count_bytes SLS_DC); @@ -235,7 +235,7 @@ /* {{{ sapi_apache_register_server_variables */ -static void sapi_apache_register_server_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +static void sapi_apache_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { register int i; array_header *arr = table_elts(((request_rec *) SG(server_context))->subprocess_env); @@ -251,7 +251,7 @@ } else { val = empty_string; } - php_register_variable(elts[i].key, val, track_vars_array ELS_CC PLS_CC); + php_register_variable(elts[i].key, val, track_vars_array TSRMLS_CC PLS_CC); } /* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */ @@ -266,10 +266,10 @@ if (symbol_table && !zend_hash_exists(symbol_table, "PATH_TRANSLATED", sizeof("PATH_TRANSLATED")) && zend_hash_find(symbol_table, "SCRIPT_FILENAME", sizeof("SCRIPT_FILENAME"), (void **) &path_translated)==SUCCESS) { - php_register_variable("PATH_TRANSLATED", Z_STRVAL_PP(path_translated), track_vars_array ELS_CC PLS_CC); + php_register_variable("PATH_TRANSLATED", Z_STRVAL_PP(path_translated), track_vars_array TSRMLS_CC PLS_CC); } - php_register_variable("PHP_SELF", ((request_rec *) SG(server_context))->uri, track_vars_array ELS_CC PLS_CC); + php_register_variable("PHP_SELF", ((request_rec *) SG(server_context))->uri, track_vars_array TSRMLS_CC PLS_CC); } /* }}} */ @@ -493,7 +493,7 @@ int retval; HashTable *per_dir_conf; SLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); CLS_FETCH(); PLS_FETCH(); APLS_FETCH(); @@ -505,7 +505,7 @@ fh.opened_path = NULL; fh.free_filename = 0; fh.type = ZEND_HANDLE_FILENAME; - zend_execute_scripts(ZEND_INCLUDE CLS_CC ELS_CC, 1, &fh); + zend_execute_scripts(ZEND_INCLUDE CLS_CC TSRMLS_CC, 1, &fh); return OK; } @@ -533,7 +533,7 @@ r->content_type = php_apache_get_default_mimetype(r SLS_CC); r->allowed |= (1 << METHODS) - 1; zend_try { - zend_ini_deactivate(ELS_C); + zend_ini_deactivate(TSRMLS_C); } zend_end_try(); return DECLINED; } @@ -545,7 +545,7 @@ #if MODULE_MAGIC_NUMBER > 19961007 if ((retval = setup_client_block(r, REQUEST_CHUNKED_ERROR))) { zend_try { - zend_ini_deactivate(ELS_C); + zend_ini_deactivate(TSRMLS_C); } zend_end_try(); return retval; } @@ -555,7 +555,7 @@ #if MODULE_MAGIC_NUMBER < 19970912 if ((retval = set_last_modified(r, r->finfo.st_mtime))) { zend_try { - zend_ini_deactivate(ELS_C); + zend_ini_deactivate(TSRMLS_C); } zend_end_try(); return retval; } @@ -579,7 +579,7 @@ add_cgi_vars(r); init_request_info(SLS_C); - apache_php_module_main(r, display_source_mode CLS_CC ELS_CC PLS_CC SLS_CC); + apache_php_module_main(r, display_source_mode CLS_CC TSRMLS_CC PLS_CC SLS_CC); /* Done, restore umask, turn off timeout, close file and return */ php_restore_umask(); Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.33 php4/sapi/apache/php_apache.c:1.34 --- php4/sapi/apache/php_apache.c:1.33 Wed Jun 6 09:05:54 2001 +++ php4/sapi/apache/php_apache.c Fri Jul 27 06:16:38 2001 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.33 2001/06/06 13:05:54 rasmus Exp $ */ +/* $Id: php_apache.c,v 1.34 2001/07/27 10:16:38 zeev Exp $ */ #define NO_REGEX_EXTRA_H @@ -90,7 +90,7 @@ -static void php_apache_globals_ctor(php_apache_info_struct *apache_globals) +static void php_apache_globals_ctor(php_apache_info_struct *apache_globals TSRMLS_DC) { apache_globals->in_request = 0; } @@ -99,9 +99,9 @@ static PHP_MINIT_FUNCTION(apache) { #ifdef ZTS - php_apache_info_id = ts_allocate_id(sizeof(php_apache_info_struct), php_apache_globals_ctor, NULL); + ts_allocate_id(&php_apache_info_id, sizeof(php_apache_info_struct), php_apache_globals_ctor, NULL); #else - php_apache_globals_ctor(&php_apache_info); + php_apache_globals_ctor(&php_apache_info TSRMLS_CC); #endif REGISTER_INI_ENTRIES(); return SUCCESS; Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.28 php4/sapi/apache/sapi_apache.c:1.29 --- php4/sapi/apache/sapi_apache.c:1.28 Sun Jul 22 21:03:22 2001 +++ php4/sapi/apache/sapi_apache.c Fri Jul 27 06:16:38 2001 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.28 2001/07/23 01:03:22 sas Exp $ */ +/* $Id: sapi_apache.c,v 1.29 2001/07/27 10:16:38 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -60,12 +60,12 @@ /* {{{ apache_php_module_main */ -int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC ELS_DC PLS_DC SLS_DC) +int apache_php_module_main(request_rec *r, int display_source_mode CLS_DC TSRMLS_DC PLS_DC SLS_DC) { zend_file_handle file_handle; APLS_FETCH(); - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) { return FAILURE; } /* sending a file handle to another dll is not working @@ -88,7 +88,7 @@ file_handle.opened_path = NULL; file_handle.free_filename = 0; - (void) php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + (void) php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); } AP(in_request) = 0; Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.31 php4/sapi/apache2filter/sapi_apache2.c:1.32 --- php4/sapi/apache2filter/sapi_apache2.c:1.31 Mon Jul 23 00:50:13 2001 +++ php4/sapi/apache2filter/sapi_apache2.c Fri Jul 27 06:16:38 2001 @@ -143,7 +143,7 @@ } static void -php_apache_sapi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { php_struct *ctx = SG(server_context); apr_array_header_t *arr = apr_table_elts(ctx->f->r->subprocess_env); @@ -151,10 +151,10 @@ APR_ARRAY_FOREACH_OPEN(arr, key, val) if (!val) val = empty_string; - php_register_variable(key, val, track_vars_array ELS_CC PLS_CC); + php_register_variable(key, val, track_vars_array TSRMLS_CC PLS_CC); APR_ARRAY_FOREACH_CLOSE() - php_register_variable("PHP_SELF", ctx->f->r->uri, track_vars_array ELS_CC PLS_CC); + php_register_variable("PHP_SELF", ctx->f->r->uri, track_vars_array TSRMLS_CC PLS_CC); } static void @@ -266,7 +266,7 @@ char *content_type; const char *auth; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); PG(during_request_startup) = 0; @@ -291,7 +291,7 @@ auth = apr_table_get(f->r->headers_in, "Authorization"); php_handle_auth_data(auth SLS_CC); - php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); + php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC); } static void php_apache_request_dtor(ap_filter_t *f SLS_DC) @@ -340,7 +340,7 @@ zend_file_handle zfd; apr_bucket *eos; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); /* We want to execute only one script per request. @@ -365,7 +365,7 @@ zfd.free_filename = 0; zfd.opened_path = NULL; - php_execute_script(&zfd CLS_CC ELS_CC PLS_CC); + php_execute_script(&zfd CLS_CC TSRMLS_CC PLS_CC); } else { #define NO_DATA "The PHP Filter did not receive suitable input data" Index: php4/sapi/caudium/caudium.c diff -u php4/sapi/caudium/caudium.c:1.14 php4/sapi/caudium/caudium.c:1.15 --- php4/sapi/caudium/caudium.c:1.14 Fri Jun 8 12:31:22 2001 +++ php4/sapi/caudium/caudium.c Fri Jul 27 06:16:38 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: caudium.c,v 1.14 2001/06/08 16:31:22 neotron Exp $ */ +/* $Id: caudium.c,v 1.15 2001/07/27 10:16:38 zeev Exp $ */ #include "php.h" #ifdef HAVE_CAUDIUM @@ -442,7 +442,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.14 2001/06/08 16:31:22 neotron Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.15 2001/07/27 10:16:38 zeev Exp $"); /* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -474,55 +474,55 @@ }; -INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { char *tmp; php_register_variable("PHP_SELF", SG(request_info).request_uri, - track_vars_array ELS_CC PLS_CC); + track_vars_array TSRMLS_CC PLS_CC); php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", - track_vars_array ELS_CC PLS_CC); + track_vars_array TSRMLS_CC PLS_CC); php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, - track_vars_array ELS_CC PLS_CC); + track_vars_array TSRMLS_CC PLS_CC); php_register_variable("REQUEST_URI", SG(request_info).request_uri, - track_vars_array ELS_CC PLS_CC); + track_vars_array TSRMLS_CC PLS_CC); php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, - track_vars_array ELS_CC PLS_CC); + track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("SERVER_NAME", NULL)) != NULL) - php_register_variable("SERVER_NAME", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("SERVER_NAME", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("SERVER_PORT", NULL)) != NULL) - php_register_variable("SERVER_PORT", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("SERVER_PORT", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("SERVER_PROTOCOL", NULL)) != NULL) - php_register_variable("SERVER_PROTOCOL", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("SERVER_PROTOCOL", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("SCRIPT_NAME", NULL)) != NULL) - php_register_variable("SCRIPT_NAME", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("SCRIPT_NAME", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("SCRIPT_FILENAME", NULL)) != NULL) - php_register_variable("SCRIPT_FILENAME", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("SCRIPT_FILENAME", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("REMOTE_ADDR", NULL)) != NULL) - php_register_variable("REMOTE_ADDR", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("REMOTE_ADDR", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("REMOTE_PORT", NULL)) != NULL) - php_register_variable("REMOTE_PORT", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("REMOTE_PORT", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("DOCUMENT_ROOT", NULL)) != NULL) - php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("HTTP_CONNECTION", NULL)) != NULL) - php_register_variable("HTTP_CONNECTION", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("HTTP_CONNECTION", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("HTTP_USER_AGENT", NULL)) != NULL) - php_register_variable("HTTP_USER_AGENT", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("HTTP_USER_AGENT", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("DOCUMENT_ROOT", NULL)) != NULL) - php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("DOCUMENT_ROOT", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("QUERY_STRING", "")) != NULL) - php_register_variable("QUERY_STRING", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("QUERY_STRING", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("REMOTE_USER", NULL)) != NULL) - php_register_variable("REMOTE_USER", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("REMOTE_USER", tmp, track_vars_array TSRMLS_CC PLS_CC); if( (tmp = lookup_string_header("REMOTE_PASSWORD", NULL)) != NULL) - php_register_variable("REMOTE_PASSWORD", tmp, track_vars_array ELS_CC PLS_CC); + php_register_variable("REMOTE_PASSWORD", tmp, track_vars_array TSRMLS_CC PLS_CC); } -static void sapi_caudium_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +static void sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { - THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array ELS_CC SLS_CC PLS_CC), "register_variables"); + THREAD_SAFE_RUN(low_sapi_caudium_register_variables(track_vars_array TSRMLS_CC SLS_CC PLS_CC), "register_variables"); } /* this structure is static (as in "it does not change") */ @@ -556,7 +556,7 @@ * with a number of variables. HTTP_* variables are created for * the HTTP header data, so that a script can access these. */ -static void php_caudium_hash_environment(CLS_D ELS_DC PLS_DC SLS_DC) +static void php_caudium_hash_environment(CLS_D TSRMLS_DC PLS_DC SLS_DC) { int i; char buf[512]; @@ -615,7 +615,7 @@ SLS_FETCH(); CLS_FETCH(); PLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); GET_THIS(); THIS->filename = ureq->filename; THIS->done_cb = ureq->done_cb; @@ -700,7 +700,7 @@ file_handle.free_filename = 0; THIS->written = 0; - res = php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); + res = php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC); if(res == FAILURE) { THREAD_SAFE_RUN({ @@ -709,9 +709,9 @@ free_struct(SLS_C); }, "Negative run response"); } else { - THREAD_SAFE_RUN(php_caudium_hash_environment(CLS_C ELS_CC PLS_CC SLS_CC), + THREAD_SAFE_RUN(php_caudium_hash_environment(CLS_C TSRMLS_CC PLS_CC SLS_CC), "environment hashing"); - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); THREAD_SAFE_RUN({ push_int(THIS->written); @@ -817,7 +817,7 @@ if (!caudium_php_initialized) { caudium_php_initialized = 1; tsrm_startup(1, 1, 0, NULL); - caudium_globals_id = ts_allocate_id(sizeof(php_caudium_request), NULL, NULL); + ts_allocate_id(&caudium_globals_id, sizeof(php_caudium_request), NULL, NULL); sapi_startup(&caudium_sapi_module); sapi_module.startup(&caudium_sapi_module); zend_startup_module(&php_caudium_module); Index: php4/sapi/cgi/cgi_main.c diff -u php4/sapi/cgi/cgi_main.c:1.119 php4/sapi/cgi/cgi_main.c:1.120 --- php4/sapi/cgi/cgi_main.c:1.119 Fri Jul 27 03:37:16 2001 +++ php4/sapi/cgi/cgi_main.c Fri Jul 27 06:16:38 2001 @@ -166,15 +166,15 @@ } -static void sapi_cgi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { /* In CGI mode, we consider the environment to be a part of the server * variables */ - php_import_environment_variables(track_vars_array ELS_CC PLS_CC); + php_import_environment_variables(track_vars_array TSRMLS_CC PLS_CC); /* Build the special-case PHP_SELF variable for the CGI version */ - php_register_variable("PHP_SELF", (SG(request_info).request_uri ? SG(request_info).request_uri:""), track_vars_array ELS_CC PLS_CC); + php_register_variable("PHP_SELF", (SG(request_info).request_uri ? SG(request_info).request_uri:""), track_vars_array TSRMLS_CC PLS_CC); } @@ -347,7 +347,7 @@ static void php_register_command_line_global_vars(char **arg) { char *var, *val; - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); var = *arg; @@ -356,7 +356,7 @@ printf("No value specified for variable '%s'\n", var); } else { *val++ = '\0'; - php_register_variable(var, val, NULL ELS_CC PLS_CC); + php_register_variable(var, val, NULL TSRMLS_CC PLS_CC); } efree(*arg); } @@ -385,6 +385,7 @@ zend_executor_globals *executor_globals; php_core_globals *core_globals; sapi_globals_struct *sapi_globals; + void ***tsrm_ls; #endif @@ -483,6 +484,7 @@ executor_globals = ts_resource(executor_globals_id); core_globals = ts_resource(core_globals_id); sapi_globals = ts_resource(sapi_globals_id); + tsrm_ls = ts_resource(0); #endif zend_try { @@ -561,7 +563,7 @@ break; case 'i': /* php info & quit */ - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC)==FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) { php_module_shutdown(); return FAILURE; } @@ -608,7 +610,7 @@ case 'v': /* show php version & quit */ no_headers = 1; - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC)==FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) { php_module_shutdown(); return FAILURE; } @@ -665,7 +667,7 @@ SG(request_info).path_translated = script_file; } - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC)==FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) { php_module_shutdown(); return FAILURE; } @@ -732,11 +734,11 @@ switch (behavior) { case PHP_MODE_STANDARD: - exit_status = php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + exit_status = php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); break; case PHP_MODE_LINT: PG(during_request_startup) = 0; - exit_status = php_lint_script(&file_handle CLS_CC ELS_CC PLS_CC); + exit_status = php_lint_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); if (exit_status==SUCCESS) { zend_printf("No syntax errors detected in %s\n", file_handle.filename); } else { Index: php4/sapi/fastcgi/fastcgi.c diff -u php4/sapi/fastcgi/fastcgi.c:1.8 php4/sapi/fastcgi/fastcgi.c:1.9 --- php4/sapi/fastcgi/fastcgi.c:1.8 Sun Jul 22 22:06:16 2001 +++ php4/sapi/fastcgi/fastcgi.c Fri Jul 27 06:16:39 2001 @@ -147,7 +147,7 @@ } -static void sapi_fastcgi_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +static void sapi_fastcgi_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { char *self = getenv("REQUEST_URI"); char *ptr = strchr( self, '?' ); @@ -162,7 +162,7 @@ /* strip query string off this */ if ( ptr ) *ptr = 0; - php_register_variable( "PHP_SELF", getenv("REQUEST_URI"), track_vars_array ELS_CC PLS_CC); + php_register_variable( "PHP_SELF", getenv("REQUEST_URI"), track_vars_array TSRMLS_CC PLS_CC); if ( ptr ) *ptr = '?'; } @@ -203,7 +203,7 @@ { zend_file_handle file_handle; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); file_handle.type = ZEND_HANDLE_FILENAME; @@ -211,8 +211,8 @@ file_handle.free_filename = 0; file_handle.opened_path = NULL; - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == SUCCESS) { - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == SUCCESS) { + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); } } Index: php4/sapi/isapi/php4isapi.c diff -u php4/sapi/isapi/php4isapi.c:1.71 php4/sapi/isapi/php4isapi.c:1.72 --- php4/sapi/isapi/php4isapi.c:1.71 Sat Jul 21 10:27:56 2001 +++ php4/sapi/isapi/php4isapi.c Fri Jul 27 06:16:39 2001 @@ -361,7 +361,7 @@ #ifdef WITH_ZEUS -static void sapi_isapi_register_zeus_ssl_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array ELS_DC PLS_DC) +static void sapi_isapi_register_zeus_ssl_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array TSRMLS_DC PLS_DC) { char static_variable_buf[ISAPI_SERVER_VAR_BUF_SIZE]; DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE; @@ -379,7 +379,7 @@ if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_ST", static_variable_buf, &variable_len ) && static_variable_buf[0] ) { strcat( static_cons_buf, static_variable_buf ); } - php_register_variable( "SSL_CLIENT_DN", static_cons_buf, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "SSL_CLIENT_DN", static_cons_buf, track_vars_array TSRMLS_CC PLS_CC ); strcpy( static_cons_buf, "/C=" ); variable_len = ISAPI_SERVER_VAR_BUF_SIZE; @@ -391,10 +391,10 @@ if( lpECB->GetServerVariable( lpECB->ConnID, "SSL_CLIENT_I_ST", static_variable_buf, &variable_len ) && static_variable_buf[0] ) { strcat( static_cons_buf, static_variable_buf ); } - php_register_variable( "SSL_CLIENT_I_DN", static_cons_buf, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "SSL_CLIENT_I_DN", static_cons_buf, track_vars_array TSRMLS_CC PLS_CC ); } -static void sapi_isapi_register_zeus_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array ELS_DC PLS_DC) +static void sapi_isapi_register_zeus_variables(LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array TSRMLS_DC PLS_DC) { char static_variable_buf[ISAPI_SERVER_VAR_BUF_SIZE]; DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE; @@ -413,11 +413,11 @@ if ( lpECB->GetServerVariable(lpECB->ConnID, "PATH_INFO", static_variable_buf, &variable_len) && static_variable_buf[0] ) { /* PHP_SELF is just PATH_INFO */ - php_register_variable( "PHP_SELF", static_variable_buf, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "PHP_SELF", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC ); /* Chop off filename to get just the 'real' PATH_INFO' */ pathinfo_len = variable_len - scriptname_len; - php_register_variable( "PATH_INFO", static_variable_buf + scriptname_len - 1, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "PATH_INFO", static_variable_buf + scriptname_len - 1, track_vars_array TSRMLS_CC PLS_CC ); /* append query string to give url... extra byte for '?' */ if ( strlen(lpECB->lpszQueryString) + variable_len + 1 < ISAPI_SERVER_VAR_BUF_SIZE ) { /* append query string only if it is present... */ @@ -425,8 +425,8 @@ static_variable_buf[ variable_len - 1 ] = '?'; strcpy( static_variable_buf + variable_len, lpECB->lpszQueryString ); } - php_register_variable( "URL", static_variable_buf, track_vars_array ELS_CC PLS_CC ); - php_register_variable( "REQUEST_URI", static_variable_buf, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "URL", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC ); + php_register_variable( "REQUEST_URI", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC ); } } @@ -434,38 +434,38 @@ variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if ( lpECB->GetServerVariable(lpECB->ConnID, "PATH_TRANSLATED", static_variable_buf, &variable_len) && static_variable_buf[0] ) { static_variable_buf[ variable_len - pathinfo_len - 1 ] = '\0'; - php_register_variable( "PATH_TRANSLATED", static_variable_buf, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "PATH_TRANSLATED", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC ); } /* Bring in the AUTHENTICATION stuff as needed */ variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if ( lpECB->GetServerVariable(lpECB->ConnID, "AUTH_USER", static_variable_buf, &variable_len) && static_variable_buf[0] ) { - php_register_variable( "PHP_AUTH_USER", static_variable_buf, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "PHP_AUTH_USER", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC ); } variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if ( lpECB->GetServerVariable(lpECB->ConnID, "AUTH_PASSWORD", static_variable_buf, &variable_len) && static_variable_buf[0] ) { - php_register_variable( "PHP_AUTH_PW", static_variable_buf, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "PHP_AUTH_PW", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC ); } variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if ( lpECB->GetServerVariable(lpECB->ConnID, "AUTH_TYPE", static_variable_buf, &variable_len) && static_variable_buf[0] ) { - php_register_variable( "PHP_AUTH_TYPE", static_variable_buf, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "PHP_AUTH_TYPE", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC ); } /* And now, for the SSL variables (if applicable) */ variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if ( lpECB->GetServerVariable(lpECB->ConnID, "CERT_COOKIE", static_variable_buf, &variable_len) && static_variable_buf[0] ) { - sapi_isapi_register_zeus_ssl_variables( lpECB, track_vars_array ELS_CC PLS_CC ); + sapi_isapi_register_zeus_ssl_variables( lpECB, track_vars_array TSRMLS_CC PLS_CC ); } /* Copy some of the variables we need to meet Apache specs */ variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if ( lpECB->GetServerVariable(lpECB->ConnID, "SERVER_SOFTWARE", static_variable_buf, &variable_len) && static_variable_buf[0] ) { - php_register_variable( "SERVER_SIGNATURE", static_variable_buf, track_vars_array ELS_CC PLS_CC ); + php_register_variable( "SERVER_SIGNATURE", static_variable_buf, track_vars_array TSRMLS_CC PLS_CC ); } } #endif -static void sapi_isapi_register_server_variables2(char **server_variables, LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array, char **recorded_values ELS_DC PLS_DC) +static void sapi_isapi_register_server_variables2(char **server_variables, LPEXTENSION_CONTROL_BLOCK lpECB, zval *track_vars_array, char **recorded_values TSRMLS_DC PLS_DC) { char **p=server_variables; DWORD variable_len; @@ -476,7 +476,7 @@ variable_len = ISAPI_SERVER_VAR_BUF_SIZE; if (lpECB->GetServerVariable(lpECB->ConnID, *p, static_variable_buf, &variable_len) && static_variable_buf[0]) { - php_register_variable(*p, static_variable_buf, track_vars_array ELS_CC PLS_CC); + php_register_variable(*p, static_variable_buf, track_vars_array TSRMLS_CC PLS_CC); if (recorded_values) { recorded_values[p-server_variables] = estrndup(static_variable_buf, variable_len); } @@ -484,7 +484,7 @@ variable_buf = (char *) emalloc(variable_len); if (lpECB->GetServerVariable(lpECB->ConnID, *p, variable_buf, &variable_len) && variable_buf[0]) { - php_register_variable(*p, variable_buf, track_vars_array ELS_CC PLS_CC); + php_register_variable(*p, variable_buf, track_vars_array TSRMLS_CC PLS_CC); } if (recorded_values) { recorded_values[p-server_variables] = variable_buf; @@ -497,7 +497,7 @@ } -static void sapi_isapi_register_server_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +static void sapi_isapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { DWORD variable_len = ISAPI_SERVER_VAR_BUF_SIZE; char *variable; @@ -509,18 +509,18 @@ /* Register the special ISAPI variables */ memset(isapi_special_server_variables, 0, sizeof(isapi_special_server_variables)); - sapi_isapi_register_server_variables2(isapi_special_server_variable_names, lpECB, track_vars_array, isapi_special_server_variables ELS_CC PLS_CC); + sapi_isapi_register_server_variables2(isapi_special_server_variable_names, lpECB, track_vars_array, isapi_special_server_variables TSRMLS_CC PLS_CC); if (SG(request_info).cookie_data) { - php_register_variable("HTTP_COOKIE", SG(request_info).cookie_data, track_vars_array ELS_CC PLS_CC); + php_register_variable("HTTP_COOKIE", SG(request_info).cookie_data, track_vars_array TSRMLS_CC PLS_CC); } /* Register the standard ISAPI variables */ - sapi_isapi_register_server_variables2(isapi_server_variable_names, lpECB, track_vars_array, NULL ELS_CC PLS_CC); + sapi_isapi_register_server_variables2(isapi_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC PLS_CC); if (isapi_special_server_variables[SPECIAL_VAR_HTTPS] && atoi(isapi_special_server_variables[SPECIAL_VAR_HTTPS])) { /* Register SSL ISAPI variables */ - sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB, track_vars_array, NULL ELS_CC PLS_CC); + sapi_isapi_register_server_variables2(isapi_secure_server_variable_names, lpECB, track_vars_array, NULL TSRMLS_CC PLS_CC); } if (isapi_special_server_variables[SPECIAL_VAR_HTTPS]) { @@ -529,12 +529,12 @@ #ifdef WITH_ZEUS - sapi_isapi_register_zeus_variables(lpECB, track_vars_array ELS_CC PLS_CC); + sapi_isapi_register_zeus_variables(lpECB, track_vars_array TSRMLS_CC PLS_CC); #endif /* PHP_SELF support */ if (isapi_special_server_variables[SPECIAL_VAR_PHP_SELF]) { - php_register_variable("PHP_SELF", isapi_special_server_variables[SPECIAL_VAR_PHP_SELF], track_vars_array ELS_CC PLS_CC); + php_register_variable("PHP_SELF", isapi_special_server_variables[SPECIAL_VAR_PHP_SELF], track_vars_array TSRMLS_CC PLS_CC); efree(isapi_special_server_variables[SPECIAL_VAR_PHP_SELF]); } @@ -551,7 +551,7 @@ value++; } *colon = 0; - php_register_variable(variable, value, track_vars_array ELS_CC PLS_CC); + php_register_variable(variable, value, track_vars_array TSRMLS_CC PLS_CC); *colon = ':'; } variable = php_strtok_r(NULL, "\r\n", &strtok_buf); @@ -570,7 +570,7 @@ if (humi.lpszPath[path_len-2] == '\\') { humi.lpszPath[path_len-2] = 0; } - php_register_variable("DOCUMENT_ROOT", humi.lpszPath, track_vars_array ELS_CC PLS_CC); + php_register_variable("DOCUMENT_ROOT", humi.lpszPath, track_vars_array TSRMLS_CC PLS_CC); } } #endif @@ -720,7 +720,7 @@ zend_bool stack_overflown=0; SLS_FETCH(); CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); #ifdef PHP_ENABLE_SEH LPEXCEPTION_POINTERS e; @@ -757,8 +757,8 @@ file_handle.type = ZEND_HANDLE_FILENAME; file_handle.opened_path = NULL; - php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); if (SG(request_info).cookie_data) { efree(SG(request_info).cookie_data); } Index: php4/sapi/nsapi/nsapi.c diff -u php4/sapi/nsapi/nsapi.c:1.17 php4/sapi/nsapi/nsapi.c:1.18 --- php4/sapi/nsapi/nsapi.c:1.17 Fri Mar 2 10:25:51 2001 +++ php4/sapi/nsapi/nsapi.c Fri Jul 27 06:16:39 2001 @@ -278,7 +278,7 @@ } static void -sapi_nsapi_register_server_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { nsapi_request_context *rc = (nsapi_request_context *)SG(server_context); size_t i; @@ -288,48 +288,48 @@ for (i = 0; i < nsapi_reqpb_size; i++) { value = pblock_findval(nsapi_reqpb[i].nsapi_eq, rc->rq->reqpb); if (value) { - php_register_variable( (char *)nsapi_reqpb[i].env_var, value, track_vars_array ELS_CC PLS_CC ); + php_register_variable( (char *)nsapi_reqpb[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC ); } } for (i = 0; i < nsapi_headers_size; i++) { value = pblock_findval(nsapi_headers[i].nsapi_eq, rc->rq->headers); if (value) { - php_register_variable( (char *)nsapi_headers[i].env_var, value, track_vars_array ELS_CC PLS_CC ); + php_register_variable( (char *)nsapi_headers[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC ); } } for (i = 0; i < nsapi_vars_size; i++) { value = pblock_findval(nsapi_vars[i].nsapi_eq, rc->rq->vars); if (value) { - php_register_variable( (char *)nsapi_vars[i].env_var, value, track_vars_array ELS_CC PLS_CC ); + php_register_variable( (char *)nsapi_vars[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC ); } } for (i = 0; i < nsapi_client_size; i++) { value = pblock_findval(nsapi_client[i].nsapi_eq, rc->sn->client); if (value) { - php_register_variable( (char *)nsapi_client[i].env_var, value, track_vars_array ELS_CC PLS_CC ); + php_register_variable( (char *)nsapi_client[i].env_var, value, track_vars_array TSRMLS_CC PLS_CC ); } } value = session_dns(rc->sn); if (value) { - php_register_variable("REMOTE_HOST", value, track_vars_array ELS_CC PLS_CC ); + php_register_variable("REMOTE_HOST", value, track_vars_array TSRMLS_CC PLS_CC ); } sprintf(buf, "%d", conf_getglobals()->Vport); - php_register_variable("SERVER_PORT", buf, track_vars_array ELS_CC PLS_CC ); - php_register_variable("SERVER_NAME", util_hostname(), track_vars_array ELS_CC PLS_CC ); - php_register_variable("SERVER_URL", http_uri2url("", ""), track_vars_array ELS_CC PLS_CC ); - php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array ELS_CC PLS_CC ); -/* php_register_variable("SERVER_SOFTWARE", MAGNUS_VERSION_STRING, track_vars_array ELS_CC PLS_CC ); */ + php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC PLS_CC ); + php_register_variable("SERVER_NAME", util_hostname(), track_vars_array TSRMLS_CC PLS_CC ); + php_register_variable("SERVER_URL", http_uri2url("", ""), track_vars_array TSRMLS_CC PLS_CC ); + php_register_variable("HTTPS", (security_active ? "ON" : "OFF"), track_vars_array TSRMLS_CC PLS_CC ); +/* php_register_variable("SERVER_SOFTWARE", MAGNUS_VERSION_STRING, track_vars_array TSRMLS_CC PLS_CC ); */ /* * Special PHP_SELF variable. */ value = pblock_findval("uri", rc->rq->reqpb); if ( value != NULL ) { - php_register_variable("PHP_SELF", value, track_vars_array ELS_CC PLS_CC ); + php_register_variable("PHP_SELF", value, track_vars_array TSRMLS_CC PLS_CC ); } } @@ -449,10 +449,10 @@ zend_file_handle file_handle; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) { return FAILURE; } @@ -466,7 +466,7 @@ "Parsing [%s]", SG(request_info).path_translated); #endif - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); #if defined(NSAPI_DEBUG) Index: php4/sapi/phttpd/phttpd.c diff -u php4/sapi/phttpd/phttpd.c:1.25 php4/sapi/phttpd/phttpd.c:1.26 --- php4/sapi/phttpd/phttpd.c:1.25 Mon Feb 26 01:07:37 2001 +++ php4/sapi/phttpd/phttpd.c Fri Jul 27 06:16:40 2001 @@ -261,10 +261,10 @@ struct httpinfo *hip = PHG(cip)->hip; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) { return -1; } @@ -273,9 +273,9 @@ file_handle.free_filename = 0; /* - php_phttpd_hash_environment(PHLS_C CLS_CC ELS_CC PLS_CC SLS_CC); + php_phttpd_hash_environment(PHLS_C CLS_CC TSRMLS_CC PLS_CC SLS_CC); */ - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); return SG(sapi_headers).http_response_code; @@ -287,7 +287,7 @@ sapi_startup(&phttpd_sapi_module); phttpd_sapi_module.startup(&phttpd_sapi_module); - ph_globals_id = ts_allocate_id(sizeof(phttpd_globals_struct), NULL, NULL); + ts_allocate_id(&ph_globals_id, sizeof(phttpd_globals_struct), NULL, NULL); return 0; } Index: php4/sapi/pi3web/pi3web_sapi.c diff -u php4/sapi/pi3web/pi3web_sapi.c:1.22 php4/sapi/pi3web/pi3web_sapi.c:1.23 --- php4/sapi/pi3web/pi3web_sapi.c:1.22 Sat Jul 21 10:27:56 2001 +++ php4/sapi/pi3web/pi3web_sapi.c Fri Jul 27 06:16:40 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pi3web_sapi.c,v 1.22 2001/07/21 14:27:56 zeev Exp $ */ +/* $Id: pi3web_sapi.c,v 1.23 2001/07/27 10:16:40 zeev Exp $ */ #include "pi3web_sapi.h" #include "php.h" @@ -78,7 +78,7 @@ PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 align=center>\n"); PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server Information</th></tr>\n"); php_info_print_table_header(2, "Information Field", "Value"); - php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.22 2001/07/21 14:27:56 zeev Exp $"); + php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: pi3web_sapi.c,v 1.23 2001/07/27 10:16:40 zeev Exp $"); php_info_print_table_row(2, "Server Name Stamp", HTTPCore_getServerStamp()); snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled()); php_info_print_table_row(2, "Debug Enabled", variable_buf); @@ -320,7 +320,7 @@ SG(sapi_headers).http_response_code = 200; } -static void hash_pi3web_variables(ELS_D SLS_DC) +static void hash_pi3web_variables(TSRMLS_D SLS_DC) { char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE]; char *variable_buf; @@ -379,7 +379,7 @@ int iRet = PIAPI_COMPLETED; SLS_FETCH(); CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); zend_try { @@ -390,13 +390,13 @@ CG(extended_info) = 0; init_request_info(sapi_globals, lpCB); - php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); + php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC); - hash_pi3web_variables(ELS_C SLS_CC); + hash_pi3web_variables(TSRMLS_C SLS_CC); switch ( lpCB->dwBehavior ) { case PHP_MODE_STANDARD: - iRet = ( php_execute_script( &file_handle CLS_CC ELS_CC PLS_CC ) == SUCCESS ) ? + iRet = ( php_execute_script( &file_handle CLS_CC TSRMLS_CC PLS_CC ) == SUCCESS ) ? PIAPI_COMPLETED : PIAPI_ERROR; break; case PHP_MODE_HIGHLIGHT: { @@ -426,7 +426,7 @@ efree(header_line); break; case PHP_MODE_LINT: - iRet = (php_lint_script(&file_handle CLS_CC ELS_CC PLS_CC) == SUCCESS) ? + iRet = (php_lint_script(&file_handle CLS_CC TSRMLS_CC PLS_CC) == SUCCESS) ? PIAPI_COMPLETED : PIAPI_ERROR; break; default: Index: php4/sapi/roxen/roxen.c diff -u php4/sapi/roxen/roxen.c:1.41 php4/sapi/roxen/roxen.c:1.42 --- php4/sapi/roxen/roxen.c:1.41 Mon Feb 26 01:07:37 2001 +++ php4/sapi/roxen/roxen.c Fri Jul 27 06:16:40 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: roxen.c,v 1.41 2001/02/26 06:07:37 andi Exp $ */ +/* $Id: roxen.c,v 1.42 2001/07/27 10:16:40 zeev Exp $ */ #include "php.h" #ifdef HAVE_ROXEN @@ -446,7 +446,7 @@ { /* char buf[512]; */ php_info_print_table_start(); - php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.41 2001/02/26 06:07:37 andi Exp $"); + php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.42 2001/07/27 10:16:40 zeev Exp $"); /* php_info_print_table_row(2, "Build date", Ns_InfoBuildDate()); php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile()); php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog()); @@ -528,7 +528,7 @@ &pval, sizeof(zval *), NULL) static void -php_roxen_hash_environment(CLS_D ELS_DC PLS_DC SLS_DC) +php_roxen_hash_environment(CLS_D TSRMLS_DC PLS_DC SLS_DC) { int i; char buf[512]; @@ -586,7 +586,7 @@ #ifdef ZTS CLS_FETCH(); PLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); #ifdef ROXEN_USE_ZTS GET_THIS(); #endif @@ -598,14 +598,14 @@ file_handle.opened_path = NULL; THREADS_ALLOW(); - res = php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC); + res = php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC); THREADS_DISALLOW(); if(res == FAILURE) { return 0; } - php_roxen_hash_environment(CLS_C ELS_CC PLS_CC SLS_CC); + php_roxen_hash_environment(CLS_C TSRMLS_CC PLS_CC SLS_CC); THREADS_ALLOW(); - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); THREADS_DISALLOW(); return 1; @@ -705,7 +705,7 @@ #ifdef ZTS tsrm_startup(1, 1, 0, NULL); #ifdef ROXEN_USE_ZTS - roxen_globals_id = ts_allocate_id(sizeof(php_roxen_request), NULL, NULL); + ts_allocate_id(&roxen_globals_id, sizeof(php_roxen_request), NULL, NULL); #endif #endif sapi_startup(&roxen_sapi_module); Index: php4/sapi/servlet/servlet.c diff -u php4/sapi/servlet/servlet.c:1.49 php4/sapi/servlet/servlet.c:1.50 --- php4/sapi/servlet/servlet.c:1.49 Tue Jul 24 16:30:37 2001 +++ php4/sapi/servlet/servlet.c Fri Jul 27 06:16:40 2001 @@ -290,7 +290,7 @@ pval *pzval; jlong addr = 0; const char *nameAsUTF = (*jenv)->GetStringUTFChars(jenv, name, 0); - ELS_FETCH(); + TSRMLS_FETCH(); MAKE_STD_ZVAL(pzval); addr = (jlong)(long) pzval; @@ -321,7 +321,7 @@ SLS_FETCH(); PLS_FETCH(); CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); zend_try { SG(server_context) = emalloc(sizeof(servlet_request)); @@ -342,7 +342,7 @@ SG(sapi_headers).http_response_code = 200; SG(request_info).content_length = contentLength; SG(request_info).auth_password = NULL; - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC)==FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC)==FAILURE) { ThrowServletException(jenv,"request startup failure"); return; } @@ -385,7 +385,7 @@ zend_highlight(&syntax_highlighter_ini); } } else { - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_header(); /* Make sure headers have been sent */ } Index: php4/sapi/thttpd/thttpd.c diff -u php4/sapi/thttpd/thttpd.c:1.46 php4/sapi/thttpd/thttpd.c:1.47 --- php4/sapi/thttpd/thttpd.c:1.46 Thu Jul 26 14:10:38 2001 +++ php4/sapi/thttpd/thttpd.c Fri Jul 27 06:16:41 2001 @@ -171,20 +171,20 @@ #define BUF_SIZE 512 #define ADD_STRING(name) \ - php_register_variable(name, buf, track_vars_array ELS_CC PLS_CC) + php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC) -static void sapi_thttpd_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +static void sapi_thttpd_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { char buf[BUF_SIZE + 1]; char *p; TLS_FETCH(); - php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC); - php_register_variable("SERVER_SOFTWARE", SERVER_SOFTWARE, track_vars_array ELS_CC PLS_CC); - php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array ELS_CC PLS_CC); - php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array ELS_CC PLS_CC); - php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC); - php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array ELS_CC PLS_CC); + php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("SERVER_SOFTWARE", SERVER_SOFTWARE, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_CC PLS_CC); p = inet_ntoa(TG(hc)->client_addr.sa_in.sin_addr); /* string representation of IPs are never larger than 512 bytes */ @@ -205,7 +205,7 @@ #define CONDADD(name, field) \ if (TG(hc)->field[0]) { \ - php_register_variable(#name, TG(hc)->field, track_vars_array ELS_CC PLS_CC); \ + php_register_variable(#name, TG(hc)->field, track_vars_array TSRMLS_CC PLS_CC); \ } CONDADD(HTTP_REFERER, referer); @@ -223,7 +223,7 @@ } if (TG(hc)->authorization[0]) - php_register_variable("AUTH_TYPE", "Basic", track_vars_array ELS_CC PLS_CC); + php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_CC PLS_CC); } static sapi_module_struct thttpd_sapi_module = { @@ -262,7 +262,7 @@ { zend_file_handle file_handle; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); file_handle.type = ZEND_HANDLE_FILENAME; @@ -270,11 +270,11 @@ file_handle.free_filename = 0; file_handle.opened_path = NULL; - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) { return; } - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); } @@ -554,7 +554,7 @@ { #ifdef ZTS tsrm_startup(1, 1, 0, NULL); - thttpd_globals_id = ts_allocate_id(sizeof(php_thttpd_globals), NULL, NULL); + ts_allocate_id(&thttpd_globals_id, sizeof(php_thttpd_globals), NULL, NULL); qr_lock = tsrm_mutex_alloc(); thttpd_register_on_close(remove_dead_conn); #endif Index: php4/sapi/tux/php_tux.c diff -u php4/sapi/tux/php_tux.c:1.2 php4/sapi/tux/php_tux.c:1.3 --- php4/sapi/tux/php_tux.c:1.2 Wed Jun 6 09:05:54 2001 +++ php4/sapi/tux/php_tux.c Fri Jul 27 06:16:41 2001 @@ -181,9 +181,9 @@ #define BUF_SIZE 512 #define ADD_STRING(name) \ - php_register_variable(name, buf, track_vars_array ELS_CC PLS_CC) + php_register_variable(name, buf, track_vars_array TSRMLS_CC PLS_CC) -static void sapi_tux_register_variables(zval *track_vars_array ELS_DC SLS_DC PLS_DC) +static void sapi_tux_register_variables(zval *track_vars_array TSRMLS_DC SLS_DC PLS_DC) { char buf[BUF_SIZE + 1]; char *p; @@ -192,14 +192,14 @@ sprintf(buf, "Server: %s", TUXAPI_version); sapi_add_header_ex(buf, strlen(buf), 1, 0); - php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC); - php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array ELS_CC PLS_CC); - php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array ELS_CC PLS_CC); - php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array ELS_CC PLS_CC); - php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array ELS_CC PLS_CC); - php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array ELS_CC PLS_CC); - php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array ELS_CC PLS_CC); - php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array ELS_CC PLS_CC); + php_register_variable("PHP_SELF", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("SERVER_SOFTWARE", TUXAPI_version, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("GATEWAY_INTERFACE", "CGI/1.1", track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("REQUEST_METHOD", (char *) SG(request_info).request_method, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("DOCUMENT_ROOT", TUXAPI_docroot, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("SERVER_NAME", TUXAPI_servername, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("REQUEST_URI", SG(request_info).request_uri, track_vars_array TSRMLS_CC PLS_CC); + php_register_variable("PATH_TRANSLATED", SG(request_info).path_translated, track_vars_array TSRMLS_CC PLS_CC); p = inet_ntoa(TG(req)->client_host); /* string representation of IPs are never larger than 512 bytes */ @@ -222,7 +222,7 @@ #define CONDADD(name, field) \ if (TG(req)->field[0]) { \ - php_register_variable(#name, TG(req)->field, track_vars_array ELS_CC PLS_C); \ + php_register_variable(#name, TG(req)->field, track_vars_array TSRMLS_CC PLS_C); \ } CONDADD(HTTP_REFERER, referer); @@ -242,7 +242,7 @@ #if 0 if (TG(hc)->authorization[0]) - php_register_variable("AUTH_TYPE", "Basic", track_vars_array ELS_CC PLS_C); + php_register_variable("AUTH_TYPE", "Basic", track_vars_array TSRMLS_CC PLS_C); #endif } @@ -282,7 +282,7 @@ { zend_file_handle file_handle; CLS_FETCH(); - ELS_FETCH(); + TSRMLS_FETCH(); PLS_FETCH(); file_handle.type = ZEND_HANDLE_FILENAME; @@ -290,11 +290,11 @@ file_handle.free_filename = 0; file_handle.opened_path = NULL; - if (php_request_startup(CLS_C ELS_CC PLS_CC SLS_CC) == FAILURE) { + if (php_request_startup(CLS_C TSRMLS_CC PLS_CC SLS_CC) == FAILURE) { return; } - php_execute_script(&file_handle CLS_CC ELS_CC PLS_CC); + php_execute_script(&file_handle CLS_CC TSRMLS_CC PLS_CC); php_request_shutdown(NULL); }