[PHP4BETA] CVS update: php4/ext/standard

Date: Wednesday April 21, 1999 @ 13:28 Author: zeev Update of /repository/php4/ext/standard In directory php:/tmp/cvs-serv20359/ext/standard Modified Files: basic_functions.c syslog.c Log Message: Thread safety patch. It works now with just-in-time resource initialization! Index: php4/ext/standard/basic_functions.c diff -c php4/ext/standard/basic_functions.c:1.3 php4/ext/standard/basic_functions.c:1.4 *** php4/ext/standard/basic_functions.c:1.3 Wed Apr 21 00:02:11 1999 --- php4/ext/standard/basic_functions.c Wed Apr 21 13:28:54 1999 *************** *** 374,380 **** int php3_minit_basic(INIT_FUNC_ARGS) { ! TLS_VARS; REGISTER_DOUBLE_CONSTANT("M_PI", M_PI, CONST_CS | CONST_PERSISTENT); test_class_startup(); --- 374,380 ---- int php3_minit_basic(INIT_FUNC_ARGS) { ! ELS_FETCH(); REGISTER_DOUBLE_CONSTANT("M_PI", M_PI, CONST_CS | CONST_PERSISTENT); test_class_startup(); *************** *** 2088,2093 **** --- 2088,2094 ---- pval *var, *val, *non_cs; int case_sensitive; zend_constant c; + ELS_FETCH(); switch(ARG_COUNT(ht)) { case 2: *************** *** 2128,2134 **** c.flags = case_sensitive | ~CONST_PERSISTENT; /* non persistent */ c.name = php3_strndup(var->value.str.val, var->value.str.len); c.name_len = var->value.str.len+1; ! zend_register_constant(&c); RETURN_TRUE; } --- 2129,2135 ---- c.flags = case_sensitive | ~CONST_PERSISTENT; /* non persistent */ c.name = php3_strndup(var->value.str.val, var->value.str.len); c.name_len = var->value.str.len+1; ! zend_register_constant(&c ELS_CC); RETURN_TRUE; } Index: php4/ext/standard/syslog.c diff -c php4/ext/standard/syslog.c:1.1 php4/ext/standard/syslog.c:1.2 *** php4/ext/standard/syslog.c:1.1 Fri Apr 16 20:37:07 1999 --- php4/ext/standard/syslog.c Wed Apr 21 13:28:54 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: syslog.c,v 1.1 1999/04/17 00:37:07 ssb Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: syslog.c,v 1.2 1999/04/21 17:28:54 zeev Exp $ */ #ifdef THREAD_SAFE #include "tls.h" #endif *************** *** 57,63 **** int php3_minit_syslog(INIT_FUNC_ARGS) { ! TLS_VARS; /* error levels */ REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */ --- 57,63 ---- int php3_minit_syslog(INIT_FUNC_ARGS) { ! ELS_FETCH(); /* error levels */ REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */ -- PHP 4 Beta