cvs: php4 /ext/com COM.c VARIANT.c conversion.c /ext/ftp php_ftp.c /ext/interbase interbase.c /ext/mailparse mailparse.c /ext/mssql php_mssql.c
/ext/muscat muscat.c /ext/oci8 oci8.c /ext/odbc php_odbc.c /ext/openssl openssl.c /ext/oracle oracle.c /ext/recode recode.c /ext/standard
array.c basic_functions.c file.c formatted_print.c php_array.h var.c /ext/wddx wddx.c /ext/xml xml.c /sapi/apache sapi_apache.c
| From: | Zeev Suraski | Date: | Mon, 30 Jul 2001 04:58:08 +0000 |
| Subject: | cvs: php4 /ext/com COM.c VARIANT.c conversion.c /ext/ftp php_ftp.c /ext/interbase interbase.c /ext/mailparse mailparse.c /ext/mssql php_mssql.c /ext/muscat muscat.c /ext/oci8 oci8.c /ext/odbc php_odbc.c /ext/openssl openssl.c /ext/oracle oracle.c /ext/recode recode.c /ext/standard array.c basic_functions.c file.c formatted_print.c php_array.h var.c /ext/wddx wddx.c /ext/xml xml.c /sapi/apache sapi_apache.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6399@lists.php.net to get a copy of this message | ||
zeev Mon Jul 30 00:58:08 2001 EDT
Modified files:
/php4/ext/com COM.c VARIANT.c conversion.c
/php4/ext/ftp php_ftp.c
/php4/ext/interbase interbase.c
/php4/ext/mailparse mailparse.c
/php4/ext/mssql php_mssql.c
/php4/ext/muscat muscat.c
/php4/ext/oci8 oci8.c
/php4/ext/odbc php_odbc.c
/php4/ext/openssl openssl.c
/php4/ext/oracle oracle.c
/php4/ext/recode recode.c
/php4/ext/standard array.c basic_functions.c file.c
formatted_print.c php_array.h var.c
/php4/ext/wddx wddx.c
/php4/ext/xml xml.c
/php4/sapi/apache sapi_apache.c
Log:
More TSRMLS_FETCH annihilation (Zend compatibility patch)
Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.34 php4/ext/com/COM.c:1.35 --- php4/ext/com/COM.c:1.34 Sun Jul 29 21:56:21 2001 +++ php4/ext/com/COM.c Mon Jul 30 00:57:55 2001 @@ -1150,6 +1150,7 @@ int type; comval *obj, *obj_prop; VARIANT *var_result; + TSRMLS_FETCH(); INIT_ZVAL(return_value); ZVAL_NULL(&return_value); @@ -1243,7 +1244,7 @@ comval *obj; int type; VARIANT var_result; - + TSRMLS_FETCH(); /* fetch the IDispatch interface */ zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle); @@ -1632,7 +1633,7 @@ { /* Oops, it already exists. No problem if it is defined as the same value */ /* Check to see if they are the same */ - if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose")) + if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose")) { php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name); } Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.17 php4/ext/com/VARIANT.c:1.18 --- php4/ext/com/VARIANT.c:1.17 Sun Jul 29 21:56:21 2001 +++ php4/ext/com/VARIANT.c Mon Jul 30 00:57:56 2001 @@ -179,6 +179,7 @@ { zend_overloaded_element *overloaded_property; int type; + TSRMLS_FETCH(); pval result, **var_handle, *object = property_reference->object; VARIANT *var_arg; @@ -231,6 +232,7 @@ { zend_overloaded_element *overloaded_property; int type; + TSRMLS_FETCH(); pval **var_handle, *object = property_reference->object; VARIANT *var_arg; Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.27 php4/ext/com/conversion.c:1.28 --- php4/ext/com/conversion.c:1.27 Sun Jul 29 04:35:40 2001 +++ php4/ext/com/conversion.c Mon Jul 30 00:57:56 2001 @@ -37,17 +37,17 @@ /* prototypes */ -PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage); -PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage); +PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC); +PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC); PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, int codepage); PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage); PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int persistent, int codepage); -static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage); -static void comval_to_variant(pval *pval_arg, VARIANT *var_arg); +static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC); +static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC); /* implementations */ -PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage) +PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC) { int type = VT_EMPTY; /* default variant type */ @@ -100,15 +100,15 @@ type |= VT_BYREF; } - pval_to_variant_ex(pval_arg, var_arg, type, codepage); + pval_to_variant_ex(pval_arg, var_arg, type, codepage TSRMLS_CC); } -PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage) +PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC) { - pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage); + pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC); } -static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage) +static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC) { OLECHAR *unicode_str; @@ -162,11 +162,11 @@ { if(type) /* explicit type */ { - pval_to_variant_ex(*entry, v, type, codepage); /* Do the required conversion */ + pval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC); /* Do the required conversion */ } else { - php_pval_to_variant(*entry, v, codepage); /* Do the required conversion */ + php_pval_to_variant(*entry, v, codepage TSRMLS_CC); /* Do the required conversion */ } } else @@ -267,7 +267,7 @@ break; case VT_UNKNOWN: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -280,7 +280,7 @@ break; case VT_DISPATCH: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -355,7 +355,7 @@ break; case VT_UNKNOWN|VT_BYREF: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -368,7 +368,7 @@ break; case VT_DISPATCH|VT_BYREF: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -893,7 +893,7 @@ return C_str; } -static void comval_to_variant(pval *pval_arg, VARIANT *var_arg) +static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC) { pval **comval_handle; comval *obj; Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.35 php4/ext/ftp/php_ftp.c:1.36 --- php4/ext/ftp/php_ftp.c:1.35 Tue Jul 17 01:53:03 2001 +++ php4/ext/ftp/php_ftp.c Mon Jul 30 00:57:56 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.35 2001/07/17 05:53:03 jason Exp $ */ +/* $Id: php_ftp.c,v 1.36 2001/07/30 04:57:56 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -634,7 +634,7 @@ FTPBUF(ftp, arg1); convert_to_string(arg2); - rsrc = zend_fetch_resource(&arg3,-1,"File-Handle",&type,3,php_file_le_fopen(),php_file_le_popen(),php_file_le_socket()); + rsrc = zend_fetch_resource(&arg3 TSRMLS_CC,-1,"File-Handle",&type,3,php_file_le_fopen(),php_file_le_popen(),php_file_le_socket()); ZEND_VERIFY_RESOURCE(rsrc); XTYPE(xtype, arg4); Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.60 php4/ext/interbase/interbase.c:1.61 --- php4/ext/interbase/interbase.c:1.60 Sun Jul 29 21:56:28 2001 +++ php4/ext/interbase/interbase.c Mon Jul 30 00:57:57 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.60 2001/07/30 01:56:28 zeev Exp $ */ +/* $Id: interbase.c,v 1.61 2001/07/30 04:57:57 zeev Exp $ */ /* TODO: Arrays, roles? @@ -455,7 +455,7 @@ ibase_db_link *ib_link; TSRMLS_FETCH(); - ib_link = (ibase_db_link *) zend_fetch_resource(NULL, ib_trans->link_rsrc, "InterBase link", NULL, 2, le_link, le_plink); + ib_link = (ibase_db_link *) zend_fetch_resource(NULL TSRMLS_CC, ib_trans->link_rsrc, "InterBase link", NULL, 2, le_link, le_plink); if (ib_link) { if (ib_link->trans[ib_trans->trans_num] != NULL) { @@ -583,7 +583,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.60 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.61 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif @@ -2833,7 +2833,7 @@ RETURN_FALSE; } - what = zend_fetch_resource(file_arg, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream()); + what = zend_fetch_resource(file_arg TSRMLS_CC, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream()); ZEND_VERIFY_RESOURCE(what); if (type == php_file_le_fopen()) Index: php4/ext/mailparse/mailparse.c diff -u php4/ext/mailparse/mailparse.c:1.6 php4/ext/mailparse/mailparse.c:1.7 --- php4/ext/mailparse/mailparse.c:1.6 Fri Jul 27 06:16:22 2001 +++ php4/ext/mailparse/mailparse.c Mon Jul 30 00:57:58 2001 @@ -18,7 +18,7 @@ | the support routines for this extension were based upon. | +----------------------------------------------------------------------+ */ -/* $Id: mailparse.c,v 1.6 2001/07/27 10:16:22 zeev Exp $ */ +/* $Id: mailparse.c,v 1.7 2001/07/30 04:57:58 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -204,7 +204,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(file, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream()); + what = zend_fetch_resource(file TSRMLS_CC, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream()); ZEND_VERIFY_RESOURCE(what); #if HAVE_PHP_STREAM Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.58 php4/ext/mssql/php_mssql.c:1.59 --- php4/ext/mssql/php_mssql.c:1.58 Sun Jul 29 21:56:29 2001 +++ php4/ext/mssql/php_mssql.c Mon Jul 30 00:57:58 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.58 2001/07/30 01:56:29 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.59 2001/07/30 04:57:58 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -256,7 +256,7 @@ { mssql_statement *statement; - statement = (mssql_statement *) zend_fetch_resource(stmt, -1, "MS SQL-Statement", NULL, 1, le_statement); + statement = (mssql_statement *) zend_fetch_resource(stmt TSRMLS_CC, -1, "MS SQL-Statement", NULL, 1, le_statement); if (statement) { return statement; Index: php4/ext/muscat/muscat.c diff -u php4/ext/muscat/muscat.c:1.5 php4/ext/muscat/muscat.c:1.6 --- php4/ext/muscat/muscat.c:1.5 Sat Jul 28 07:36:01 2001 +++ php4/ext/muscat/muscat.c Mon Jul 30 00:57:59 2001 @@ -229,7 +229,7 @@ zval_copy_ctor(handle->handles.muscatnet_handle.socketr); // but for our convenience extract the FD - what=zend_fetch_resource(socket_arg,-1,"Socket-Handle",NULL,1,php_file_le_socket()); + what=zend_fetch_resource(socket_arg TSRMLS_CC,-1,"Socket-Handle",NULL,1,php_file_le_socket()); ZEND_VERIFY_RESOURCE(what); handle->handles.muscatnet_handle.socketd=*(int*)what; php_set_sock_blocking(handle->handles.muscatnet_handle.socketd,1); @@ -254,7 +254,7 @@ *handle->handles.muscatnet_handle.socketr=*return_value; zval_copy_ctor(handle->handles.muscatnet_handle.socketr); // but for our convenience extract the FD - what=zend_fetch_resource(&return_value,-1,"File-Handle",NULL,1,php_file_le_socket); + what=zend_fetch_resource(&return_value TSRMLS_CC,-1,"File-Handle",NULL,1,php_file_le_socket); ZEND_VERIFY_RESOURCE(what); handle->handles.muscatnet_handle.socketd=*(int*)what; _discard(handle); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.139 php4/ext/oci8/oci8.c:1.140 --- php4/ext/oci8/oci8.c:1.139 Sun Jul 29 21:56:32 2001 +++ php4/ext/oci8/oci8.c Mon Jul 30 00:57:59 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.139 2001/07/30 01:56:32 zeev Exp $ */ +/* $Id: oci8.c,v 1.140 2001/07/30 04:57:59 zeev Exp $ */ /* TODO list: * @@ -579,7 +579,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.139 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.140 $"); #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 ); @@ -965,7 +965,7 @@ { oci_connection *connection; - connection = (oci_connection *) zend_fetch_resource(conn, -1, "OCI8-Connection", NULL, 1, le_conn); + connection = (oci_connection *) zend_fetch_resource(conn TSRMLS_CC, -1, "OCI8-Connection", NULL, 1, le_conn); if (connection && connection->is_open) { return connection; @@ -981,7 +981,7 @@ { oci_statement *statement; - statement = (oci_statement *) zend_fetch_resource(stmt, -1, "OCI8-Statement", NULL, 1, le_stmt); + statement = (oci_statement *) zend_fetch_resource(stmt TSRMLS_CC, -1, "OCI8-Statement", NULL, 1, le_stmt); if (statement && statement->conn->is_open) { return statement; @@ -3988,12 +3988,12 @@ dvoid *errh = NULL; if (zend_get_parameters_ex(1, &arg) == SUCCESS) { - statement = (oci_statement *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_stmt); + statement = (oci_statement *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_stmt); if (statement) { errh = statement->pError; error = statement->error; } else { - connection = (oci_connection *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_conn); + connection = (oci_connection *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_conn); if (connection) { errh = connection->pError; error = connection->error; Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.97 php4/ext/odbc/php_odbc.c:1.98 --- php4/ext/odbc/php_odbc.c:1.97 Sat Jul 28 15:29:16 2001 +++ php4/ext/odbc/php_odbc.c Mon Jul 30 00:58:00 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.97 2001/07/28 19:29:16 andi Exp $ */ +/* $Id: php_odbc.c,v 1.98 2001/07/30 04:58:00 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2205,7 +2205,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *) zend_fetch_resource(pv_conn, -1, "ODBC-Link", &found_resource_type, 2, le_conn, le_pconn); + conn = (odbc_connection *) zend_fetch_resource(pv_conn TSRMLS_CC, -1, "ODBC-Link", &found_resource_type, 2, le_conn, le_pconn); if (found_resource_type==le_pconn) { is_pconn = 1; } Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.19 php4/ext/openssl/openssl.c:1.20 --- php4/ext/openssl/openssl.c:1.19 Thu Jul 5 17:18:19 2001 +++ php4/ext/openssl/openssl.c Mon Jul 30 00:58:02 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.19 2001/07/05 21:18:19 wez Exp $ */ +/* $Id: openssl.c,v 1.20 2001/07/30 04:58:02 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -202,7 +202,7 @@ void * what; int type; - what = zend_fetch_resource(val, -1, "OpenSSL X.509", &type, 1, le_x509); + what = zend_fetch_resource(val TSRMLS_CC, -1, "OpenSSL X.509", &type, 1, le_x509); if (!what) return NULL; @@ -297,7 +297,7 @@ void * what; int type; - what = zend_fetch_resource(val, -1, "OpenSSL X.509/key", &type, 2, le_x509, le_key); + what = zend_fetch_resource(val TSRMLS_CC, -1, "OpenSSL X.509/key", &type, 2, le_x509, le_key); if (!what) return NULL; Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.67 php4/ext/oracle/oracle.c:1.68 --- php4/ext/oracle/oracle.c:1.67 Sun Jul 29 21:56:34 2001 +++ php4/ext/oracle/oracle.c Mon Jul 30 00:58:02 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.67 2001/07/30 01:56:34 zeev Exp $ */ +/* $Id: oracle.c,v 1.68 2001/07/30 04:58:02 zeev Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -1518,7 +1518,7 @@ } if (argc == 1) { - res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); + res = zend_fetch_resource(arg TSRMLS_CC, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); ZEND_VERIFY_RESOURCE(res); if (what == le_cursor) { @@ -1550,7 +1550,7 @@ } if (argc == 1) { - res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); + res = zend_fetch_resource(arg TSRMLS_CC, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); ZEND_VERIFY_RESOURCE(res); if (what == le_cursor) { @@ -1595,7 +1595,7 @@ oraConnection *db_conn; TSRMLS_FETCH(); - cursor = (oraCursor *) zend_fetch_resource(ind, -1, "Oracle-Cursor", NULL, 1, le_cursor); + cursor = (oraCursor *) zend_fetch_resource(ind TSRMLS_CC, -1, "Oracle-Cursor", NULL, 1, le_cursor); if (! cursor) { return NULL; } Index: php4/ext/recode/recode.c diff -u php4/ext/recode/recode.c:1.15 php4/ext/recode/recode.c:1.16 --- php4/ext/recode/recode.c:1.15 Sun Jul 29 21:56:35 2001 +++ php4/ext/recode/recode.c Mon Jul 30 00:58:04 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.15 2001/07/30 01:56:35 zeev Exp $ */ +/* $Id: recode.c,v 1.16 2001/07/30 04:58:04 zeev Exp $ */ /* {{{ includes & prototypes */ @@ -99,7 +99,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.15 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.16 $"); php_info_print_table_end(); } @@ -172,14 +172,14 @@ WRONG_PARAM_COUNT; } - in_fp = zend_fetch_resource(input,-1, "File-Handle", &in_type, + in_fp = zend_fetch_resource(input TSRMLS_CC,-1, "File-Handle", &in_type, 2, php_file_le_fopen(), php_file_le_popen()); if (!in_fp) { php_error(E_WARNING,"Unable to find input file identifier"); RETURN_FALSE; } - out_fp = zend_fetch_resource(output,-1, "File-Handle", &out_type, + out_fp = zend_fetch_resource(output TSRMLS_CC,-1, "File-Handle", &out_type, 2, php_file_le_fopen(), php_file_le_popen()); if (!out_fp) { php_error(E_WARNING,"Unable to find output file identifier"); Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.116 php4/ext/standard/array.c:1.117 --- php4/ext/standard/array.c:1.116 Sat Jul 28 07:36:13 2001 +++ php4/ext/standard/array.c Mon Jul 30 00:58:04 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.116 2001/07/28 11:36:13 zeev Exp $ */ +/* $Id: array.c,v 1.117 2001/07/30 04:58:04 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -146,7 +146,7 @@ Z_STRLEN(second) = s->nKeyLength; } - if (ARRAYG(compare_func)(&result, &first, &second) == FAILURE) { + if (ARRAYG(compare_func)(&result, &first, &second TSRMLS_CC) == FAILURE) { return 0; } @@ -278,7 +278,7 @@ first = *((pval **) f->pData); second = *((pval **) s->pData); - if (ARRAYG(compare_func)(&result, first, second) == FAILURE) { + if (ARRAYG(compare_func)(&result, first, second TSRMLS_CC) == FAILURE) { return 0; } @@ -878,7 +878,7 @@ min = args[0]; for (i=1; i<ZEND_NUM_ARGS(); i++) { - is_smaller_function(&result, *args[i], *min); + is_smaller_function(&result, *args[i], *min TSRMLS_CC); if (Z_LVAL(result) == 1) { min = args[i]; } @@ -930,7 +930,7 @@ max = args[0]; for (i=1; i<ZEND_NUM_ARGS(); i++) { - is_smaller_or_equal_function(&result, *args[i], *max); + is_smaller_or_equal_function(&result, *args[i], *max TSRMLS_CC); if (Z_LVAL(result) == 0) { max = args[i]; } @@ -1044,7 +1044,7 @@ HashPosition pos; /* hash iterator */ ulong num_key; char *string_key; - int (*compare_func)(zval *, zval *, zval *) = is_equal_function; + int (*compare_func)(zval *, zval *, zval * TSRMLS_DC) = is_equal_function; if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 || zend_get_parameters_ex(ZEND_NUM_ARGS(), &value, &array, &strict) == FAILURE) { @@ -1065,13 +1065,13 @@ convert_to_boolean_ex(strict); if (Z_LVAL_PP(strict)) { compare_func = is_identical_function; - } + } } target_hash = HASH_OF(*array); zend_hash_internal_pointer_reset_ex(target_hash, &pos); while(zend_hash_get_current_data_ex(target_hash, (void **)&entry, &pos) == SUCCESS) { - compare_func(&res, *value, *entry); + compare_func(&res, *value, *entry TSRMLS_CC); if (Z_LVAL(res) == 1) { if (behavior==0) { RETURN_TRUE; @@ -1941,7 +1941,7 @@ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(input), &pos); while(zend_hash_get_current_data_ex(Z_ARRVAL_PP(input), (void **)&entry, &pos) == SUCCESS) { if (search_value != NULL) { - is_equal_function(&res, *search_value, *entry); + is_equal_function(&res, *search_value, *entry TSRMLS_CC); add_key = zval_is_true(&res); } @@ -2513,7 +2513,7 @@ do { set_compare_func(ARRAYG(multisort_flags)[MULTISORT_TYPE][r]); - ARRAYG(compare_func)(&temp, *((zval **)ab[r]->pData), *((zval **)bb[r]->pData)); + ARRAYG(compare_func)(&temp, *((zval **)ab[r]->pData), *((zval **)bb[r]->pData) TSRMLS_CC); result = ARRAYG(multisort_flags)[MULTISORT_ORDER][r] * Z_LVAL(temp); if (result != 0) return result; @@ -2830,7 +2830,7 @@ continue; SEPARATE_ZVAL(entry); - convert_scalar_to_number(*entry); + convert_scalar_to_number(*entry TSRMLS_CC); if (Z_TYPE_PP(entry) == IS_LONG && Z_TYPE_P(return_value) == IS_LONG) { Z_LVAL_P(return_value) += Z_LVAL_PP(entry); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.364 php4/ext/standard/basic_functions.c:1.365 --- php4/ext/standard/basic_functions.c:1.364 Sun Jul 29 21:56:37 2001 +++ php4/ext/standard/basic_functions.c Mon Jul 30 00:58:04 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.364 2001/07/30 01:56:37 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.365 2001/07/30 04:58:04 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -1863,12 +1863,13 @@ { zval *func1 = tick_fe1->arguments[0]; zval *func2 = tick_fe2->arguments[0]; + TSRMLS_FETCH(); if (Z_TYPE_P(func1) == IS_STRING && Z_TYPE_P(func2) == IS_STRING) { return (zend_binary_zval_strcmp(func1, func2) == 0); } else if (Z_TYPE_P(func1) == IS_ARRAY && Z_TYPE_P(func2) == IS_ARRAY) { zval result; - zend_compare_arrays(&result, func1, func2); + zend_compare_arrays(&result, func1, func2 TSRMLS_CC); return (Z_LVAL(result) == 0); } else return 0; @@ -1933,7 +1934,6 @@ pval **filename; zend_syntax_highlighter_ini syntax_highlighter_ini; - if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &filename)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1941,7 +1941,7 @@ php_get_highlight_struct(&syntax_highlighter_ini); - if (highlight_file(Z_STRVAL_PP(filename), &syntax_highlighter_ini)==FAILURE) { + if (highlight_file(Z_STRVAL_PP(filename), &syntax_highlighter_ini TSRMLS_CC)==FAILURE) { RETURN_FALSE; } RETURN_TRUE; @@ -1967,7 +1967,7 @@ hicompiled_string_description = zend_make_compiled_string_description("highlighted code" TSRMLS_CC); - if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description)==FAILURE) { + if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description TSRMLS_CC)==FAILURE) { efree(hicompiled_string_description); RETURN_FALSE; } Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.170 php4/ext/standard/file.c:1.171 --- php4/ext/standard/file.c:1.170 Sat Jul 28 07:36:15 2001 +++ php4/ext/standard/file.c Mon Jul 30 00:58:05 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.170 2001/07/28 11:36:15 zeev Exp $ */ +/* $Id: file.c,v 1.171 2001/07/30 04:58:05 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -243,7 +243,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); #if HAVE_PHP_STREAM @@ -705,7 +705,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 3, le_fopen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 3, le_fopen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); zend_list_delete((*arg1)->value.lval); @@ -783,7 +783,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,1,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,1,le_popen); ZEND_VERIFY_RESOURCE(what); zend_list_delete((*arg1)->value.lval); @@ -805,7 +805,7 @@ if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -877,7 +877,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 2, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 2, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); convert_to_long_ex(arg2); @@ -925,7 +925,7 @@ WRONG_PARAM_COUNT; } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(socket, -1, "File-Handle", &type, 1, le_socket); + what = zend_fetch_resource(socket TSRMLS_CC, -1, "File-Handle", &type, 1, le_socket); ZEND_VERIFY_RESOURCE(what); socketd = *(int *)what; @@ -963,7 +963,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(socket, -1, "File-Handle", &type, 1, le_socket); + what = zend_fetch_resource(socket TSRMLS_CC, -1, "File-Handle", &type, 1, le_socket); ZEND_VERIFY_RESOURCE(what); socketd = *(int *)what; sock = php_get_socket(socketd); @@ -994,7 +994,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); convert_to_long_ex(arg2); @@ -1070,7 +1070,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -1142,7 +1142,7 @@ break; } - what = zend_fetch_resource(fd, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(fd TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -1210,7 +1210,7 @@ file_handle = args[0]; format_string = args[1]; - what = zend_fetch_resource(file_handle, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(file_handle TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); /* * we can't do a ZEND_VERIFY_RESOURCE(what), otherwise we end up @@ -1294,7 +1294,7 @@ break; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); @@ -1344,7 +1344,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1,-1,"File-Handle",&type,4,le_fopen,le_popen,le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,4,le_fopen,le_popen,le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); #if HAVE_PHP_STREAM @@ -1399,7 +1399,7 @@ /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",&type,2,le_fopen,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,2,le_fopen,le_popen); ZEND_VERIFY_RESOURCE(what); convert_to_long_ex(arg2); @@ -1429,7 +1429,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen); ZEND_VERIFY_RESOURCE(what); rewind((FILE*) what); @@ -1451,7 +1451,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen); ZEND_VERIFY_RESOURCE(what); ret = ftell((FILE*) what); @@ -1478,7 +1478,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen); ZEND_VERIFY_RESOURCE(what); convert_to_long_ex(arg2); @@ -1699,7 +1699,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -1788,7 +1788,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(fp,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(fp TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) @@ -1823,7 +1823,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(fp,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(fp TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (fstat(fileno((FILE *) what ), &stat_sb)) { @@ -2003,7 +2003,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -2083,7 +2083,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(fd,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(fd TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -2252,7 +2252,7 @@ WRONG_PARAM_COUNT; } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg,-1,"select",&type,3,le_fopen,le_socket,le_popen); + what = zend_fetch_resource(arg TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen); ZEND_VERIFY_RESOURCE(what); if(type == le_socket) { fd = *(int *)what; @@ -2273,7 +2273,7 @@ FD_ZERO(&readfd); for(i = 0; i < ARG_COUNT(ht); i++) { /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(*args,-1,"select",&type,3,le_fopen,le_socket,le_popen); + what = zend_fetch_resource(*args TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen); ZEND_VERIFY_RESOURCE(what); if(type == le_socket) { fd = *(int *)what; @@ -2323,7 +2323,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(fdarg,-1,"select",&type,3,le_fopen,le_socket,le_popen); + what = zend_fetch_resource(fdarg TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen); ZEND_VERIFY_RESOURCE(what); if(type == le_socket) { Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.36 php4/ext/standard/formatted_print.c:1.37 --- php4/ext/standard/formatted_print.c:1.36 Thu Jul 19 04:12:12 2001 +++ php4/ext/standard/formatted_print.c Mon Jul 30 00:58:05 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.36 2001/07/19 08:12:12 stas Exp $ */ +/* $Id: formatted_print.c,v 1.37 2001/07/30 04:58:05 zeev Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -408,7 +408,7 @@ * */ static char * -php_formatted_print(int ht, int *len) +php_formatted_print(int ht, int *len TSRMLS_DC) { pval ***args; int argc, size = 240, inpos = 0, outpos = 0, temppos; @@ -632,7 +632,7 @@ char *result; int len; - if ((result=php_formatted_print(ht,&len))==NULL) { + if ((result=php_formatted_print(ht, &len TSRMLS_CC))==NULL) { RETURN_FALSE; } RETVAL_STRINGL(result,len,1); @@ -647,7 +647,7 @@ char *result; int len; - if ((result=php_formatted_print(ht,&len))==NULL) { + if ((result=php_formatted_print(ht, &len TSRMLS_CC))==NULL) { RETURN_FALSE; } PHPWRITE(result,len); Index: php4/ext/standard/php_array.h diff -u php4/ext/standard/php_array.h:1.26 php4/ext/standard/php_array.h:1.27 --- php4/ext/standard/php_array.h:1.26 Sat Jul 28 07:36:18 2001 +++ php4/ext/standard/php_array.h Mon Jul 30 00:58:05 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_array.h,v 1.26 2001/07/28 11:36:18 zeev Exp $ */ +/* $Id: php_array.h,v 1.27 2001/07/30 04:58:05 zeev Exp $ */ #ifndef PHP_ARRAY_H #define PHP_ARRAY_H @@ -85,7 +85,7 @@ typedef struct { int *multisort_flags[2]; - int (*compare_func)(zval *result, zval *op1, zval *op2); + int (*compare_func)(zval *result, zval *op1, zval *op2 TSRMLS_DC); } php_array_globals; #ifdef ZTS Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.99 php4/ext/standard/var.c:1.100 --- php4/ext/standard/var.c:1.99 Sun Jul 29 04:14:00 2001 +++ php4/ext/standard/var.c Mon Jul 30 00:58:05 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.99 2001/07/29 08:14:00 andi Exp $ */ +/* $Id: var.c,v 1.100 2001/07/30 04:58:05 zeev Exp $ */ /* {{{ includes @@ -98,7 +98,9 @@ break; case IS_RESOURCE: { char *type_name; - type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc)); + TSRMLS_FETCH(); + + type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc) TSRMLS_CC); php_printf("%sresource(%ld) of type (%s)\n", COMMON, Z_LVAL_PP(struc), type_name ? type_name : "Unknown"); break; } Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.73 php4/ext/wddx/wddx.c:1.74 --- php4/ext/wddx/wddx.c:1.73 Sat Jul 28 15:11:05 2001 +++ php4/ext/wddx/wddx.c Mon Jul 30 00:58:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.73 2001/07/28 19:11:05 andi Exp $ */ +/* $Id: wddx.c,v 1.74 2001/07/30 04:58:06 zeev Exp $ */ #include "php.h" #include "php_wddx.h" @@ -892,6 +892,7 @@ wddx_stack *stack = (wddx_stack *)user_data; char *decoded_value; int decoded_len; + TSRMLS_FETCH(); if (!wddx_stack_is_empty(stack)) { wddx_stack_top(stack, (void**)&ent); @@ -928,7 +929,7 @@ Z_TYPE_P(ent->data) = IS_STRING; Z_STRLEN_P(ent->data) = len; Z_STRVAL_P(ent->data) = estrndup(s, len); - convert_scalar_to_number(ent->data); + convert_scalar_to_number(ent->data TSRMLS_CC); break; case ST_BOOLEAN: @@ -996,7 +997,7 @@ int comment_len = 0; wddx_packet *packet; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|s", + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &var, &comment, &comment_len) == FAILURE) return; @@ -1094,7 +1095,7 @@ comment = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &comment, &comment_len) == FAILURE) + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &comment, &comment_len) == FAILURE) return; packet = php_wddx_constructor(); @@ -1116,7 +1117,7 @@ zval *packet_id; wddx_packet *packet = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &packet_id) == FAILURE) + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &packet_id) == FAILURE) return; ZEND_FETCH_RESOURCE(packet, wddx_packet *, &packet_id, -1, "WDDX packet ID", le_wddx); @@ -1156,7 +1157,7 @@ packet_id = args[0]; - packet = (wddx_packet *)zend_fetch_resource(packet_id, -1, "WDDX packet ID", NULL, 1, le_wddx); + packet = (wddx_packet *)zend_fetch_resource(packet_id TSRMLS_CC, -1, "WDDX packet ID", NULL, 1, le_wddx); if (!packet) { efree(args); @@ -1181,7 +1182,7 @@ char *packet; int packet_len; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &packet, &packet_len) == FAILURE) + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &packet, &packet_len) == FAILURE) return; if (packet_len == 0) Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.86 php4/ext/xml/xml.c:1.87 --- php4/ext/xml/xml.c:1.86 Sat Jul 28 14:38:36 2001 +++ php4/ext/xml/xml.c Mon Jul 30 00:58:06 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.86 2001/07/28 18:38:36 andi Exp $ */ +/* $Id: xml.c,v 1.87 2001/07/30 04:58:06 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -243,6 +243,8 @@ static zval *_xml_resource_zval(long value) { zval *ret; + TSRMLS_FETCH(); + MAKE_STD_ZVAL(ret); ret->type = IS_RESOURCE; Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.30 php4/sapi/apache/sapi_apache.c:1.31 --- php4/sapi/apache/sapi_apache.c:1.30 Sat Jul 28 07:36:30 2001 +++ php4/sapi/apache/sapi_apache.c Mon Jul 30 00:58:07 2001 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.30 2001/07/28 11:36:30 zeev Exp $ */ +/* $Id: sapi_apache.c,v 1.31 2001/07/30 04:58:07 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -76,7 +76,7 @@ zend_syntax_highlighter_ini syntax_highlighter_ini; php_get_highlight_struct(&syntax_highlighter_ini); - if (highlight_file(SG(request_info).path_translated,&syntax_highlighter_ini)){ + if (highlight_file(SG(request_info).path_translated,&syntax_highlighter_ini TSRMLS_CC)){ return OK; } else { return NOT_FOUND;
Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.34 php4/ext/com/COM.c:1.35 --- php4/ext/com/COM.c:1.34 Sun Jul 29 21:56:21 2001 +++ php4/ext/com/COM.c Mon Jul 30 00:57:55 2001 @@ -1150,6 +1150,7 @@ int type; comval *obj, *obj_prop; VARIANT *var_result; + TSRMLS_FETCH(); INIT_ZVAL(return_value); ZVAL_NULL(&return_value); @@ -1243,7 +1244,7 @@ comval *obj; int type; VARIANT var_result; - + TSRMLS_FETCH(); /* fetch the IDispatch interface */ zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle); @@ -1632,7 +1633,7 @@ { /* Oops, it already exists. No problem if it is defined as the same value */ /* Check to see if they are the same */ - if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose")) + if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose")) { php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name); } Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.17 php4/ext/com/VARIANT.c:1.18 --- php4/ext/com/VARIANT.c:1.17 Sun Jul 29 21:56:21 2001 +++ php4/ext/com/VARIANT.c Mon Jul 30 00:57:56 2001 @@ -179,6 +179,7 @@ { zend_overloaded_element *overloaded_property; int type; + TSRMLS_FETCH(); pval result, **var_handle, *object = property_reference->object; VARIANT *var_arg; @@ -231,6 +232,7 @@ { zend_overloaded_element *overloaded_property; int type; + TSRMLS_FETCH(); pval **var_handle, *object = property_reference->object; VARIANT *var_arg; Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.27 php4/ext/com/conversion.c:1.28 --- php4/ext/com/conversion.c:1.27 Sun Jul 29 04:35:40 2001 +++ php4/ext/com/conversion.c Mon Jul 30 00:57:56 2001 @@ -37,17 +37,17 @@ /* prototypes */ -PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage); -PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage); +PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC); +PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC); PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, int codepage); PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage); PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int persistent, int codepage); -static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage); -static void comval_to_variant(pval *pval_arg, VARIANT *var_arg); +static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC); +static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC); /* implementations */ -PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage) +PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC) { int type = VT_EMPTY; /* default variant type */ @@ -100,15 +100,15 @@ type |= VT_BYREF; } - pval_to_variant_ex(pval_arg, var_arg, type, codepage); + pval_to_variant_ex(pval_arg, var_arg, type, codepage TSRMLS_CC); } -PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage) +PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC) { - pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage); + pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC); } -static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage) +static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC) { OLECHAR *unicode_str; @@ -162,11 +162,11 @@ { if(type) /* explicit type */ { - pval_to_variant_ex(*entry, v, type, codepage); /* Do the required conversion */ + pval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC); /* Do the required conversion */ } else { - php_pval_to_variant(*entry, v, codepage); /* Do the required conversion */ + php_pval_to_variant(*entry, v, codepage TSRMLS_CC); /* Do the required conversion */ } } else @@ -267,7 +267,7 @@ break; case VT_UNKNOWN: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -280,7 +280,7 @@ break; case VT_DISPATCH: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -355,7 +355,7 @@ break; case VT_UNKNOWN|VT_BYREF: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -368,7 +368,7 @@ break; case VT_DISPATCH|VT_BYREF: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -893,7 +893,7 @@ return C_str; } -static void comval_to_variant(pval *pval_arg, VARIANT *var_arg) +static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC) { pval **comval_handle; comval *obj; Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.35 php4/ext/ftp/php_ftp.c:1.36 --- php4/ext/ftp/php_ftp.c:1.35 Tue Jul 17 01:53:03 2001 +++ php4/ext/ftp/php_ftp.c Mon Jul 30 00:57:56 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.35 2001/07/17 05:53:03 jason Exp $ */ +/* $Id: php_ftp.c,v 1.36 2001/07/30 04:57:56 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -634,7 +634,7 @@ FTPBUF(ftp, arg1); convert_to_string(arg2); - rsrc = zend_fetch_resource(&arg3,-1,"File-Handle",&type,3,php_file_le_fopen(),php_file_le_popen(),php_file_le_socket()); + rsrc = zend_fetch_resource(&arg3 TSRMLS_CC,-1,"File-Handle",&type,3,php_file_le_fopen(),php_file_le_popen(),php_file_le_socket()); ZEND_VERIFY_RESOURCE(rsrc); XTYPE(xtype, arg4); Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.60 php4/ext/interbase/interbase.c:1.61 --- php4/ext/interbase/interbase.c:1.60 Sun Jul 29 21:56:28 2001 +++ php4/ext/interbase/interbase.c Mon Jul 30 00:57:57 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.60 2001/07/30 01:56:28 zeev Exp $ */ +/* $Id: interbase.c,v 1.61 2001/07/30 04:57:57 zeev Exp $ */ /* TODO: Arrays, roles? @@ -455,7 +455,7 @@ ibase_db_link *ib_link; TSRMLS_FETCH(); - ib_link = (ibase_db_link *) zend_fetch_resource(NULL, ib_trans->link_rsrc, "InterBase link", NULL, 2, le_link, le_plink); + ib_link = (ibase_db_link *) zend_fetch_resource(NULL TSRMLS_CC, ib_trans->link_rsrc, "InterBase link", NULL, 2, le_link, le_plink); if (ib_link) { if (ib_link->trans[ib_trans->trans_num] != NULL) { @@ -583,7 +583,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.60 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.61 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif @@ -2833,7 +2833,7 @@ RETURN_FALSE; } - what = zend_fetch_resource(file_arg, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream()); + what = zend_fetch_resource(file_arg TSRMLS_CC, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream()); ZEND_VERIFY_RESOURCE(what); if (type == php_file_le_fopen()) Index: php4/ext/mailparse/mailparse.c diff -u php4/ext/mailparse/mailparse.c:1.6 php4/ext/mailparse/mailparse.c:1.7 --- php4/ext/mailparse/mailparse.c:1.6 Fri Jul 27 06:16:22 2001 +++ php4/ext/mailparse/mailparse.c Mon Jul 30 00:57:58 2001 @@ -18,7 +18,7 @@ | the support routines for this extension were based upon. | +----------------------------------------------------------------------+ */ -/* $Id: mailparse.c,v 1.6 2001/07/27 10:16:22 zeev Exp $ */ +/* $Id: mailparse.c,v 1.7 2001/07/30 04:57:58 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -204,7 +204,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(file, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream()); + what = zend_fetch_resource(file TSRMLS_CC, -1, "File-Handle", &type, 2, php_file_le_fopen(), php_file_le_stream()); ZEND_VERIFY_RESOURCE(what); #if HAVE_PHP_STREAM Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.58 php4/ext/mssql/php_mssql.c:1.59 --- php4/ext/mssql/php_mssql.c:1.58 Sun Jul 29 21:56:29 2001 +++ php4/ext/mssql/php_mssql.c Mon Jul 30 00:57:58 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.58 2001/07/30 01:56:29 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.59 2001/07/30 04:57:58 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -256,7 +256,7 @@ { mssql_statement *statement; - statement = (mssql_statement *) zend_fetch_resource(stmt, -1, "MS SQL-Statement", NULL, 1, le_statement); + statement = (mssql_statement *) zend_fetch_resource(stmt TSRMLS_CC, -1, "MS SQL-Statement", NULL, 1, le_statement); if (statement) { return statement; Index: php4/ext/muscat/muscat.c diff -u php4/ext/muscat/muscat.c:1.5 php4/ext/muscat/muscat.c:1.6 --- php4/ext/muscat/muscat.c:1.5 Sat Jul 28 07:36:01 2001 +++ php4/ext/muscat/muscat.c Mon Jul 30 00:57:59 2001 @@ -229,7 +229,7 @@ zval_copy_ctor(handle->handles.muscatnet_handle.socketr); // but for our convenience extract the FD - what=zend_fetch_resource(socket_arg,-1,"Socket-Handle",NULL,1,php_file_le_socket()); + what=zend_fetch_resource(socket_arg TSRMLS_CC,-1,"Socket-Handle",NULL,1,php_file_le_socket()); ZEND_VERIFY_RESOURCE(what); handle->handles.muscatnet_handle.socketd=*(int*)what; php_set_sock_blocking(handle->handles.muscatnet_handle.socketd,1); @@ -254,7 +254,7 @@ *handle->handles.muscatnet_handle.socketr=*return_value; zval_copy_ctor(handle->handles.muscatnet_handle.socketr); // but for our convenience extract the FD - what=zend_fetch_resource(&return_value,-1,"File-Handle",NULL,1,php_file_le_socket); + what=zend_fetch_resource(&return_value TSRMLS_CC,-1,"File-Handle",NULL,1,php_file_le_socket); ZEND_VERIFY_RESOURCE(what); handle->handles.muscatnet_handle.socketd=*(int*)what; _discard(handle); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.139 php4/ext/oci8/oci8.c:1.140 --- php4/ext/oci8/oci8.c:1.139 Sun Jul 29 21:56:32 2001 +++ php4/ext/oci8/oci8.c Mon Jul 30 00:57:59 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.139 2001/07/30 01:56:32 zeev Exp $ */ +/* $Id: oci8.c,v 1.140 2001/07/30 04:57:59 zeev Exp $ */ /* TODO list: * @@ -579,7 +579,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.139 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.140 $"); #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 ); @@ -965,7 +965,7 @@ { oci_connection *connection; - connection = (oci_connection *) zend_fetch_resource(conn, -1, "OCI8-Connection", NULL, 1, le_conn); + connection = (oci_connection *) zend_fetch_resource(conn TSRMLS_CC, -1, "OCI8-Connection", NULL, 1, le_conn); if (connection && connection->is_open) { return connection; @@ -981,7 +981,7 @@ { oci_statement *statement; - statement = (oci_statement *) zend_fetch_resource(stmt, -1, "OCI8-Statement", NULL, 1, le_stmt); + statement = (oci_statement *) zend_fetch_resource(stmt TSRMLS_CC, -1, "OCI8-Statement", NULL, 1, le_stmt); if (statement && statement->conn->is_open) { return statement; @@ -3988,12 +3988,12 @@ dvoid *errh = NULL; if (zend_get_parameters_ex(1, &arg) == SUCCESS) { - statement = (oci_statement *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_stmt); + statement = (oci_statement *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_stmt); if (statement) { errh = statement->pError; error = statement->error; } else { - connection = (oci_connection *) zend_fetch_resource(arg, -1, NULL, NULL, 1, le_conn); + connection = (oci_connection *) zend_fetch_resource(arg TSRMLS_CC, -1, NULL, NULL, 1, le_conn); if (connection) { errh = connection->pError; error = connection->error; Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.97 php4/ext/odbc/php_odbc.c:1.98 --- php4/ext/odbc/php_odbc.c:1.97 Sat Jul 28 15:29:16 2001 +++ php4/ext/odbc/php_odbc.c Mon Jul 30 00:58:00 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.97 2001/07/28 19:29:16 andi Exp $ */ +/* $Id: php_odbc.c,v 1.98 2001/07/30 04:58:00 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2205,7 +2205,7 @@ WRONG_PARAM_COUNT; } - conn = (odbc_connection *) zend_fetch_resource(pv_conn, -1, "ODBC-Link", &found_resource_type, 2, le_conn, le_pconn); + conn = (odbc_connection *) zend_fetch_resource(pv_conn TSRMLS_CC, -1, "ODBC-Link", &found_resource_type, 2, le_conn, le_pconn); if (found_resource_type==le_pconn) { is_pconn = 1; } Index: php4/ext/openssl/openssl.c diff -u php4/ext/openssl/openssl.c:1.19 php4/ext/openssl/openssl.c:1.20 --- php4/ext/openssl/openssl.c:1.19 Thu Jul 5 17:18:19 2001 +++ php4/ext/openssl/openssl.c Mon Jul 30 00:58:02 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.19 2001/07/05 21:18:19 wez Exp $ */ +/* $Id: openssl.c,v 1.20 2001/07/30 04:58:02 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -202,7 +202,7 @@ void * what; int type; - what = zend_fetch_resource(val, -1, "OpenSSL X.509", &type, 1, le_x509); + what = zend_fetch_resource(val TSRMLS_CC, -1, "OpenSSL X.509", &type, 1, le_x509); if (!what) return NULL; @@ -297,7 +297,7 @@ void * what; int type; - what = zend_fetch_resource(val, -1, "OpenSSL X.509/key", &type, 2, le_x509, le_key); + what = zend_fetch_resource(val TSRMLS_CC, -1, "OpenSSL X.509/key", &type, 2, le_x509, le_key); if (!what) return NULL; Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.67 php4/ext/oracle/oracle.c:1.68 --- php4/ext/oracle/oracle.c:1.67 Sun Jul 29 21:56:34 2001 +++ php4/ext/oracle/oracle.c Mon Jul 30 00:58:02 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.67 2001/07/30 01:56:34 zeev Exp $ */ +/* $Id: oracle.c,v 1.68 2001/07/30 04:58:02 zeev Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -1518,7 +1518,7 @@ } if (argc == 1) { - res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); + res = zend_fetch_resource(arg TSRMLS_CC, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); ZEND_VERIFY_RESOURCE(res); if (what == le_cursor) { @@ -1550,7 +1550,7 @@ } if (argc == 1) { - res = zend_fetch_resource(arg, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); + res = zend_fetch_resource(arg TSRMLS_CC, -1,"Oracle-Connection/Cursor",&what,3,le_conn, le_pconn, le_cursor); ZEND_VERIFY_RESOURCE(res); if (what == le_cursor) { @@ -1595,7 +1595,7 @@ oraConnection *db_conn; TSRMLS_FETCH(); - cursor = (oraCursor *) zend_fetch_resource(ind, -1, "Oracle-Cursor", NULL, 1, le_cursor); + cursor = (oraCursor *) zend_fetch_resource(ind TSRMLS_CC, -1, "Oracle-Cursor", NULL, 1, le_cursor); if (! cursor) { return NULL; } Index: php4/ext/recode/recode.c diff -u php4/ext/recode/recode.c:1.15 php4/ext/recode/recode.c:1.16 --- php4/ext/recode/recode.c:1.15 Sun Jul 29 21:56:35 2001 +++ php4/ext/recode/recode.c Mon Jul 30 00:58:04 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.15 2001/07/30 01:56:35 zeev Exp $ */ +/* $Id: recode.c,v 1.16 2001/07/30 04:58:04 zeev Exp $ */ /* {{{ includes & prototypes */ @@ -99,7 +99,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.15 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.16 $"); php_info_print_table_end(); } @@ -172,14 +172,14 @@ WRONG_PARAM_COUNT; } - in_fp = zend_fetch_resource(input,-1, "File-Handle", &in_type, + in_fp = zend_fetch_resource(input TSRMLS_CC,-1, "File-Handle", &in_type, 2, php_file_le_fopen(), php_file_le_popen()); if (!in_fp) { php_error(E_WARNING,"Unable to find input file identifier"); RETURN_FALSE; } - out_fp = zend_fetch_resource(output,-1, "File-Handle", &out_type, + out_fp = zend_fetch_resource(output TSRMLS_CC,-1, "File-Handle", &out_type, 2, php_file_le_fopen(), php_file_le_popen()); if (!out_fp) { php_error(E_WARNING,"Unable to find output file identifier"); Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.116 php4/ext/standard/array.c:1.117 --- php4/ext/standard/array.c:1.116 Sat Jul 28 07:36:13 2001 +++ php4/ext/standard/array.c Mon Jul 30 00:58:04 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.116 2001/07/28 11:36:13 zeev Exp $ */ +/* $Id: array.c,v 1.117 2001/07/30 04:58:04 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -146,7 +146,7 @@ Z_STRLEN(second) = s->nKeyLength; } - if (ARRAYG(compare_func)(&result, &first, &second) == FAILURE) { + if (ARRAYG(compare_func)(&result, &first, &second TSRMLS_CC) == FAILURE) { return 0; } @@ -278,7 +278,7 @@ first = *((pval **) f->pData); second = *((pval **) s->pData); - if (ARRAYG(compare_func)(&result, first, second) == FAILURE) { + if (ARRAYG(compare_func)(&result, first, second TSRMLS_CC) == FAILURE) { return 0; } @@ -878,7 +878,7 @@ min = args[0]; for (i=1; i<ZEND_NUM_ARGS(); i++) { - is_smaller_function(&result, *args[i], *min); + is_smaller_function(&result, *args[i], *min TSRMLS_CC); if (Z_LVAL(result) == 1) { min = args[i]; } @@ -930,7 +930,7 @@ max = args[0]; for (i=1; i<ZEND_NUM_ARGS(); i++) { - is_smaller_or_equal_function(&result, *args[i], *max); + is_smaller_or_equal_function(&result, *args[i], *max TSRMLS_CC); if (Z_LVAL(result) == 0) { max = args[i]; } @@ -1044,7 +1044,7 @@ HashPosition pos; /* hash iterator */ ulong num_key; char *string_key; - int (*compare_func)(zval *, zval *, zval *) = is_equal_function; + int (*compare_func)(zval *, zval *, zval * TSRMLS_DC) = is_equal_function; if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > 3 || zend_get_parameters_ex(ZEND_NUM_ARGS(), &value, &array, &strict) == FAILURE) { @@ -1065,13 +1065,13 @@ convert_to_boolean_ex(strict); if (Z_LVAL_PP(strict)) { compare_func = is_identical_function; - } + } } target_hash = HASH_OF(*array); zend_hash_internal_pointer_reset_ex(target_hash, &pos); while(zend_hash_get_current_data_ex(target_hash, (void **)&entry, &pos) == SUCCESS) { - compare_func(&res, *value, *entry); + compare_func(&res, *value, *entry TSRMLS_CC); if (Z_LVAL(res) == 1) { if (behavior==0) { RETURN_TRUE; @@ -1941,7 +1941,7 @@ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(input), &pos); while(zend_hash_get_current_data_ex(Z_ARRVAL_PP(input), (void **)&entry, &pos) == SUCCESS) { if (search_value != NULL) { - is_equal_function(&res, *search_value, *entry); + is_equal_function(&res, *search_value, *entry TSRMLS_CC); add_key = zval_is_true(&res); } @@ -2513,7 +2513,7 @@ do { set_compare_func(ARRAYG(multisort_flags)[MULTISORT_TYPE][r]); - ARRAYG(compare_func)(&temp, *((zval **)ab[r]->pData), *((zval **)bb[r]->pData)); + ARRAYG(compare_func)(&temp, *((zval **)ab[r]->pData), *((zval **)bb[r]->pData) TSRMLS_CC); result = ARRAYG(multisort_flags)[MULTISORT_ORDER][r] * Z_LVAL(temp); if (result != 0) return result; @@ -2830,7 +2830,7 @@ continue; SEPARATE_ZVAL(entry); - convert_scalar_to_number(*entry); + convert_scalar_to_number(*entry TSRMLS_CC); if (Z_TYPE_PP(entry) == IS_LONG && Z_TYPE_P(return_value) == IS_LONG) { Z_LVAL_P(return_value) += Z_LVAL_PP(entry); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.364 php4/ext/standard/basic_functions.c:1.365 --- php4/ext/standard/basic_functions.c:1.364 Sun Jul 29 21:56:37 2001 +++ php4/ext/standard/basic_functions.c Mon Jul 30 00:58:04 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.364 2001/07/30 01:56:37 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.365 2001/07/30 04:58:04 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -1863,12 +1863,13 @@ { zval *func1 = tick_fe1->arguments[0]; zval *func2 = tick_fe2->arguments[0]; + TSRMLS_FETCH(); if (Z_TYPE_P(func1) == IS_STRING && Z_TYPE_P(func2) == IS_STRING) { return (zend_binary_zval_strcmp(func1, func2) == 0); } else if (Z_TYPE_P(func1) == IS_ARRAY && Z_TYPE_P(func2) == IS_ARRAY) { zval result; - zend_compare_arrays(&result, func1, func2); + zend_compare_arrays(&result, func1, func2 TSRMLS_CC); return (Z_LVAL(result) == 0); } else return 0; @@ -1933,7 +1934,6 @@ pval **filename; zend_syntax_highlighter_ini syntax_highlighter_ini; - if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &filename)==FAILURE) { WRONG_PARAM_COUNT; } @@ -1941,7 +1941,7 @@ php_get_highlight_struct(&syntax_highlighter_ini); - if (highlight_file(Z_STRVAL_PP(filename), &syntax_highlighter_ini)==FAILURE) { + if (highlight_file(Z_STRVAL_PP(filename), &syntax_highlighter_ini TSRMLS_CC)==FAILURE) { RETURN_FALSE; } RETURN_TRUE; @@ -1967,7 +1967,7 @@ hicompiled_string_description = zend_make_compiled_string_description("highlighted code" TSRMLS_CC); - if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description)==FAILURE) { + if (highlight_string(*expr, &syntax_highlighter_ini, hicompiled_string_description TSRMLS_CC)==FAILURE) { efree(hicompiled_string_description); RETURN_FALSE; } Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.170 php4/ext/standard/file.c:1.171 --- php4/ext/standard/file.c:1.170 Sat Jul 28 07:36:15 2001 +++ php4/ext/standard/file.c Mon Jul 30 00:58:05 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.170 2001/07/28 11:36:15 zeev Exp $ */ +/* $Id: file.c,v 1.171 2001/07/30 04:58:05 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -243,7 +243,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); #if HAVE_PHP_STREAM @@ -705,7 +705,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 3, le_fopen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 3, le_fopen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); zend_list_delete((*arg1)->value.lval); @@ -783,7 +783,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,1,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,1,le_popen); ZEND_VERIFY_RESOURCE(what); zend_list_delete((*arg1)->value.lval); @@ -805,7 +805,7 @@ if (ARG_COUNT(ht) != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) { WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -877,7 +877,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 2, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 2, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); convert_to_long_ex(arg2); @@ -925,7 +925,7 @@ WRONG_PARAM_COUNT; } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(socket, -1, "File-Handle", &type, 1, le_socket); + what = zend_fetch_resource(socket TSRMLS_CC, -1, "File-Handle", &type, 1, le_socket); ZEND_VERIFY_RESOURCE(what); socketd = *(int *)what; @@ -963,7 +963,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(socket, -1, "File-Handle", &type, 1, le_socket); + what = zend_fetch_resource(socket TSRMLS_CC, -1, "File-Handle", &type, 1, le_socket); ZEND_VERIFY_RESOURCE(what); socketd = *(int *)what; sock = php_get_socket(socketd); @@ -994,7 +994,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); convert_to_long_ex(arg2); @@ -1070,7 +1070,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -1142,7 +1142,7 @@ break; } - what = zend_fetch_resource(fd, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(fd TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -1210,7 +1210,7 @@ file_handle = args[0]; format_string = args[1]; - what = zend_fetch_resource(file_handle, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); + what = zend_fetch_resource(file_handle TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); /* * we can't do a ZEND_VERIFY_RESOURCE(what), otherwise we end up @@ -1294,7 +1294,7 @@ break; } - what = zend_fetch_resource(arg1, -1, "File-Handle", &type, 4, le_fopen, + what = zend_fetch_resource(arg1 TSRMLS_CC, -1, "File-Handle", &type, 4, le_fopen, le_popen, le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); @@ -1344,7 +1344,7 @@ WRONG_PARAM_COUNT; } - what = zend_fetch_resource(arg1,-1,"File-Handle",&type,4,le_fopen,le_popen,le_socket, le_stream); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,4,le_fopen,le_popen,le_socket, le_stream); ZEND_VERIFY_RESOURCE(what); #if HAVE_PHP_STREAM @@ -1399,7 +1399,7 @@ /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",&type,2,le_fopen,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,2,le_fopen,le_popen); ZEND_VERIFY_RESOURCE(what); convert_to_long_ex(arg2); @@ -1429,7 +1429,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen); ZEND_VERIFY_RESOURCE(what); rewind((FILE*) what); @@ -1451,7 +1451,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen); ZEND_VERIFY_RESOURCE(what); ret = ftell((FILE*) what); @@ -1478,7 +1478,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",NULL,2,le_fopen,le_popen); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",NULL,2,le_fopen,le_popen); ZEND_VERIFY_RESOURCE(what); convert_to_long_ex(arg2); @@ -1699,7 +1699,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -1788,7 +1788,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(fp,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(fp TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) @@ -1823,7 +1823,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(fp,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(fp TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (fstat(fileno((FILE *) what ), &stat_sb)) { @@ -2003,7 +2003,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg1,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(arg1 TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -2083,7 +2083,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(fd,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); + what = zend_fetch_resource(fd TSRMLS_CC,-1,"File-Handle",&type,3,le_fopen,le_popen,le_socket); ZEND_VERIFY_RESOURCE(what); if (type == le_socket) { @@ -2252,7 +2252,7 @@ WRONG_PARAM_COUNT; } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(arg,-1,"select",&type,3,le_fopen,le_socket,le_popen); + what = zend_fetch_resource(arg TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen); ZEND_VERIFY_RESOURCE(what); if(type == le_socket) { fd = *(int *)what; @@ -2273,7 +2273,7 @@ FD_ZERO(&readfd); for(i = 0; i < ARG_COUNT(ht); i++) { /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(*args,-1,"select",&type,3,le_fopen,le_socket,le_popen); + what = zend_fetch_resource(*args TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen); ZEND_VERIFY_RESOURCE(what); if(type == le_socket) { fd = *(int *)what; @@ -2323,7 +2323,7 @@ } /* XXX: add stream support --Wez. */ - what = zend_fetch_resource(fdarg,-1,"select",&type,3,le_fopen,le_socket,le_popen); + what = zend_fetch_resource(fdarg TSRMLS_CC,-1,"select",&type,3,le_fopen,le_socket,le_popen); ZEND_VERIFY_RESOURCE(what); if(type == le_socket) { Index: php4/ext/standard/formatted_print.c diff -u php4/ext/standard/formatted_print.c:1.36 php4/ext/standard/formatted_print.c:1.37 --- php4/ext/standard/formatted_print.c:1.36 Thu Jul 19 04:12:12 2001 +++ php4/ext/standard/formatted_print.c Mon Jul 30 00:58:05 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.36 2001/07/19 08:12:12 stas Exp $ */ +/* $Id: formatted_print.c,v 1.37 2001/07/30 04:58:05 zeev Exp $ */ #include <math.h> /* modf() */ #include "php.h" @@ -408,7 +408,7 @@ * */ static char * -php_formatted_print(int ht, int *len) +php_formatted_print(int ht, int *len TSRMLS_DC) { pval ***args; int argc, size = 240, inpos = 0, outpos = 0, temppos; @@ -632,7 +632,7 @@ char *result; int len; - if ((result=php_formatted_print(ht,&len))==NULL) { + if ((result=php_formatted_print(ht, &len TSRMLS_CC))==NULL) { RETURN_FALSE; } RETVAL_STRINGL(result,len,1); @@ -647,7 +647,7 @@ char *result; int len; - if ((result=php_formatted_print(ht,&len))==NULL) { + if ((result=php_formatted_print(ht, &len TSRMLS_CC))==NULL) { RETURN_FALSE; } PHPWRITE(result,len); Index: php4/ext/standard/php_array.h diff -u php4/ext/standard/php_array.h:1.26 php4/ext/standard/php_array.h:1.27 --- php4/ext/standard/php_array.h:1.26 Sat Jul 28 07:36:18 2001 +++ php4/ext/standard/php_array.h Mon Jul 30 00:58:05 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_array.h,v 1.26 2001/07/28 11:36:18 zeev Exp $ */ +/* $Id: php_array.h,v 1.27 2001/07/30 04:58:05 zeev Exp $ */ #ifndef PHP_ARRAY_H #define PHP_ARRAY_H @@ -85,7 +85,7 @@ typedef struct { int *multisort_flags[2]; - int (*compare_func)(zval *result, zval *op1, zval *op2); + int (*compare_func)(zval *result, zval *op1, zval *op2 TSRMLS_DC); } php_array_globals; #ifdef ZTS Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.99 php4/ext/standard/var.c:1.100 --- php4/ext/standard/var.c:1.99 Sun Jul 29 04:14:00 2001 +++ php4/ext/standard/var.c Mon Jul 30 00:58:05 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.99 2001/07/29 08:14:00 andi Exp $ */ +/* $Id: var.c,v 1.100 2001/07/30 04:58:05 zeev Exp $ */ /* {{{ includes @@ -98,7 +98,9 @@ break; case IS_RESOURCE: { char *type_name; - type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc)); + TSRMLS_FETCH(); + + type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(struc) TSRMLS_CC); php_printf("%sresource(%ld) of type (%s)\n", COMMON, Z_LVAL_PP(struc), type_name ? type_name : "Unknown"); break; } Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.73 php4/ext/wddx/wddx.c:1.74 --- php4/ext/wddx/wddx.c:1.73 Sat Jul 28 15:11:05 2001 +++ php4/ext/wddx/wddx.c Mon Jul 30 00:58:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.73 2001/07/28 19:11:05 andi Exp $ */ +/* $Id: wddx.c,v 1.74 2001/07/30 04:58:06 zeev Exp $ */ #include "php.h" #include "php_wddx.h" @@ -892,6 +892,7 @@ wddx_stack *stack = (wddx_stack *)user_data; char *decoded_value; int decoded_len; + TSRMLS_FETCH(); if (!wddx_stack_is_empty(stack)) { wddx_stack_top(stack, (void**)&ent); @@ -928,7 +929,7 @@ Z_TYPE_P(ent->data) = IS_STRING; Z_STRLEN_P(ent->data) = len; Z_STRVAL_P(ent->data) = estrndup(s, len); - convert_scalar_to_number(ent->data); + convert_scalar_to_number(ent->data TSRMLS_CC); break; case ST_BOOLEAN: @@ -996,7 +997,7 @@ int comment_len = 0; wddx_packet *packet; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "z|s", + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &var, &comment, &comment_len) == FAILURE) return; @@ -1094,7 +1095,7 @@ comment = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s", &comment, &comment_len) == FAILURE) + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &comment, &comment_len) == FAILURE) return; packet = php_wddx_constructor(); @@ -1116,7 +1117,7 @@ zval *packet_id; wddx_packet *packet = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &packet_id) == FAILURE) + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &packet_id) == FAILURE) return; ZEND_FETCH_RESOURCE(packet, wddx_packet *, &packet_id, -1, "WDDX packet ID", le_wddx); @@ -1156,7 +1157,7 @@ packet_id = args[0]; - packet = (wddx_packet *)zend_fetch_resource(packet_id, -1, "WDDX packet ID", NULL, 1, le_wddx); + packet = (wddx_packet *)zend_fetch_resource(packet_id TSRMLS_CC, -1, "WDDX packet ID", NULL, 1, le_wddx); if (!packet) { efree(args); @@ -1181,7 +1182,7 @@ char *packet; int packet_len; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &packet, &packet_len) == FAILURE) + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &packet, &packet_len) == FAILURE) return; if (packet_len == 0) Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.86 php4/ext/xml/xml.c:1.87 --- php4/ext/xml/xml.c:1.86 Sat Jul 28 14:38:36 2001 +++ php4/ext/xml/xml.c Mon Jul 30 00:58:06 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.86 2001/07/28 18:38:36 andi Exp $ */ +/* $Id: xml.c,v 1.87 2001/07/30 04:58:06 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -243,6 +243,8 @@ static zval *_xml_resource_zval(long value) { zval *ret; + TSRMLS_FETCH(); + MAKE_STD_ZVAL(ret); ret->type = IS_RESOURCE; Index: php4/sapi/apache/sapi_apache.c diff -u php4/sapi/apache/sapi_apache.c:1.30 php4/sapi/apache/sapi_apache.c:1.31 --- php4/sapi/apache/sapi_apache.c:1.30 Sat Jul 28 07:36:30 2001 +++ php4/sapi/apache/sapi_apache.c Mon Jul 30 00:58:07 2001 @@ -19,7 +19,7 @@ | Stig Bakken <ssb@fast.no> | +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache.c,v 1.30 2001/07/28 11:36:30 zeev Exp $ */ +/* $Id: sapi_apache.c,v 1.31 2001/07/30 04:58:07 zeev Exp $ */ #define NO_REGEX_EXTRA_H #ifdef WIN32 @@ -76,7 +76,7 @@ zend_syntax_highlighter_ini syntax_highlighter_ini; php_get_highlight_struct(&syntax_highlighter_ini); - if (highlight_file(SG(request_info).path_translated,&syntax_highlighter_ini)){ + if (highlight_file(SG(request_info).path_translated,&syntax_highlighter_ini TSRMLS_CC)){ return OK; } else { return NOT_FOUND;