cvs: /php4 main.c /php4/ext/db db.c php_db.h /php4/ext/ldap ldap.c /php4/ext/msql php_msql.c /php4/ext/mysql php_mysql.c /php4/ext/pcre php_pcre.c
/php4/ext/standard array.c assert.c basic_functions.c crypt.c dl.c html.c info.c syslog.c /php4/ext/sybase_ct php_sybase_ct.c

zeev Sat Feb 5 07:16:12 2000 EDT Modified files: /php4 main.c /php4/ext/db db.c php_db.h /php4/ext/ldap ldap.c /php4/ext/msql php_msql.c /php4/ext/mysql php_mysql.c /php4/ext/pcre php_pcre.c /php4/ext/standard array.c assert.c basic_functions.c crypt.c dl.c html.c info.c syslog.c /php4/ext/sybase_ct php_sybase_ct.c Log: Cleanup patches Index: php4/main.c diff -u php4/main.c:1.190 php4/main.c:1.191 --- php4/main.c:1.190 Fri Feb 4 06:54:30 2000 +++ php4/main.c Sat Feb 5 07:16:09 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.190 2000/02/04 14:54:30 zeev Exp $ */ +/* $Id: main.c,v 1.191 2000/02/05 15:16:09 zeev Exp $ */ #include <stdio.h> @@ -720,7 +720,6 @@ CLS_FETCH(); ELS_FETCH(); SLS_FETCH(); - PLS_FETCH(); sapi_send_headers(); php_end_ob_buffering(SG(request_info).headers_only?0:1); Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.20 php4/ext/db/db.c:1.21 --- php4/ext/db/db.c:1.20 Fri Dec 31 17:31:30 1999 +++ php4/ext/db/db.c Sat Feb 5 07:16:09 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.20 2000/01/01 01:31:30 sas Exp $ */ +/* $Id: db.c,v 1.21 2000/02/05 15:16:09 zeev Exp $ */ #define IS_EXT_MODULE #if COMPILE_DL # include "dl/phpdl.h" @@ -151,41 +151,31 @@ #include "php_db.h" #include "ext/standard/php_string.h" +static int le_db; + #if THREAD_SAFE DWORD DbmTls; static int numthreads=0; - -typedef struct dbm_global_struct{ - int le_db; -}dbm_global_struct; - -#define DBM_GLOBAL(a) dbm_globals->a -#define DBM_TLS_VARS dbm_global_struct *dbm_globals = TlsGetValue(DbmTls); - -#else -static int le_db; -#define DBM_GLOBAL(a) a -#define DBM_TLS_VARS #endif /*needed for blocking calls in windows*/ void *dbm_mutex; -dbm_info *php_find_dbm(pval *id,HashTable *list) +dbm_info *php_find_dbm(pval *id) { list_entry *le; dbm_info *info; int numitems, i; int info_type; - DBM_TLS_VARS; + ELS_FETCH(); if (id->type == IS_STRING) { - numitems = zend_hash_num_elements(list); + numitems = zend_hash_num_elements(&EG(regular_list)); for (i=1; i<=numitems; i++) { - if (zend_hash_index_find(list, i, (void **) &le)==FAILURE) { + if (zend_hash_index_find(&EG(regular_list), i, (void **) &le)==FAILURE) { continue; } - if (le->type == DBM_GLOBAL(le_db)) { + if (le->type == le_db) { info = (dbm_info *)(le->ptr); if (!strcmp(info->filename, id->value.str.val)) { return (dbm_info *)(le->ptr); @@ -197,7 +187,7 @@ /* didn't find it as a database filename, try as a number */ convert_to_long(id); info = zend_list_find(id->value.lval, &info_type); - if (info_type != DBM_GLOBAL(le_db)) + if (info_type != le_db) return NULL; return info; } @@ -254,7 +244,6 @@ pval *filename, *mode; dbm_info *info=NULL; int ret; - DBM_TLS_VARS; if (ARG_COUNT(ht)!=2 || zend_get_parameters(ht,2,&filename,&mode)==FAILURE) { WRONG_PARAM_COUNT; @@ -265,7 +254,7 @@ info = php_dbm_open(filename->value.str.val, mode->value.str.val); if (info) { - ret = zend_list_insert(info, DBM_GLOBAL(le_db)); + ret = zend_list_insert(info, le_db); RETURN_LONG(ret); } else { RETURN_FALSE; @@ -469,7 +458,7 @@ convert_to_string(key); convert_to_string(value); - info = php_find_dbm(id,list); + info = php_find_dbm(id); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -522,7 +511,7 @@ convert_to_string(key); convert_to_string(value); - info = php_find_dbm(id,list); + info = php_find_dbm(id); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -576,7 +565,7 @@ } convert_to_string(key); - info = php_find_dbm(id,list); + info = php_find_dbm(id); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -648,7 +637,7 @@ } convert_to_string(key); - info = php_find_dbm(id,list); + info = php_find_dbm(id); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -691,7 +680,7 @@ } convert_to_string(key); - info = php_find_dbm(id,list); + info = php_find_dbm(id); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -732,7 +721,7 @@ WRONG_PARAM_COUNT; } - info = php_find_dbm(id,list); + info = php_find_dbm(id); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -790,7 +779,7 @@ } convert_to_string(key); - info = php_find_dbm(id,list); + info = php_find_dbm(id); if (!info) { php_error(E_WARNING, "not a valid database identifier %d", id->value.lval); RETURN_FALSE; @@ -1099,13 +1088,12 @@ } #endif - DBM_GLOBAL(le_db) = register_list_destructors(php_dbm_close,NULL); + le_db = register_list_destructors(php_dbm_close,NULL); return SUCCESS; } static PHP_MSHUTDOWN_FUNCTION(db) { - DBM_TLS_VARS; #ifdef THREAD_SAFE PHP3_TLS_THREAD_FREE(dbm_globals); PHP3_MUTEX_LOCK(dbm_mutex); Index: php4/ext/db/php_db.h diff -u php4/ext/db/php_db.h:1.3 php4/ext/db/php_db.h:1.4 --- php4/ext/db/php_db.h:1.3 Fri Dec 17 13:19:59 1999 +++ php4/ext/db/php_db.h Sat Feb 5 07:16:09 2000 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_db.h,v 1.3 1999/12/17 21:19:59 zeev Exp $ */ +/* $Id: php_db.h,v 1.4 2000/02/05 15:16:09 zeev Exp $ */ #ifndef _PHP_DB_H @@ -62,7 +62,7 @@ #define phpext_db_ptr NULL #endif -dbm_info *php_find_dbm(pval *id,HashTable *list); +dbm_info *php_find_dbm(pval *id); int php_dbm_close(dbm_info *info); dbm_info *php_dbm_open(char *filename, char *mode); int php_dbm_insert(dbm_info *info, char *key, char *value); Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.22 php4/ext/ldap/ldap.c:1.23 --- php4/ext/ldap/ldap.c:1.22 Fri Dec 31 17:31:39 1999 +++ php4/ext/ldap/ldap.c Sat Feb 5 07:16:10 2000 @@ -20,7 +20,7 @@ */ -/* $Id: ldap.c,v 1.22 2000/01/01 01:31:39 sas Exp $ */ +/* $Id: ldap.c,v 1.23 2000/02/05 15:16:10 zeev Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -277,7 +277,7 @@ php_printf("<table>" "<tr><td>Total links:</td><td>%d/%s</td></tr>\n" - "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.22 2000/01/01 01:31:39 sas Exp $</td></tr>\n" + "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 1.23 2000/02/05 15:16:10 zeev Exp $</td></tr>\n" #if HAVE_NSLDAP "<tr><td>SDK Version:</td><td>%f</td></tr>" "<tr><td>Highest LDAP Protocol Supported:</td><td>%f</td></tr>" @@ -375,7 +375,7 @@ /* }}} */ -static LDAP * _get_ldap_link(pval **link, HashTable *list) +static LDAP * _get_ldap_link(pval **link) { LDAP *ldap; int type; @@ -392,7 +392,7 @@ } -static LDAPMessage * _get_ldap_result(pval **result, HashTable *list) +static LDAPMessage * _get_ldap_result(pval **result) { LDAPMessage *ldap_result; int type; @@ -410,7 +410,7 @@ } -static LDAPMessage * _get_ldap_result_entry(pval **result, HashTable *list) +static LDAPMessage * _get_ldap_result_entry(pval **result) { LDAPMessage *ldap_result_entry; int type; @@ -428,7 +428,7 @@ } -static BerElement * _get_ber_entry(pval **berp, HashTable *list) +static BerElement * _get_ber_entry(pval **berp) { BerElement *ber; int type; @@ -496,7 +496,7 @@ break; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; if (ldap_bind_s(ldap, ldap_bind_rdn, ldap_bind_pw, LDAP_AUTH_SIMPLE) != LDAP_SUCCESS) { @@ -528,7 +528,7 @@ convert_to_long_ex(link); - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; zend_list_delete((*link)->value.lval); @@ -610,7 +610,7 @@ ldap_base_dn = NULL; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; /* Is it useful to only get the attributes ? */ @@ -674,7 +674,7 @@ WRONG_PARAM_COUNT; } - ldap_result = _get_ldap_result(result, list); + ldap_result = _get_ldap_result(result); if (ldap_result == NULL) { RETVAL_FALSE; } else { @@ -697,10 +697,10 @@ WRONG_PARAM_COUNT; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; - ldap_result = _get_ldap_result(result, list); + ldap_result = _get_ldap_result(result); if (ldap_result == NULL) RETURN_FALSE; RETURN_LONG(ldap_count_entries(ldap, ldap_result)); @@ -721,10 +721,10 @@ WRONG_PARAM_COUNT; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; - ldap_result = _get_ldap_result(result, list); + ldap_result = _get_ldap_result(result); if (ldap_result == NULL) RETURN_FALSE; if ((ldap_result_entry = ldap_first_entry(ldap, ldap_result)) == NULL) { @@ -748,10 +748,10 @@ WRONG_PARAM_COUNT; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; - ldap_result_entry = _get_ldap_result_entry(result_entry, list); + ldap_result_entry = _get_ldap_result_entry(result_entry); if (ldap_result_entry == NULL) RETURN_FALSE; if ((ldap_result_entry_next = ldap_next_entry(ldap, ldap_result_entry)) == NULL) { @@ -782,10 +782,10 @@ WRONG_PARAM_COUNT; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; - ldap_result = _get_ldap_result(result, list); + ldap_result = _get_ldap_result(result); if (ldap_result == NULL) RETURN_FALSE; num_entries = ldap_count_entries(ldap, ldap_result); @@ -864,10 +864,10 @@ WRONG_PARAM_COUNT; } - ldap = _get_ldap_link(link,list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; - ldap_result_entry = _get_ldap_result_entry(result,list); + ldap_result_entry = _get_ldap_result_entry(result); if (ldap_result_entry == NULL) RETURN_FALSE; if ((attribute = ldap_first_attribute(ldap, ldap_result_entry, &ber)) == NULL) { @@ -899,13 +899,13 @@ WRONG_PARAM_COUNT; } - ldap = _get_ldap_link(link,list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; - ldap_result_entry = _get_ldap_result_entry(result,list); + ldap_result_entry = _get_ldap_result_entry(result); if (ldap_result_entry == NULL) RETURN_FALSE; - ber = _get_ber_entry(berp,list); + ber = _get_ber_entry(berp); if ((attribute = ldap_next_attribute(ldap, ldap_result_entry, ber)) == NULL) { RETURN_FALSE; @@ -935,10 +935,10 @@ WRONG_PARAM_COUNT; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; - ldap_result_entry = _get_ldap_result_entry(result_entry, list); + ldap_result_entry = _get_ldap_result_entry(result_entry); if (ldap_result_entry == NULL) RETURN_FALSE; num_attrib = 0; @@ -991,10 +991,10 @@ WRONG_PARAM_COUNT; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; - ldap_result_entry = _get_ldap_result_entry(result_entry, list); + ldap_result_entry = _get_ldap_result_entry(result_entry); if (ldap_result_entry == NULL) RETURN_FALSE; convert_to_string_ex(attr); @@ -1040,10 +1040,10 @@ WRONG_PARAM_COUNT; } - ld = _get_ldap_link(link, list); + ld = _get_ldap_link(link); if (ld == NULL) RETURN_FALSE; - entry = _get_ldap_result_entry(entryp, list); + entry = _get_ldap_result_entry(entryp); if (entry == NULL) RETURN_FALSE; text = ldap_get_dn(ld, entry); @@ -1142,7 +1142,7 @@ RETURN_FALSE; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; convert_to_string_ex(dn); @@ -1287,7 +1287,7 @@ WRONG_PARAM_COUNT; } - ldap = _get_ldap_link(link, list); + ldap = _get_ldap_link(link); if (ldap == NULL) RETURN_FALSE; convert_to_string_ex(dn); Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.7 php4/ext/msql/php_msql.c:1.8 --- php4/ext/msql/php_msql.c:1.7 Fri Dec 31 17:31:42 1999 +++ php4/ext/msql/php_msql.c Sat Feb 5 07:16:10 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.7 2000/01/01 01:31:42 sas Exp $ */ +/* $Id: php_msql.c,v 1.8 2000/02/05 15:16:10 zeev Exp $ */ #include "php.h" #if COMPILE_DL @@ -217,6 +217,7 @@ char *hashed_details; int hashed_details_length; int msql; + ELS_FETCH(); switch(ARG_COUNT(ht)) { case 0: /* defaults */ @@ -260,7 +261,7 @@ } /* try to find if we already have this link in our persistent list */ - if (zend_hash_find(plist, hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) { /* we don't */ + if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) { /* we don't */ list_entry new_le; /* create the link */ @@ -272,7 +273,7 @@ /* hash it up */ new_le.type = msql_globals.le_plink; new_le.ptr = (void *) msql; - if (zend_hash_update(plist, hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) { + if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) { efree(hashed_details); RETURN_FALSE; } @@ -289,7 +290,7 @@ if (msql_stat(le->ptr)==NULL) { /* the link died */ if (msql_connect(le->ptr,host,user,passwd)==NULL) { php_error(E_WARNING,"mSQL link lost, unable to reconnect"); - zend_hash_del(plist,hashed_details,hashed_details_length+1); + zend_hash_del(&EG(persistent_list),hashed_details,hashed_details_length+1); efree(hashed_details); RETURN_FALSE; } @@ -306,7 +307,7 @@ * if it doesn't, open a new msql link, add it to the resource list, * and add a pointer to it with hashed_details as the key. */ - if (zend_hash_find(list,hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) { + if (zend_hash_find(&EG(regular_list),hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) { int type,link; void *ptr; @@ -321,7 +322,7 @@ efree(hashed_details); return; } else { - zend_hash_del(list,hashed_details,hashed_details_length+1); + zend_hash_del(&EG(regular_list),hashed_details,hashed_details_length+1); } } if (msql_globals.max_links!=-1 && msql_globals.num_links>=msql_globals.max_links) { @@ -340,7 +341,7 @@ /* add it to the hash */ new_index_ptr.ptr = (void *) return_value->value.lval; new_index_ptr.type = le_index_ptr; - if (zend_hash_update(list,hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry), NULL)==FAILURE) { + if (zend_hash_update(&EG(regular_list),hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry), NULL)==FAILURE) { efree(hashed_details); RETURN_FALSE; } Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.23 php4/ext/mysql/php_mysql.c:1.24 --- php4/ext/mysql/php_mysql.c:1.23 Tue Jan 4 06:41:55 2000 +++ php4/ext/mysql/php_mysql.c Sat Feb 5 07:16:10 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.23 2000/01/04 14:41:55 andrei Exp $ */ +/* $Id: php_mysql.c,v 1.24 2000/02/05 15:16:10 zeev Exp $ */ /* TODO: @@ -298,8 +298,6 @@ PHP_MINIT_FUNCTION(mysql) { - ELS_FETCH(); - #ifdef ZTS mysql_globals_id = ts_allocate_id(sizeof(php_mysql_globals), (ts_allocate_ctor) php_mysql_init_globals, NULL); #else @@ -371,6 +369,7 @@ MYSQL *mysql; MySLS_FETCH(); PLS_FETCH(); + ELS_FETCH(); if (PG(sql_safe_mode)) { if (ARG_COUNT(ht)>0) { @@ -460,7 +459,7 @@ list_entry *le; /* try to find if we already have this link in our persistent list */ - if (zend_hash_find(plist, hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) { /* we don't */ + if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) { /* we don't */ list_entry new_le; if (MySG(max_links)!=-1 && MySG(num_links)>=MySG(max_links)) { @@ -490,7 +489,7 @@ /* hash it up */ new_le.type = le_plink; new_le.ptr = mysql; - if (zend_hash_update(plist, hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) { + if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) { free(mysql); efree(hashed_details); RETURN_FALSE; @@ -520,7 +519,7 @@ if (mysql_connect(le->ptr,host,user,passwd)==NULL) { #endif php_error(E_WARNING,"MySQL: Link to server lost, unable to reconnect"); - zend_hash_del(plist, hashed_details, hashed_details_length+1); + zend_hash_del(&EG(persistent_list), hashed_details, hashed_details_length+1); efree(hashed_details); RETURN_FALSE; } @@ -539,7 +538,7 @@ * if it doesn't, open a new mysql link, add it to the resource list, * and add a pointer to it with hashed_details as the key. */ - if (zend_hash_find(list,hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) { + if (zend_hash_find(&EG(regular_list),hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) { int type,link; void *ptr; @@ -556,7 +555,7 @@ efree(hashed_details); return; } else { - zend_hash_del(list,hashed_details,hashed_details_length+1); + zend_hash_del(&EG(regular_list),hashed_details,hashed_details_length+1); } } if (MySG(max_links)!=-1 && MySG(num_links)>=MySG(max_links)) { @@ -584,7 +583,7 @@ /* add it to the hash */ new_index_ptr.ptr = (void *) return_value->value.lval; new_index_ptr.type = le_index_ptr; - if (zend_hash_update(list,hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry), NULL)==FAILURE) { + if (zend_hash_update(&EG(regular_list),hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry), NULL)==FAILURE) { efree(hashed_details); RETURN_FALSE; } Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.39 php4/ext/pcre/php_pcre.c:1.40 --- php4/ext/pcre/php_pcre.c:1.39 Mon Jan 17 09:33:20 2000 +++ php4/ext/pcre/php_pcre.c Sat Feb 5 07:16:11 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.39 2000/01/17 17:33:20 zeev Exp $ */ +/* $Id: php_pcre.c,v 1.40 2000/02/05 15:16:11 zeev Exp $ */ /* TODO: @@ -99,8 +99,6 @@ /* {{{ PHP_MINIT_FUNCTION(pcre) */ static PHP_MINIT_FUNCTION(pcre) { - ELS_FETCH(); - #ifdef ZTS pcre_globals_id = ts_allocate_id( sizeof(php_pcre_globals), Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.22 php4/ext/standard/array.c:1.23 --- php4/ext/standard/array.c:1.22 Tue Jan 4 05:22:58 2000 +++ php4/ext/standard/array.c Sat Feb 5 07:16:11 2000 @@ -112,8 +112,6 @@ PHP_MINIT_FUNCTION(array) { - ELS_FETCH(); - #ifdef ZTS array_globals_id = ts_allocate_id(sizeof(php_array_globals), NULL, NULL); #endif Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.12 php4/ext/standard/assert.c:1.13 --- php4/ext/standard/assert.c:1.12 Fri Dec 31 17:31:48 1999 +++ php4/ext/standard/assert.c Sat Feb 5 07:16:11 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.12 2000/01/01 01:31:48 sas Exp $ */ +/* $Id: assert.c,v 1.13 2000/02/05 15:16:11 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -103,7 +103,6 @@ { #ifdef ZTS - ELS_FETCH(); assert_globals_id = ts_allocate_id(sizeof(php_assert_globals), (ts_allocate_ctor) php_assert_init_globals, NULL); #else php_assert_init_globals(ASSERTLS_C); Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.153 php4/ext/standard/basic_functions.c:1.154 --- php4/ext/standard/basic_functions.c:1.153 Mon Jan 31 14:31:00 2000 +++ php4/ext/standard/basic_functions.c Sat Feb 5 07:16:11 2000 @@ -405,9 +405,8 @@ PHP_MINIT_FUNCTION(basic) { - ELS_FETCH(); #ifdef ZTS - basic_globals_id = ts_allocate_id(sizeof(php_basic_globals), (ts_allocate_ctor) basic_globals_ctor, basic_globals_dtor); + basic_globals_id = ts_allocate_id(sizeof(php_basic_globals), (ts_allocate_ctor) basic_globals_ctor, (ts_allocate_dtor) basic_globals_dtor); #else basic_globals_ctor(BLS_C); #endif Index: php4/ext/standard/crypt.c diff -u php4/ext/standard/crypt.c:1.15 php4/ext/standard/crypt.c:1.16 --- php4/ext/standard/crypt.c:1.15 Fri Dec 31 17:31:48 1999 +++ php4/ext/standard/crypt.c Sat Feb 5 07:16:11 2000 @@ -17,7 +17,7 @@ | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.15 2000/01/01 01:31:48 sas Exp $ */ +/* $Id: crypt.c,v 1.16 2000/02/05 15:16:11 zeev Exp $ */ #include <stdlib.h> #include "php.h" @@ -92,8 +92,6 @@ PHP_MINIT_FUNCTION(crypt) { - ELS_FETCH(); - #if PHP3_STD_DES_CRYPT REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 2, CONST_CS | CONST_PERSISTENT); #else Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.20 php4/ext/standard/dl.c:1.21 --- php4/ext/standard/dl.c:1.20 Fri Dec 31 17:31:50 1999 +++ php4/ext/standard/dl.c Sat Feb 5 07:16:11 2000 @@ -87,6 +87,7 @@ zend_module_entry *module_entry,*tmp; zend_module_entry *(*get_module)(void); PLS_FETCH(); + ELS_FETCH(); if (cfg_get_string("extension_dir",&PG(extension_dir))==SUCCESS && PG(extension_dir) @@ -130,7 +131,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)==FAILURE) { + if (module_entry->module_startup_func(type, module_entry->module_number ELS_CC)==FAILURE) { php_error(E_CORE_WARNING,"%s: Unable to initialize module",module_entry->name); dlclose(handle); RETURN_FALSE; @@ -140,7 +141,7 @@ if (module_entry->request_startup_func) { - if (module_entry->request_startup_func(type, module_entry->module_number)) { + if (module_entry->request_startup_func(type, module_entry->module_number ELS_CC)) { php_error(E_CORE_WARNING,"%s: Unable to initialize module",module_entry->name); dlclose(handle); RETURN_FALSE; Index: php4/ext/standard/html.c diff -u php4/ext/standard/html.c:1.11 php4/ext/standard/html.c:1.12 --- php4/ext/standard/html.c:1.11 Fri Dec 31 17:31:52 1999 +++ php4/ext/standard/html.c Sat Feb 5 07:16:11 2000 @@ -100,7 +100,6 @@ void register_html_constants(INIT_FUNC_ARGS) { - ELS_FETCH(); REGISTER_LONG_CONSTANT("HTML_SPECIALCHARS", HTML_SPECIALCHARS, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("HTML_ENTITIES", HTML_ENTITIES, CONST_PERSISTENT|CONST_CS); } Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.58 php4/ext/standard/info.c:1.59 --- php4/ext/standard/info.c:1.58 Wed Feb 2 06:15:33 2000 +++ php4/ext/standard/info.c Sat Feb 5 07:16:11 2000 @@ -430,8 +430,6 @@ void register_phpinfo_constants(INIT_FUNC_ARGS) { - ELS_FETCH(); - REGISTER_LONG_CONSTANT("INFO_GENERAL", PHP_INFO_GENERAL, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("INFO_CREDITS", PHP_INFO_CREDITS, CONST_PERSISTENT|CONST_CS); REGISTER_LONG_CONSTANT("INFO_CONFIGURATION", PHP_INFO_CONFIGURATION, CONST_PERSISTENT|CONST_CS); Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.12 php4/ext/standard/syslog.c:1.13 --- php4/ext/standard/syslog.c:1.12 Fri Dec 31 17:31:53 1999 +++ php4/ext/standard/syslog.c Sat Feb 5 07:16:11 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.12 2000/01/01 01:31:53 sas Exp $ */ +/* $Id: syslog.c,v 1.13 2000/02/05 15:16:11 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -44,8 +44,6 @@ PHP_MINIT_FUNCTION(syslog) { - ELS_FETCH(); - /* error levels */ REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */ REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */ Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.14 php4/ext/sybase_ct/php_sybase_ct.c:1.15 --- php4/ext/sybase_ct/php_sybase_ct.c:1.14 Sat Jan 15 05:39:15 2000 +++ php4/ext/sybase_ct/php_sybase_ct.c Sat Feb 5 07:16:11 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.14 2000/01/15 13:39:15 thies Exp $ */ +/* $Id: php_sybase_ct.c,v 1.15 2000/02/05 15:16:11 zeev Exp $ */ #include "php.h" @@ -78,7 +78,6 @@ php_sybase_globals sybase_globals; static CS_CONTEXT *context; -static HashTable *resource_list,*resource_plist; #define CHECK_LINK(link) { if (link==-1) { php_error(E_WARNING,"Sybase: A link to the server could not be established"); RETURN_FALSE; } } @@ -125,15 +124,11 @@ static void _close_sybase_link(sybase_link *sybase_ptr) { CS_INT con_status; + ELS_FETCH(); sybase_ptr->valid = 0; - /* - this can cause crashes in the current model. - if the resource gets destroyed via destroy_resource_list() resource_list - will *not* be in a consistent state. thies@digicol.de - */ - zend_hash_apply(resource_list,(int (*)(void *))_clean_invalid_results); + zend_hash_apply(&EG(regular_list),(int (*)(void *))_clean_invalid_results); /* Non-persistent connections will always be connected or we wouldn't * get here, but since we want to check the death status anyway @@ -397,10 +392,8 @@ char *hashed_details; int hashed_details_length; sybase_link *sybase_ptr; + ELS_FETCH(); - resource_list = list; - resource_plist = plist; - switch(ARG_COUNT(ht)) { case 0: /* defaults */ host=user=passwd=NULL; @@ -468,7 +461,7 @@ list_entry *le; /* try to find if we already have this link in our persistent list */ - if (zend_hash_find(plist, hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) { /* we don't */ + if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) { /* we don't */ list_entry new_le; if (sybase_globals.max_links!=-1 && sybase_globals.num_links>=sybase_globals.max_links) { @@ -492,7 +485,7 @@ /* hash it up */ new_le.type = sybase_globals.le_plink; new_le.ptr = sybase_ptr; - if (zend_hash_update(plist, hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry),NULL)==FAILURE) { + if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry),NULL)==FAILURE) { ct_close(sybase_ptr->connection, CS_UNUSED); ct_con_drop(sybase_ptr->connection); free(sybase_ptr); @@ -554,7 +547,7 @@ * if it doesn't, open a new sybase link, add it to the resource list, * and add a pointer to it with hashed_details as the key. */ - if (zend_hash_find(list,hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) { + if (zend_hash_find(&EG(regular_list),hashed_details,hashed_details_length+1,(void **) &index_ptr)==SUCCESS) { int type,link; void *ptr; @@ -570,7 +563,7 @@ efree(hashed_details); return; } else { - zend_hash_del(list,hashed_details,hashed_details_length+1); + zend_hash_del(&EG(regular_list),hashed_details,hashed_details_length+1); } } if (sybase_globals.max_links!=-1 && sybase_globals.num_links>=sybase_globals.max_links) { @@ -592,7 +585,7 @@ /* add it to the hash */ new_index_ptr.ptr = (void *) return_value->value.lval; new_index_ptr.type = le_index_ptr; - if (zend_hash_update(list,hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry),NULL)==FAILURE) { + if (zend_hash_update(&EG(regular_list),hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry),NULL)==FAILURE) { ct_close(sybase_ptr->connection, CS_UNUSED); ct_con_drop(sybase_ptr->connection); efree(sybase_ptr);