cvs: php4 /ext/bcmath bcmath.c /ext/calendar calendar.c /ext/com COM.c /ext/cpdf cpdf.c /ext/crack crack.c /ext/ctype ctype.c /ext/dbplus
dbplus.c /ext/exif exif.c /ext/fbsql php_fbsql.c /ext/filepro filepro.c /ext/ftp php_ftp.c /ext/gmp gmp.c /ext/hyperwave hw.c /ext/iisfunc
setup.c /ext/imap php_imap.c /ext/ingres_ii ii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext/java java.c /ext/mbstring mbstring.c
/ext/mcal php_mcal.c /ext/mssql php_mssql.c /ext/muscat muscat.c /ext/mysql php_mysql.c /ext/ncurses ncurses.c /ext/notes php_notes.c /ext/oci8
oci8.c /ext/odbc php_odbc.c /ext/oracle oracle.c /ext/pfpro pfpro.c /ext/pgsql pgsql.c /ext/printer printer.c /ext/qtdom qtdom.c /ext/recode
recode.c /ext/sablot sablot.c /ext/satellite php_orbit.c /ext/session session.c /ext/skeleton skeleton.c /ext/standard assert.c basic_functions.c
dl.c file.c filestat.c fsock.c info.c mail.c reg.c string.c syslog.c url_scanner_ex.c /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c
/ext/vpopmail php_vpopmail.c /ext/xml xml.c /ext/yp yp.c /ext/zlib zlib.c /main main.c /sapi/apache php_apache.c
| From: | Zeev Suraski | Date: | Mon, 30 Jul 2001 06:18:13 +0000 |
| Subject: | cvs: php4 /ext/bcmath bcmath.c /ext/calendar calendar.c /ext/com COM.c /ext/cpdf cpdf.c /ext/crack crack.c /ext/ctype ctype.c /ext/dbplus dbplus.c /ext/exif exif.c /ext/fbsql php_fbsql.c /ext/filepro filepro.c /ext/ftp php_ftp.c /ext/gmp gmp.c /ext/hyperwave hw.c /ext/iisfunc setup.c /ext/imap php_imap.c /ext/ingres_ii ii.c /ext/interbase interbase.c /ext/ircg ircg.c /ext/java java.c /ext/mbstring mbstring.c /ext/mcal php_mcal.c /ext/mssql php_mssql.c /ext/muscat muscat.c /ext/mysql php_mysql.c /ext/ncurses ncurses.c /ext/notes php_notes.c /ext/oci8 oci8.c /ext/odbc php_odbc.c /ext/oracle oracle.c /ext/pfpro pfpro.c /ext/pgsql pgsql.c /ext/printer printer.c /ext/qtdom qtdom.c /ext/recode recode.c /ext/sablot sablot.c /ext/satellite php_orbit.c /ext/session session.c /ext/skeleton skeleton.c /ext/standard assert.c basic_functions.c dl.c file.c filestat.c fsock.c info.c mail.c reg.c string.c syslog.c url_scanner_ex.c /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c /ext/vpopmail php_vpopmail.c /ext/xml xml.c /ext/yp yp.c /ext/zlib zlib.c /main main.c /sapi/apache php_apache.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6401@lists.php.net to get a copy of this message | ||
zeev Mon Jul 30 02:18:13 2001 EDT
Modified files:
/php4/ext/bcmath bcmath.c
/php4/ext/calendar calendar.c
/php4/ext/com COM.c
/php4/ext/cpdf cpdf.c
/php4/ext/crack crack.c
/php4/ext/ctype ctype.c
/php4/ext/dbplus dbplus.c
/php4/ext/exif exif.c
/php4/ext/fbsql php_fbsql.c
/php4/ext/filepro filepro.c
/php4/ext/ftp php_ftp.c
/php4/ext/gmp gmp.c
/php4/ext/hyperwave hw.c
/php4/ext/iisfunc setup.c
/php4/ext/imap php_imap.c
/php4/ext/ingres_ii ii.c
/php4/ext/interbase interbase.c
/php4/ext/ircg ircg.c
/php4/ext/java java.c
/php4/ext/mbstring mbstring.c
/php4/ext/mcal php_mcal.c
/php4/ext/mssql php_mssql.c
/php4/ext/muscat muscat.c
/php4/ext/mysql php_mysql.c
/php4/ext/ncurses ncurses.c
/php4/ext/notes php_notes.c
/php4/ext/oci8 oci8.c
/php4/ext/odbc php_odbc.c
/php4/ext/oracle oracle.c
/php4/ext/pfpro pfpro.c
/php4/ext/pgsql pgsql.c
/php4/ext/printer printer.c
/php4/ext/qtdom qtdom.c
/php4/ext/recode recode.c
/php4/ext/sablot sablot.c
/php4/ext/satellite php_orbit.c
/php4/ext/session session.c
/php4/ext/skeleton skeleton.c
/php4/ext/standard assert.c basic_functions.c dl.c file.c
filestat.c fsock.c info.c mail.c reg.c string.c
syslog.c url_scanner_ex.c
/php4/ext/sybase php_sybase_db.c
/php4/ext/sybase_ct php_sybase_ct.c
/php4/ext/vpopmail php_vpopmail.c
/php4/ext/xml xml.c
/php4/ext/yp yp.c
/php4/ext/zlib zlib.c
/php4/main main.c
/php4/sapi/apache php_apache.c
Log:
More TSRMLS_FETCH work, and a bit of cleanup
Index: php4/ext/bcmath/bcmath.c diff -u php4/ext/bcmath/bcmath.c:1.29 php4/ext/bcmath/bcmath.c:1.30 --- php4/ext/bcmath/bcmath.c:1.29 Wed Jun 6 09:05:41 2001 +++ php4/ext/bcmath/bcmath.c Mon Jul 30 02:17:49 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bcmath.c,v 1.29 2001/06/06 13:05:41 rasmus Exp $ */ +/* $Id: bcmath.c,v 1.30 2001/07/30 06:17:49 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -126,9 +126,9 @@ PHP_MINFO_FUNCTION(bcmath) { - php_info_print_table_start(); - php_info_print_table_row(2, "BCMath support", "enabled"); - php_info_print_table_end(); + php_info_print_table_start(); + php_info_print_table_row(2, "BCMath support", "enabled"); + php_info_print_table_end(); } /* {{{ proto string bcadd(string left_operand, string right_operand [, int scale]) Index: php4/ext/calendar/calendar.c diff -u php4/ext/calendar/calendar.c:1.16 php4/ext/calendar/calendar.c:1.17 --- php4/ext/calendar/calendar.c:1.16 Fri Jul 6 05:51:03 2001 +++ php4/ext/calendar/calendar.c Mon Jul 30 02:17:49 2001 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: calendar.c,v 1.16 2001/07/06 09:51:03 dbeu Exp $ */ +/* $Id: calendar.c,v 1.17 2001/07/30 06:17:49 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,14 +57,14 @@ zend_module_entry calendar_module_entry = { - "calendar", - calendar_functions, - PHP_MINIT(calendar), - NULL, - NULL, - NULL, - PHP_MINFO(calendar), - STANDARD_MODULE_PROPERTIES, + "calendar", + calendar_functions, + PHP_MINIT(calendar), + NULL, + NULL, + NULL, + PHP_MINFO(calendar), + STANDARD_MODULE_PROPERTIES, }; #ifdef COMPILE_DL_CALENDAR Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.35 php4/ext/com/COM.c:1.36 --- php4/ext/com/COM.c:1.35 Mon Jul 30 00:57:55 2001 +++ php4/ext/com/COM.c Mon Jul 30 02:17:49 2001 @@ -352,7 +352,6 @@ char *typelib_name_buffer; char *strtok_buf = NULL; int interactive; - TSRMLS_FETCH(); interactive = CG(interactive); Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.28 php4/ext/cpdf/cpdf.c:1.29 --- php4/ext/cpdf/cpdf.c:1.28 Sat Jul 28 07:35:43 2001 +++ php4/ext/cpdf/cpdf.c Mon Jul 30 02:17:49 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.28 2001/07/28 11:35:43 zeev Exp $ */ +/* $Id: cpdf.c,v 1.29 2001/07/30 06:17:49 zeev Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -205,7 +205,8 @@ php_info_print_table_end(); } -PHP_MSHUTDOWN_FUNCTION(cpdf){ +PHP_MSHUTDOWN_FUNCTION(cpdf) +{ return SUCCESS; } Index: php4/ext/crack/crack.c diff -u php4/ext/crack/crack.c:1.6 php4/ext/crack/crack.c:1.7 --- php4/ext/crack/crack.c:1.6 Sat Jul 28 07:35:44 2001 +++ php4/ext/crack/crack.c Mon Jul 30 02:17:50 2001 @@ -15,7 +15,7 @@ | Authors: | +----------------------------------------------------------------------+ */ -/* $Id: crack.c,v 1.6 2001/07/28 11:35:44 zeev Exp $ */ +/* $Id: crack.c,v 1.7 2001/07/30 06:17:50 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -104,7 +104,6 @@ ZEND_MSHUTDOWN_FUNCTION(crack) { UNREGISTER_INI_ENTRIES(); - return SUCCESS; } @@ -118,12 +117,9 @@ ZEND_RSHUTDOWN_FUNCTION(crack) { - TSRMLS_FETCH(); - if (NULL != CRACKG(last_message)) { efree(CRACKG(last_message)); } - return SUCCESS; } Index: php4/ext/ctype/ctype.c diff -u php4/ext/ctype/ctype.c:1.9 php4/ext/ctype/ctype.c:1.10 --- php4/ext/ctype/ctype.c:1.9 Sat Jul 28 07:35:44 2001 +++ php4/ext/ctype/ctype.c Mon Jul 30 02:17:50 2001 @@ -85,8 +85,6 @@ */ PHP_MINFO_FUNCTION(ctype) { - TSRMLS_FETCH(); - php_info_print_table_start(); php_info_print_table_row(2, "ctype functions", "enabled (experimental)"); php_info_print_table_end(); Index: php4/ext/dbplus/dbplus.c diff -u php4/ext/dbplus/dbplus.c:1.2 php4/ext/dbplus/dbplus.c:1.3 --- php4/ext/dbplus/dbplus.c:1.2 Sun Jul 29 21:56:22 2001 +++ php4/ext/dbplus/dbplus.c Mon Jul 30 02:17:51 2001 @@ -147,9 +147,6 @@ PHP_MSHUTDOWN_FUNCTION(dbplus) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ return SUCCESS; } Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.21 php4/ext/exif/exif.c:1.22 --- php4/ext/exif/exif.c:1.21 Tue Jun 26 05:52:54 2001 +++ php4/ext/exif/exif.c Mon Jul 30 02:17:51 2001 @@ -142,7 +142,8 @@ /* {{{ PHP_MINFO_FUNCTION */ -PHP_MINFO_FUNCTION(exif) { +PHP_MINFO_FUNCTION(exif) +{ php_info_print_table_start(); php_info_print_table_row(2, "EXIF Support", "enabled" ); php_info_print_table_end(); Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.38 php4/ext/fbsql/php_fbsql.c:1.39 --- php4/ext/fbsql/php_fbsql.c:1.38 Sat Jul 28 07:35:48 2001 +++ php4/ext/fbsql/php_fbsql.c Mon Jul 30 02:17:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.38 2001/07/28 11:35:48 zeev Exp $ */ +/* $Id: php_fbsql.c,v 1.39 2001/07/30 06:17:51 zeev Exp $ */ /* TODO: * @@ -405,7 +405,6 @@ PHP_MINFO_FUNCTION(fbsql) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "FrontBase support", "enabled"); Index: php4/ext/filepro/filepro.c diff -u php4/ext/filepro/filepro.c:1.35 php4/ext/filepro/filepro.c:1.36 --- php4/ext/filepro/filepro.c:1.35 Sat Jul 28 07:35:50 2001 +++ php4/ext/filepro/filepro.c Mon Jul 30 02:17:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filepro.c,v 1.35 2001/07/28 11:35:50 zeev Exp $ */ +/* $Id: filepro.c,v 1.36 2001/07/30 06:17:51 zeev Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -120,10 +120,11 @@ SET_MUTEX(fp_mutex); numthreads--; if (!numthreads){ - if (!TlsFree(FPTls)){ - FREE_MUTEX(fp_mutex); - return 0; - }} + if (!TlsFree(FPTls)){ + FREE_MUTEX(fp_mutex); + return 0; + } + } FREE_MUTEX(fp_mutex); #endif #endif Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.36 php4/ext/ftp/php_ftp.c:1.37 --- php4/ext/ftp/php_ftp.c:1.36 Mon Jul 30 00:57:56 2001 +++ php4/ext/ftp/php_ftp.c Mon Jul 30 02:17:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.36 2001/07/30 04:57:56 zeev Exp $ */ +/* $Id: php_ftp.c,v 1.37 2001/07/30 06:17:52 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -98,9 +98,9 @@ PHP_MINFO_FUNCTION(ftp) { - php_info_print_table_start(); - php_info_print_table_row(2, "FTP support", "enabled"); - php_info_print_table_end(); + php_info_print_table_start(); + php_info_print_table_row(2, "FTP support", "enabled"); + php_info_print_table_end(); } Index: php4/ext/gmp/gmp.c diff -u php4/ext/gmp/gmp.c:1.13 php4/ext/gmp/gmp.c:1.14 --- php4/ext/gmp/gmp.c:1.13 Sun Jul 29 21:56:25 2001 +++ php4/ext/gmp/gmp.c Mon Jul 30 02:17:52 2001 @@ -154,9 +154,6 @@ */ ZEND_MSHUTDOWN_FUNCTION(gmp) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ return SUCCESS; } /* }}} */ Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.86 php4/ext/hyperwave/hw.c:1.87 --- php4/ext/hyperwave/hw.c:1.86 Sun Jul 29 21:56:25 2001 +++ php4/ext/hyperwave/hw.c Mon Jul 30 02:17:53 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.86 2001/07/30 01:56:25 zeev Exp $ */ +/* $Id: hw.c,v 1.87 2001/07/30 06:17:53 zeev Exp $ */ #include <stdlib.h> #include <errno.h> @@ -196,8 +196,6 @@ static PHP_INI_MH(OnHyperwavePort) { - TSRMLS_FETCH(); - if (new_value==NULL) { HwSG(default_port) = HG_SERVER_PORT; } else { Index: php4/ext/iisfunc/setup.c diff -u php4/ext/iisfunc/setup.c:1.5 php4/ext/iisfunc/setup.c:1.6 --- php4/ext/iisfunc/setup.c:1.5 Thu May 24 06:07:08 2001 +++ php4/ext/iisfunc/setup.c Mon Jul 30 02:17:53 2001 @@ -15,7 +15,7 @@ | Authors: Frank M. Kromann <fmk@swwwing.com> | +----------------------------------------------------------------------+ */ -/* $Id: setup.c,v 1.5 2001/05/24 10:07:08 ssb Exp $ */ +/* $Id: setup.c,v 1.6 2001/07/30 06:17:53 zeev Exp $ */ #ifdef COMPILE_DL_IISFUNC #define HAVE_IISFUNC 1 @@ -98,7 +98,6 @@ { php_info_print_table_start(); php_info_print_table_row(2, "IIS Admin Functions support", "enabled"); - php_info_print_table_end(); } Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.87 php4/ext/imap/php_imap.c:1.88 --- php4/ext/imap/php_imap.c:1.87 Sat Jul 28 07:35:54 2001 +++ php4/ext/imap/php_imap.c Mon Jul 30 02:17:53 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.87 2001/07/28 11:35:54 zeev Exp $ */ +/* $Id: php_imap.c,v 1.88 2001/07/30 06:17:53 zeev Exp $ */ #define IMAP41 @@ -310,7 +310,6 @@ { ERRORLIST *ecur = NIL; STRINGLIST *acur = NIL; - TSRMLS_FETCH(); if (IMAPG(imap_errorstack) != NIL) { /* output any remaining errors at their original error level */ Index: php4/ext/ingres_ii/ii.c diff -u php4/ext/ingres_ii/ii.c:1.19 php4/ext/ingres_ii/ii.c:1.20 --- php4/ext/ingres_ii/ii.c:1.19 Sat Jul 28 07:35:56 2001 +++ php4/ext/ingres_ii/ii.c Mon Jul 30 02:17:54 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.19 2001/07/28 11:35:56 zeev Exp $ */ +/* $Id: ii.c,v 1.20 2001/07/30 06:17:54 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -67,14 +67,14 @@ }; zend_module_entry ingres_ii_module_entry = { - "ingres_ii", - ii_functions, - PHP_MINIT(ii), - PHP_MSHUTDOWN(ii), - PHP_RINIT(ii), - PHP_RSHUTDOWN(ii), - PHP_MINFO(ii), - STANDARD_MODULE_PROPERTIES + "ingres_ii", + ii_functions, + PHP_MINIT(ii), + PHP_MSHUTDOWN(ii), + PHP_RINIT(ii), + PHP_RSHUTDOWN(ii), + PHP_MINFO(ii), + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_INGRES_II @@ -312,8 +312,6 @@ */ PHP_RSHUTDOWN_FUNCTION(ii) { - TSRMLS_FETCH(); - if (IIG(default_link)!=-1) { zend_list_delete(IIG(default_link)); IIG(default_link) = -1; @@ -326,7 +324,6 @@ PHP_MINFO_FUNCTION(ii) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "Ingres II Support", "enabled"); Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.61 php4/ext/interbase/interbase.c:1.62 --- php4/ext/interbase/interbase.c:1.61 Mon Jul 30 00:57:57 2001 +++ php4/ext/interbase/interbase.c Mon Jul 30 02:17:55 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.61 2001/07/30 04:57:57 zeev Exp $ */ +/* $Id: interbase.c,v 1.62 2001/07/30 06:17:55 zeev Exp $ */ /* TODO: Arrays, roles? @@ -554,8 +554,6 @@ PHP_RSHUTDOWN_FUNCTION(ibase) { - TSRMLS_FETCH(); - if (IBG(timestampformat)) DL_FREE(IBG(timestampformat)); IBG(timestampformat) = NULL; @@ -583,7 +581,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.61 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.62 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif Index: php4/ext/ircg/ircg.c diff -u php4/ext/ircg/ircg.c:1.90 php4/ext/ircg/ircg.c:1.91 --- php4/ext/ircg/ircg.c:1.90 Sun Jul 29 23:05:51 2001 +++ php4/ext/ircg/ircg.c Mon Jul 30 02:17:55 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg.c,v 1.90 2001/07/30 03:05:51 sas Exp $ */ +/* $Id: ircg.c,v 1.91 2001/07/30 06:17:55 zeev Exp $ */ #include <time.h> @@ -1731,6 +1731,7 @@ PHP_MINFO_FUNCTION(ircg) { char buf[100]; + php_info_print_table_start(); php_info_print_table_header(2, "ircg support", "enabled"); sprintf(buf, "%lu", cache_hits); Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.50 php4/ext/java/java.c:1.51 --- php4/ext/java/java.c:1.50 Sun Jul 29 21:56:28 2001 +++ php4/ext/java/java.c Mon Jul 30 02:17:56 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.50 2001/07/30 01:56:28 zeev Exp $ */ +/* $Id: java.c,v 1.51 2001/07/30 06:17:56 zeev Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -106,10 +106,11 @@ static zend_class_entry java_class_entry; -static PHP_INI_MH(OnIniUpdate) { - if (new_value) *(char**)mh_arg1 = new_value; - iniUpdated=1; - return SUCCESS; +static PHP_INI_MH(OnIniUpdate) +{ + if (new_value) *(char**)mh_arg1 = new_value; + iniUpdated=1; + return SUCCESS; } PHP_INI_BEGIN() Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.25 php4/ext/mbstring/mbstring.c:1.26 --- php4/ext/mbstring/mbstring.c:1.25 Mon Jul 30 01:36:13 2001 +++ php4/ext/mbstring/mbstring.c Mon Jul 30 02:17:56 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.25 2001/07/30 05:36:13 zeev Exp $ */ +/* $Id: mbstring.c,v 1.26 2001/07/30 06:17:56 zeev Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -287,7 +287,6 @@ static PHP_INI_MH(OnUpdate_mbstring_detect_order) { int *list, size; - TSRMLS_FETCH(); if (php_mbstring_parse_encoding_list(new_value, new_value_length, &list, &size, 1)) { if (MBSTRG(detect_order_list) != NULL) { @@ -305,7 +304,6 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input) { int *list, size; - TSRMLS_FETCH(); if (php_mbstring_parse_encoding_list(new_value, new_value_length, &list, &size, 1)) { if (MBSTRG(http_input_list) != NULL) { @@ -323,7 +321,6 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output) { enum mbfl_no_encoding no_encoding; - TSRMLS_FETCH(); no_encoding = mbfl_name2no_encoding(new_value); if (no_encoding != mbfl_no_encoding_invalid) { @@ -341,7 +338,6 @@ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding) { enum mbfl_no_encoding no_encoding; - TSRMLS_FETCH(); no_encoding = mbfl_name2no_encoding(new_value); if (no_encoding != mbfl_no_encoding_invalid) { @@ -358,8 +354,6 @@ static PHP_INI_MH(OnUpdate_mbstring_substitute_character) { - TSRMLS_FETCH(); - if (new_value != NULL) { if (strcasecmp("none", new_value) == 0) { MBSTRG(filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE; @@ -428,7 +422,6 @@ PHP_MSHUTDOWN_FUNCTION(mbstring) { - TSRMLS_FETCH(); UNREGISTER_INI_ENTRIES(); if (MBSTRG(http_input_list)) { @@ -477,8 +470,6 @@ PHP_RSHUTDOWN_FUNCTION(mbstring) { - TSRMLS_FETCH(); - if (MBSTRG(current_detect_order_list) != NULL) { efree(MBSTRG(current_detect_order_list)); MBSTRG(current_detect_order_list) = NULL; Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.42 php4/ext/mcal/php_mcal.c:1.43 --- php4/ext/mcal/php_mcal.c:1.42 Thu May 24 06:07:11 2001 +++ php4/ext/mcal/php_mcal.c Mon Jul 30 02:17:56 2001 @@ -139,8 +139,8 @@ { char tmp[128]; - php_info_print_table_start(); - php_info_print_table_row(2, "MCAL Support", "enabled" ); + php_info_print_table_start(); + php_info_print_table_row(2, "MCAL Support", "enabled" ); #ifdef MCALVER snprintf(tmp, 128, "%s<BR>%d", CALVER, MCALVER); #else Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.59 php4/ext/mssql/php_mssql.c:1.60 --- php4/ext/mssql/php_mssql.c:1.59 Mon Jul 30 00:57:58 2001 +++ php4/ext/mssql/php_mssql.c Mon Jul 30 02:17:57 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.59 2001/07/30 04:57:58 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.60 2001/07/30 06:17:57 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -348,8 +348,6 @@ PHP_RSHUTDOWN_FUNCTION(mssql) { - TSRMLS_FETCH(); - STR_FREE(MS_SQL_G(appname)); if (MS_SQL_G(server_message)) { STR_FREE(MS_SQL_G(server_message)); @@ -360,7 +358,6 @@ PHP_MINFO_FUNCTION(mssql) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "MSSQL Support", "enabled"); Index: php4/ext/muscat/muscat.c diff -u php4/ext/muscat/muscat.c:1.6 php4/ext/muscat/muscat.c:1.7 --- php4/ext/muscat/muscat.c:1.6 Mon Jul 30 00:57:59 2001 +++ php4/ext/muscat/muscat.c Mon Jul 30 02:17:58 2001 @@ -112,9 +112,6 @@ PHP_MSHUTDOWN_FUNCTION(muscat) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ return SUCCESS; } Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.91 php4/ext/mysql/php_mysql.c:1.92 --- php4/ext/mysql/php_mysql.c:1.91 Sat Jul 28 15:02:53 2001 +++ php4/ext/mysql/php_mysql.c Mon Jul 30 02:17:58 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.91 2001/07/28 19:02:53 andi Exp $ */ +/* $Id: php_mysql.c,v 1.92 2001/07/30 06:17:58 zeev Exp $ */ /* TODO: @@ -211,10 +211,8 @@ /* {{{ php_mysql_set_default_link */ -static void php_mysql_set_default_link(int id) +static void php_mysql_set_default_link(int id TSRMLS_DC) { - TSRMLS_FETCH(); - if (MySG(default_link)!=-1) { zend_list_delete(MySG(default_link)); } @@ -261,8 +259,6 @@ */ static PHP_INI_MH(OnMySQLPort) { - TSRMLS_FETCH(); - if (new_value==NULL) { /* default port */ #ifndef PHP_WIN32 struct servent *serv_ptr; @@ -360,7 +356,6 @@ */ PHP_RSHUTDOWN_FUNCTION(mysql) { - TSRMLS_FETCH(); if (MySG(connect_error)!=NULL) { efree(MySG(connect_error)); } @@ -373,7 +368,6 @@ PHP_MINFO_FUNCTION(mysql) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "MySQL Support", "enabled"); @@ -606,7 +600,7 @@ if (ptr && (type==le_link || type==le_plink)) { zend_list_addref(link); return_value->value.lval = link; - php_mysql_set_default_link(link); + php_mysql_set_default_link(link TSRMLS_CC); return_value->type = IS_RESOURCE; efree(hashed_details); MYSQL_DO_CONNECT_CLEANUP(); @@ -656,7 +650,7 @@ } efree(hashed_details); - php_mysql_set_default_link(return_value->value.lval); + php_mysql_set_default_link(return_value->value.lval TSRMLS_CC); MYSQL_DO_CONNECT_CLEANUP(); } /* }}} */ @@ -953,11 +947,10 @@ /* {{{ php_mysql_do_query_general */ -static void php_mysql_do_query_general(zval **query, zval **mysql_link, int link_id, zval **db, int use_store, zval *return_value) +static void php_mysql_do_query_general(zval **query, zval **mysql_link, int link_id, zval **db, int use_store, zval *return_value TSRMLS_DC) { php_mysql_conn *mysql; MYSQL_RES *mysql_result; - TSRMLS_FETCH(); ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, link_id, "MySQL-Link", le_link, le_plink); @@ -1039,7 +1032,7 @@ WRONG_PARAM_COUNT; break; } - php_mysql_do_query_general(query, mysql_link, id, NULL, use_store, return_value); + php_mysql_do_query_general(query, mysql_link, id, NULL, use_store, return_value TSRMLS_CC); } /* }}} */ @@ -1089,7 +1082,7 @@ zend_error(E_NOTICE, "%s is deprecated; use mysql_select_db() and mysql_query() instead", get_active_function_name()); - php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value); + php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value TSRMLS_CC); } /* }}} */ Index: php4/ext/ncurses/ncurses.c diff -u php4/ext/ncurses/ncurses.c:1.2 php4/ext/ncurses/ncurses.c:1.3 --- php4/ext/ncurses/ncurses.c:1.2 Sun Jul 29 21:56:32 2001 +++ php4/ext/ncurses/ncurses.c Mon Jul 30 02:17:58 2001 @@ -94,11 +94,6 @@ */ PHP_MSHUTDOWN_FUNCTION(ncurses) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); - endwin(); -*/ - return SUCCESS; } /* }}} */ Index: php4/ext/notes/php_notes.c diff -u php4/ext/notes/php_notes.c:1.3 php4/ext/notes/php_notes.c:1.4 --- php4/ext/notes/php_notes.c:1.3 Thu May 24 06:07:14 2001 +++ php4/ext/notes/php_notes.c Mon Jul 30 02:17:59 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_notes.c,v 1.3 2001/05/24 10:07:14 ssb Exp $ */ +/* $Id: php_notes.c,v 1.4 2001/07/30 06:17:59 zeev Exp $ */ #ifdef COMPILE_DL_NOTES #define HAVE_NOTES 1 @@ -140,7 +140,6 @@ { php_info_print_table_start(); - php_info_print_table_row(2, "Lotus Notes Database Support", "enabled"); php_info_print_table_end(); } Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.140 php4/ext/oci8/oci8.c:1.141 --- php4/ext/oci8/oci8.c:1.140 Mon Jul 30 00:57:59 2001 +++ php4/ext/oci8/oci8.c Mon Jul 30 02:17:59 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.140 2001/07/30 04:57:59 zeev Exp $ */ +/* $Id: oci8.c,v 1.141 2001/07/30 06:17:59 zeev Exp $ */ /* TODO list: * @@ -535,8 +535,6 @@ PHP_MSHUTDOWN_FUNCTION(oci) { - TSRMLS_FETCH(); - OCI(shutdown) = 1; oci_debug("START php_mshutdown_oci"); @@ -579,7 +577,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.140 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.141 $"); #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 ); Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.98 php4/ext/odbc/php_odbc.c:1.99 --- php4/ext/odbc/php_odbc.c:1.98 Mon Jul 30 00:58:00 2001 +++ php4/ext/odbc/php_odbc.c Mon Jul 30 02:18:00 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.98 2001/07/30 04:58:00 zeev Exp $ */ +/* $Id: php_odbc.c,v 1.99 2001/07/30 06:18:00 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -467,8 +467,6 @@ PHP_MSHUTDOWN_FUNCTION(odbc) { - TSRMLS_FETCH(); - UNREGISTER_INI_ENTRIES(); return SUCCESS; } @@ -476,7 +474,6 @@ PHP_MINFO_FUNCTION(odbc) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "ODBC Support", "enabled"); Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.68 php4/ext/oracle/oracle.c:1.69 --- php4/ext/oracle/oracle.c:1.68 Mon Jul 30 00:58:02 2001 +++ php4/ext/oracle/oracle.c Mon Jul 30 02:18:00 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.68 2001/07/30 04:58:02 zeev Exp $ */ +/* $Id: oracle.c,v 1.69 2001/07/30 06:18:00 zeev Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -361,11 +361,8 @@ */ PHP_MSHUTDOWN_FUNCTION(oracle) { - TSRMLS_FETCH(); - zend_hash_destroy(ORA(conns)); free(ORA(conns)); - return SUCCESS; } /* }}} */ @@ -1570,7 +1567,6 @@ */ PHP_MINFO_FUNCTION(oracle) { - php_info_print_table_start(); php_info_print_table_row(2, "Oracle Support", "enabled"); #ifndef PHP_WIN32 Index: php4/ext/pfpro/pfpro.c diff -u php4/ext/pfpro/pfpro.c:1.16 php4/ext/pfpro/pfpro.c:1.17 --- php4/ext/pfpro/pfpro.c:1.16 Sat Jul 28 07:36:07 2001 +++ php4/ext/pfpro/pfpro.c Mon Jul 30 02:18:01 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pfpro.c,v 1.16 2001/07/28 11:36:07 zeev Exp $ */ +/* $Id: pfpro.c,v 1.17 2001/07/30 06:18:01 zeev Exp $ */ /* {{{ includes */ @@ -107,8 +107,6 @@ PHP_RSHUTDOWN_FUNCTION(pfpro) { - TSRMLS_FETCH(); - if (PFPROG(initialized) == 1) { pfproCleanup(); } Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.117 php4/ext/pgsql/pgsql.c:1.118 --- php4/ext/pgsql/pgsql.c:1.117 Sat Jul 28 21:46:37 2001 +++ php4/ext/pgsql/pgsql.c Mon Jul 30 02:18:01 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.117 2001/07/29 01:46:37 jon Exp $ */ +/* $Id: pgsql.c,v 1.118 2001/07/30 06:18:01 zeev Exp $ */ #include <stdlib.h> @@ -293,7 +293,6 @@ */ PHP_RSHUTDOWN_FUNCTION(pgsql) { - TSRMLS_FETCH(); zend_hash_apply(&EG(persistent_list), (apply_func_t) _rollback_transactions); return SUCCESS; } @@ -304,7 +303,6 @@ PHP_MINFO_FUNCTION(pgsql) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "PostgreSQL Support", "enabled"); Index: php4/ext/printer/printer.c diff -u php4/ext/printer/printer.c:1.15 php4/ext/printer/printer.c:1.16 --- php4/ext/printer/printer.c:1.15 Sat Jul 28 07:36:10 2001 +++ php4/ext/printer/printer.c Mon Jul 30 02:18:01 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: printer.c,v 1.15 2001/07/28 11:36:10 zeev Exp $ */ +/* $Id: printer.c,v 1.16 2001/07/30 06:18:01 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -105,21 +105,17 @@ PHP_MINFO_FUNCTION(printer) { - TSRMLS_FETCH(); - php_info_print_table_start(); php_info_print_table_row(2, "Printer Support", "enabled"); php_info_print_table_row(2, "Default printing device", PRINTERG(default_printer) ? PRINTERG(default_printer) : "<b>not detected</b>"); php_info_print_table_row(2, "Module state", "working"); - php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.15 2001/07/28 11:36:10 zeev Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.16 2001/07/30 06:18:01 zeev Exp $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); } static PHP_INI_MH(OnUpdatePrinter) { - TSRMLS_FETCH(); - if(new_value != "") { if(PRINTERG(default_printer)) { efree(PRINTERG(default_printer)); Index: php4/ext/qtdom/qtdom.c diff -u php4/ext/qtdom/qtdom.c:1.7 php4/ext/qtdom/qtdom.c:1.8 --- php4/ext/qtdom/qtdom.c:1.7 Sun Jul 29 21:56:35 2001 +++ php4/ext/qtdom/qtdom.c Mon Jul 30 02:18:02 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: qtdom.c,v 1.7 2001/07/30 01:56:35 zeev Exp $ */ +/* $Id: qtdom.c,v 1.8 2001/07/30 06:18:02 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -91,7 +91,6 @@ PHP_MSHUTDOWN_FUNCTION(qtdom) { qdom_shutdown(); - return SUCCESS; } /* }}} */ Index: php4/ext/recode/recode.c diff -u php4/ext/recode/recode.c:1.16 php4/ext/recode/recode.c:1.17 --- php4/ext/recode/recode.c:1.16 Mon Jul 30 00:58:04 2001 +++ php4/ext/recode/recode.c Mon Jul 30 02:18:02 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.16 2001/07/30 04:58:04 zeev Exp $ */ +/* $Id: recode.c,v 1.17 2001/07/30 06:18:02 zeev Exp $ */ /* {{{ includes & prototypes */ @@ -84,22 +84,18 @@ PHP_MSHUTDOWN_FUNCTION(recode) { - TSRMLS_FETCH(); - - if (ReSG(outer)) + if (ReSG(outer)) { recode_delete_outer(ReSG(outer)); - + } return SUCCESS; } PHP_MINFO_FUNCTION(recode) { - TSRMLS_FETCH(); - php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.16 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.17 $"); php_info_print_table_end(); } Index: php4/ext/sablot/sablot.c diff -u php4/ext/sablot/sablot.c:1.44 php4/ext/sablot/sablot.c:1.45 --- php4/ext/sablot/sablot.c:1.44 Sat Jul 28 07:36:11 2001 +++ php4/ext/sablot/sablot.c Mon Jul 30 02:18:02 2001 @@ -239,22 +239,16 @@ PHP_MSHUTDOWN_FUNCTION(sablot) { - TSRMLS_FETCH(); - if (SABLOTG(processor)) { SablotUnregHandler(SABLOTG(processor), HLR_MESSAGE, NULL, NULL); SablotDestroyProcessor(SABLOTG(processor)); } - return SUCCESS; } PHP_RSHUTDOWN_FUNCTION(sablot) { - TSRMLS_FETCH(); - SABLOT_FREE_ERROR_HANDLE(SABLOTG_HANDLE); - return SUCCESS; } Index: php4/ext/satellite/php_orbit.c diff -u php4/ext/satellite/php_orbit.c:1.6 php4/ext/satellite/php_orbit.c:1.7 --- php4/ext/satellite/php_orbit.c:1.6 Thu May 24 06:07:23 2001 +++ php4/ext/satellite/php_orbit.c Mon Jul 30 02:18:02 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: php_orbit.c,v 1.6 2001/05/24 10:07:23 ssb Exp $ + * $Id: php_orbit.c,v 1.7 2001/07/30 06:18:02 zeev Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -80,14 +80,14 @@ * module entry */ zend_module_entry satellite_module_entry = { - "satellite", - satellite_functions, - PHP_MINIT(satellite), /* module startup */ - PHP_MSHUTDOWN(satellite), /* module shutdown */ - NULL, /* request startup */ - NULL, /* request shutdown */ - PHP_MINFO(satellite), /* module info */ - STANDARD_MODULE_PROPERTIES + "satellite", + satellite_functions, + PHP_MINIT(satellite), /* module startup */ + PHP_MSHUTDOWN(satellite), /* module shutdown */ + NULL, /* request startup */ + NULL, /* request shutdown */ + PHP_MINFO(satellite), /* module info */ + STANDARD_MODULE_PROPERTIES }; /* @@ -115,10 +115,8 @@ PHP_MSHUTDOWN_FUNCTION(satellite) { TypeManager_Shutdown(); - orbit_corba_shutdown(); - + orbit_corba_shutdown(); UNREGISTER_INI_ENTRIES(); - return SUCCESS; } @@ -132,7 +130,7 @@ php_info_print_table_header(2, "CORBA support via Satellite", "enabled"); php_info_print_table_end(); - DISPLAY_INI_ENTRIES(); + DISPLAY_INI_ENTRIES(); } /* instruct the type manager to load an IDL file if not already loaded */ Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.223 php4/ext/session/session.c:1.224 --- php4/ext/session/session.c:1.223 Sat Jul 28 07:36:12 2001 +++ php4/ext/session/session.c Mon Jul 30 02:18:02 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.223 2001/07/28 11:36:12 zeev Exp $ */ +/* $Id: session.c,v 1.224 2001/07/30 06:18:02 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -85,8 +85,6 @@ static PHP_INI_MH(OnUpdateSaveHandler) { - TSRMLS_FETCH(); - PS(mod) = _php_find_ps_module(new_value TSRMLS_CC); if(!PS(mod)) { php_error(E_ERROR,"Cannot find save handler %s",new_value); @@ -97,8 +95,6 @@ static PHP_INI_MH(OnUpdateSerializer) { - TSRMLS_FETCH(); - PS(serializer) = _php_find_ps_serializer(new_value TSRMLS_CC); if(!PS(serializer)) { php_error(E_ERROR,"Cannot find serialization handler %s",new_value); @@ -1404,8 +1400,6 @@ PHP_RSHUTDOWN_FUNCTION(session) { - TSRMLS_FETCH(); - php_session_flush(TSRMLS_C); php_rshutdown_session_globals(TSRMLS_C); return SUCCESS; @@ -1436,7 +1430,6 @@ PHP_MINFO_FUNCTION(session) { - php_info_print_table_start(); php_info_print_table_row(2, "Session Support", "enabled" ); php_info_print_table_end(); Index: php4/ext/skeleton/skeleton.c diff -u php4/ext/skeleton/skeleton.c:1.20 php4/ext/skeleton/skeleton.c:1.21 --- php4/ext/skeleton/skeleton.c:1.20 Sun Jun 24 19:29:13 2001 +++ php4/ext/skeleton/skeleton.c Mon Jul 30 02:18:05 2001 @@ -59,9 +59,6 @@ */ PHP_MINIT_FUNCTION(extname) { -/* Remove comments if you have entries in php.ini - REGISTER_INI_ENTRIES(); -*/ return SUCCESS; } /* }}} */ @@ -70,9 +67,6 @@ */ PHP_MSHUTDOWN_FUNCTION(extname) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ return SUCCESS; } /* }}} */ Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.38 php4/ext/standard/assert.c:1.39 --- php4/ext/standard/assert.c:1.38 Sun Jul 29 21:56:36 2001 +++ php4/ext/standard/assert.c Mon Jul 30 02:18:05 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.38 2001/07/30 01:56:36 zeev Exp $ */ +/* $Id: assert.c,v 1.39 2001/07/30 06:18:05 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -52,8 +52,6 @@ static PHP_INI_MH(OnChangeCallback) { - TSRMLS_FETCH(); - if (ASSERTG(callback)) { zval_ptr_dtor(&ASSERTG(callback)); } else { @@ -102,8 +100,6 @@ PHP_MSHUTDOWN_FUNCTION(assert) { - TSRMLS_FETCH(); - if (ASSERTG(callback)) { zval_ptr_dtor(&ASSERTG(callback)); } @@ -112,8 +108,6 @@ PHP_RSHUTDOWN_FUNCTION(assert) { - TSRMLS_FETCH(); - if (ASSERTG(callback)) { zval_ptr_dtor(&ASSERTG(callback)); ASSERTG(callback) = NULL; Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.366 php4/ext/standard/basic_functions.c:1.367 --- php4/ext/standard/basic_functions.c:1.366 Mon Jul 30 01:36:14 2001 +++ php4/ext/standard/basic_functions.c Mon Jul 30 02:18:05 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.366 2001/07/30 05:36:14 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.367 2001/07/30 06:18:05 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -618,7 +618,6 @@ char *protected_vars, *protected_var; char *token_buf; int dummy=1; - TSRMLS_FETCH(); protected_vars = estrndup(new_value, new_value_length); zend_hash_clean(&BG(sm_protected_env_vars)); @@ -635,8 +634,6 @@ static PHP_INI_MH(OnUpdateSafeModeAllowedEnvVars) { - TSRMLS_FETCH(); - if (BG(sm_allowed_env_vars)) { free(BG(sm_allowed_env_vars)); } @@ -799,9 +796,6 @@ PHP_MSHUTDOWN_FUNCTION(basic) { - TSRMLS_FETCH(); - - #ifdef ZTS ts_free_id(basic_globals_id); #else @@ -878,8 +872,6 @@ PHP_RSHUTDOWN_FUNCTION(basic) { - TSRMLS_FETCH(); - STR_FREE(BG(strtok_string)); BG(strtok_string) = NULL; #ifdef HAVE_PUTENV Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.56 php4/ext/standard/dl.c:1.57 --- php4/ext/standard/dl.c:1.56 Sat Jul 28 07:36:15 2001 +++ php4/ext/standard/dl.c Mon Jul 30 02:18:05 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.56 2001/07/28 11:36:15 zeev Exp $ */ +/* $Id: dl.c,v 1.57 2001/07/30 06:18:05 zeev Exp $ */ #include "php.h" #include "dl.h" @@ -203,7 +203,7 @@ PHP_MINFO_FUNCTION(dl) { - php_info_print_table_row(2, "Dynamic Library Support", "enabled"); + php_info_print_table_row(2, "Dynamic Library Support", "enabled"); } #else Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.171 php4/ext/standard/file.c:1.172 --- php4/ext/standard/file.c:1.171 Mon Jul 30 00:58:05 2001 +++ php4/ext/standard/file.c Mon Jul 30 02:18:06 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.171 2001/07/30 04:58:05 zeev Exp $ */ +/* $Id: file.c,v 1.172 2001/07/30 06:18:06 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -219,8 +219,6 @@ PHP_MSHUTDOWN_FUNCTION(file) { #ifndef ZTS - TSRMLS_FETCH(); - file_globals_dtor(&file_globals TSRMLS_CC); #endif return SUCCESS; Index: php4/ext/standard/filestat.c diff -u php4/ext/standard/filestat.c:1.72 php4/ext/standard/filestat.c:1.73 --- php4/ext/standard/filestat.c:1.72 Sat Jul 28 07:36:16 2001 +++ php4/ext/standard/filestat.c Mon Jul 30 02:18:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.72 2001/07/28 11:36:16 zeev Exp $ */ +/* $Id: filestat.c,v 1.73 2001/07/30 06:18:06 zeev Exp $ */ #include "php.h" #include "safe_mode.h" @@ -96,8 +96,6 @@ PHP_RSHUTDOWN_FUNCTION(filestat) { - TSRMLS_FETCH(); - if (BG(CurrentStatFile)) { efree (BG(CurrentStatFile)); } Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.72 php4/ext/standard/fsock.c:1.73 --- php4/ext/standard/fsock.c:1.72 Sat Jul 28 07:36:16 2001 +++ php4/ext/standard/fsock.c Mon Jul 30 02:18:06 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.72 2001/07/28 11:36:16 zeev Exp $ */ +/* $Id: fsock.c,v 1.73 2001/07/30 06:18:06 zeev Exp $ */ /* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */ /* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */ @@ -752,8 +752,6 @@ PHP_RSHUTDOWN_FUNCTION(fsock) { - TSRMLS_FETCH(); - php_cleanup_sockbuf(0 TSRMLS_CC); return SUCCESS; } Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.144 php4/ext/standard/info.c:1.145 --- php4/ext/standard/info.c:1.144 Sat Jul 28 07:36:17 2001 +++ php4/ext/standard/info.c Mon Jul 30 02:18:06 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.144 2001/07/28 11:36:17 zeev Exp $ */ +/* $Id: info.c,v 1.145 2001/07/30 06:18:06 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -42,10 +42,11 @@ static int _display_module_info(zend_module_entry *module, void *arg) { int show_info_func = *((int *) arg); + TSRMLS_FETCH(); if (show_info_func && module->info_func) { php_printf("<h2 align=\"center\"><a name=\"module_%s\">%s</a></h2>\n", module->name, module->name); - module->info_func(module); + module->info_func(module TSRMLS_CC); } else if (!show_info_func && !module->info_func) { php_printf("<tr valign=\"baseline\" bgcolor=\"" PHP_CONTENTS_COLOR "\">"); php_printf("<td>"); Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.40 php4/ext/standard/mail.c:1.41 --- php4/ext/standard/mail.c:1.40 Sat Jul 28 07:36:17 2001 +++ php4/ext/standard/mail.c Mon Jul 30 02:18:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.40 2001/07/28 11:36:17 zeev Exp $ */ +/* $Id: mail.c,v 1.41 2001/07/30 06:18:06 zeev Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -208,13 +208,17 @@ */ PHP_MINFO_FUNCTION(mail) { -#ifdef PHP_WIN32 char *sendmail_path = INI_STR("sendmail_path"); - if (!sendmail_path) - php_info_print_table_row(2, "Internal Sendmail Support for Windows 4", "enabled"); - else + +#ifdef PHP_WIN32 + if (!sendmail_path) { + php_info_print_table_row(2, "Internal Sendmail Support for Windows", "enabled"); + } else { + php_info_print_table_row(2, "Path to sendmail", sendmail_path); + } +#else + php_info_print_table_row(2, "Path to sendmail", sendmail_path); #endif - php_info_print_table_row(2, "Path to sendmail", INI_STR("sendmail_path") ); } /* }}} */ Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.46 php4/ext/standard/reg.c:1.47 --- php4/ext/standard/reg.c:1.46 Mon Jul 30 01:36:15 2001 +++ php4/ext/standard/reg.c Mon Jul 30 02:18:06 2001 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.46 2001/07/30 05:36:15 zeev Exp $ */ +/* $Id: reg.c,v 1.47 2001/07/30 06:18:06 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -102,8 +102,6 @@ PHP_MSHUTDOWN_FUNCTION(regex) { - TSRMLS_FETCH(); - zend_hash_destroy(®(ht_rc)); return SUCCESS; } Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.209 php4/ext/standard/string.c:1.210 --- php4/ext/standard/string.c:1.209 Sun Jul 29 21:56:37 2001 +++ php4/ext/standard/string.c Mon Jul 30 02:18:06 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.209 2001/07/30 01:56:37 zeev Exp $ */ +/* $Id: string.c,v 1.210 2001/07/30 06:18:06 zeev Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -160,9 +160,7 @@ PHP_MSHUTDOWN_FUNCTION(localeconv) { tsrm_mutex_free( locale_mutex ); - locale_mutex = NULL; - return SUCCESS; } /* }}} */ Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.30 php4/ext/standard/syslog.c:1.31 --- php4/ext/standard/syslog.c:1.30 Sat Jul 28 07:36:19 2001 +++ php4/ext/standard/syslog.c Mon Jul 30 02:18:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.30 2001/07/28 11:36:19 zeev Exp $ */ +/* $Id: syslog.c,v 1.31 2001/07/30 06:18:06 zeev Exp $ */ #include "php.h" @@ -116,8 +116,6 @@ PHP_RSHUTDOWN_FUNCTION(syslog) { - TSRMLS_FETCH(); - if (BG(syslog_device)) { efree(BG(syslog_device)); } Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.34 php4/ext/standard/url_scanner_ex.c:1.35 --- php4/ext/standard/url_scanner_ex.c:1.34 Sat Jul 28 07:36:19 2001 +++ php4/ext/standard/url_scanner_ex.c Mon Jul 30 02:18:06 2001 @@ -47,7 +47,6 @@ char *key; char *lasts; char *tmp; - TSRMLS_FETCH(); ctx = &BG(url_adapt_state_ex); @@ -874,7 +873,6 @@ PHP_RSHUTDOWN_FUNCTION(url_scanner) { url_adapt_state_ex_t *ctx; - TSRMLS_FETCH(); ctx = &BG(url_adapt_state_ex); @@ -901,8 +899,6 @@ PHP_MSHUTDOWN_FUNCTION(url_scanner) { - TSRMLS_FETCH(); - UNREGISTER_INI_ENTRIES(); zend_hash_destroy(BG(url_adapt_state_ex).tags); free(BG(url_adapt_state_ex).tags); Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.23 php4/ext/sybase/php_sybase_db.c:1.24 --- php4/ext/sybase/php_sybase_db.c:1.23 Sun Jul 29 21:56:38 2001 +++ php4/ext/sybase/php_sybase_db.c Mon Jul 30 02:18:06 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.23 2001/07/30 01:56:38 zeev Exp $ */ +/* $Id: php_sybase_db.c,v 1.24 2001/07/30 06:18:06 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -1306,7 +1306,7 @@ PHP_MINFO_FUNCTION(sybase) { - char maxp[32],maxl[32]; + char maxp[32], maxl[32]; if (php_sybase_module.max_persistent==-1) { snprintf(maxp, 31, "%ld/unlimited", php_sybase_module.num_persistent ); Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.55 php4/ext/sybase_ct/php_sybase_ct.c:1.56 --- php4/ext/sybase_ct/php_sybase_ct.c:1.55 Sun Jul 29 21:56:39 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Mon Jul 30 02:18:07 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.55 2001/07/30 01:56:39 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.56 2001/07/30 06:18:07 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -367,8 +367,6 @@ PHP_RSHUTDOWN_FUNCTION(sybase) { - TSRMLS_FETCH(); - efree(SybCtG(appname)); STR_FREE(SybCtG(server_message)); return SUCCESS; @@ -1652,7 +1650,6 @@ PHP_MINFO_FUNCTION(sybase) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "Sybase_CT Support", "enabled" ); Index: php4/ext/vpopmail/php_vpopmail.c diff -u php4/ext/vpopmail/php_vpopmail.c:1.16 php4/ext/vpopmail/php_vpopmail.c:1.17 --- php4/ext/vpopmail/php_vpopmail.c:1.16 Sat Jul 28 07:36:23 2001 +++ php4/ext/vpopmail/php_vpopmail.c Mon Jul 30 02:18:08 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_vpopmail.c,v 1.16 2001/07/28 11:36:23 zeev Exp $ */ +/* $Id: php_vpopmail.c,v 1.17 2001/07/30 06:18:08 zeev Exp $ */ /* TODO: move to config.m4 when support for old versions is ready or just * don't support rather old vpopmail. current version must bail out if @@ -137,12 +137,9 @@ PHP_RSHUTDOWN_FUNCTION(vpopmail) { - TSRMLS_FETCH(); - if (VPOPMAILG(vpopmail_open) != 0) { vclose(); } - return SUCCESS; } Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.87 php4/ext/xml/xml.c:1.88 --- php4/ext/xml/xml.c:1.87 Mon Jul 30 00:58:06 2001 +++ php4/ext/xml/xml.c Mon Jul 30 02:18:08 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.87 2001/07/30 04:58:06 zeev Exp $ */ +/* $Id: xml.c,v 1.88 2001/07/30 06:18:08 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -229,12 +229,11 @@ PHP_MINFO_FUNCTION(xml) { - - php_info_print_table_start(); - php_info_print_table_row(2, "XML Support", "active"); - php_info_print_table_row(2, "XML Namespace Support", "active"); - php_info_print_table_row(2, "EXPAT Version",XML_ExpatVersion()); - php_info_print_table_end(); + php_info_print_table_start(); + php_info_print_table_row(2, "XML Support", "active"); + php_info_print_table_row(2, "XML Namespace Support", "active"); + php_info_print_table_row(2, "EXPAT Version",XML_ExpatVersion()); + php_info_print_table_end(); } /* }}} */ Index: php4/ext/yp/yp.c diff -u php4/ext/yp/yp.c:1.24 php4/ext/yp/yp.c:1.25 --- php4/ext/yp/yp.c:1.24 Sat Jul 28 07:36:25 2001 +++ php4/ext/yp/yp.c Mon Jul 30 02:18:09 2001 @@ -16,7 +16,7 @@ | Fredrik Ohrn | +----------------------------------------------------------------------+ */ -/* $Id: yp.c,v 1.24 2001/07/28 11:36:25 zeev Exp $ */ +/* $Id: yp.c,v 1.25 2001/07/30 06:18:09 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -394,7 +394,8 @@ YP(error) = 0; } -PHP_MINFO_FUNCTION(yp) { +PHP_MINFO_FUNCTION(yp) +{ php_info_print_table_start(); php_info_print_table_row(2, "YP Support", "enabled"); php_info_print_table_end(); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.86 php4/ext/zlib/zlib.c:1.87 --- php4/ext/zlib/zlib.c:1.86 Sun Jul 29 21:56:41 2001 +++ php4/ext/zlib/zlib.c Mon Jul 30 02:18:10 2001 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.86 2001/07/30 01:56:41 zeev Exp $ */ +/* $Id: zlib.c,v 1.87 2001/07/30 06:18:10 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -204,8 +204,6 @@ PHP_MSHUTDOWN_FUNCTION(zlib) { #if HAVE_FOPENCOOKIE - TSRMLS_FETCH(); - if(PG(allow_url_fopen)) { php_unregister_url_wrapper("zlib"); } Index: php4/main/main.c diff -u php4/main/main.c:1.388 php4/main/main.c:1.389 --- php4/main/main.c:1.388 Sun Jul 29 21:56:42 2001 +++ php4/main/main.c Mon Jul 30 02:18:10 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.388 2001/07/30 01:56:42 zeev Exp $ */ +/* $Id: main.c,v 1.389 2001/07/30 06:18:10 zeev Exp $ */ /* {{{ includes */ @@ -91,8 +91,6 @@ */ static PHP_INI_MH(OnSetPrecision) { - TSRMLS_FETCH(); - EG(precision) = atoi(new_value); return SUCCESS; } @@ -119,8 +117,6 @@ */ static PHP_INI_MH(OnUpdateErrorReporting) { - TSRMLS_FETCH(); - if (!new_value) { EG(error_reporting) = E_ALL & ~E_NOTICE; } else { @@ -151,8 +147,6 @@ */ static PHP_INI_MH(OnUpdateTimeout) { - TSRMLS_FETCH(); - EG(timeout_seconds) = atoi(new_value); if (stage==PHP_INI_STAGE_STARTUP) { /* Don't set a timeout on startup, only per-request */ Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.38 php4/sapi/apache/php_apache.c:1.39 --- php4/sapi/apache/php_apache.c:1.38 Sat Jul 28 10:01:24 2001 +++ php4/sapi/apache/php_apache.c Mon Jul 30 02:18:11 2001 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.38 2001/07/28 14:01:24 rasmus Exp $ */ +/* $Id: php_apache.c,v 1.39 2001/07/30 06:18:11 zeev Exp $ */ #define NO_REGEX_EXTRA_H @@ -182,7 +182,6 @@ extern char *user_name; extern gid_t group_id; extern int max_requests_per_child; - TSRMLS_FETCH(); serv = ((request_rec *) SG(server_context))->server;
Index: php4/ext/bcmath/bcmath.c diff -u php4/ext/bcmath/bcmath.c:1.29 php4/ext/bcmath/bcmath.c:1.30 --- php4/ext/bcmath/bcmath.c:1.29 Wed Jun 6 09:05:41 2001 +++ php4/ext/bcmath/bcmath.c Mon Jul 30 02:17:49 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bcmath.c,v 1.29 2001/06/06 13:05:41 rasmus Exp $ */ +/* $Id: bcmath.c,v 1.30 2001/07/30 06:17:49 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -126,9 +126,9 @@ PHP_MINFO_FUNCTION(bcmath) { - php_info_print_table_start(); - php_info_print_table_row(2, "BCMath support", "enabled"); - php_info_print_table_end(); + php_info_print_table_start(); + php_info_print_table_row(2, "BCMath support", "enabled"); + php_info_print_table_end(); } /* {{{ proto string bcadd(string left_operand, string right_operand [, int scale]) Index: php4/ext/calendar/calendar.c diff -u php4/ext/calendar/calendar.c:1.16 php4/ext/calendar/calendar.c:1.17 --- php4/ext/calendar/calendar.c:1.16 Fri Jul 6 05:51:03 2001 +++ php4/ext/calendar/calendar.c Mon Jul 30 02:17:49 2001 @@ -18,7 +18,7 @@ | Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: calendar.c,v 1.16 2001/07/06 09:51:03 dbeu Exp $ */ +/* $Id: calendar.c,v 1.17 2001/07/30 06:17:49 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -57,14 +57,14 @@ zend_module_entry calendar_module_entry = { - "calendar", - calendar_functions, - PHP_MINIT(calendar), - NULL, - NULL, - NULL, - PHP_MINFO(calendar), - STANDARD_MODULE_PROPERTIES, + "calendar", + calendar_functions, + PHP_MINIT(calendar), + NULL, + NULL, + NULL, + PHP_MINFO(calendar), + STANDARD_MODULE_PROPERTIES, }; #ifdef COMPILE_DL_CALENDAR Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.35 php4/ext/com/COM.c:1.36 --- php4/ext/com/COM.c:1.35 Mon Jul 30 00:57:55 2001 +++ php4/ext/com/COM.c Mon Jul 30 02:17:49 2001 @@ -352,7 +352,6 @@ char *typelib_name_buffer; char *strtok_buf = NULL; int interactive; - TSRMLS_FETCH(); interactive = CG(interactive); Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.28 php4/ext/cpdf/cpdf.c:1.29 --- php4/ext/cpdf/cpdf.c:1.28 Sat Jul 28 07:35:43 2001 +++ php4/ext/cpdf/cpdf.c Mon Jul 30 02:17:49 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.28 2001/07/28 11:35:43 zeev Exp $ */ +/* $Id: cpdf.c,v 1.29 2001/07/30 06:17:49 zeev Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -205,7 +205,8 @@ php_info_print_table_end(); } -PHP_MSHUTDOWN_FUNCTION(cpdf){ +PHP_MSHUTDOWN_FUNCTION(cpdf) +{ return SUCCESS; } Index: php4/ext/crack/crack.c diff -u php4/ext/crack/crack.c:1.6 php4/ext/crack/crack.c:1.7 --- php4/ext/crack/crack.c:1.6 Sat Jul 28 07:35:44 2001 +++ php4/ext/crack/crack.c Mon Jul 30 02:17:50 2001 @@ -15,7 +15,7 @@ | Authors: | +----------------------------------------------------------------------+ */ -/* $Id: crack.c,v 1.6 2001/07/28 11:35:44 zeev Exp $ */ +/* $Id: crack.c,v 1.7 2001/07/30 06:17:50 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -104,7 +104,6 @@ ZEND_MSHUTDOWN_FUNCTION(crack) { UNREGISTER_INI_ENTRIES(); - return SUCCESS; } @@ -118,12 +117,9 @@ ZEND_RSHUTDOWN_FUNCTION(crack) { - TSRMLS_FETCH(); - if (NULL != CRACKG(last_message)) { efree(CRACKG(last_message)); } - return SUCCESS; } Index: php4/ext/ctype/ctype.c diff -u php4/ext/ctype/ctype.c:1.9 php4/ext/ctype/ctype.c:1.10 --- php4/ext/ctype/ctype.c:1.9 Sat Jul 28 07:35:44 2001 +++ php4/ext/ctype/ctype.c Mon Jul 30 02:17:50 2001 @@ -85,8 +85,6 @@ */ PHP_MINFO_FUNCTION(ctype) { - TSRMLS_FETCH(); - php_info_print_table_start(); php_info_print_table_row(2, "ctype functions", "enabled (experimental)"); php_info_print_table_end(); Index: php4/ext/dbplus/dbplus.c diff -u php4/ext/dbplus/dbplus.c:1.2 php4/ext/dbplus/dbplus.c:1.3 --- php4/ext/dbplus/dbplus.c:1.2 Sun Jul 29 21:56:22 2001 +++ php4/ext/dbplus/dbplus.c Mon Jul 30 02:17:51 2001 @@ -147,9 +147,6 @@ PHP_MSHUTDOWN_FUNCTION(dbplus) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ return SUCCESS; } Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.21 php4/ext/exif/exif.c:1.22 --- php4/ext/exif/exif.c:1.21 Tue Jun 26 05:52:54 2001 +++ php4/ext/exif/exif.c Mon Jul 30 02:17:51 2001 @@ -142,7 +142,8 @@ /* {{{ PHP_MINFO_FUNCTION */ -PHP_MINFO_FUNCTION(exif) { +PHP_MINFO_FUNCTION(exif) +{ php_info_print_table_start(); php_info_print_table_row(2, "EXIF Support", "enabled" ); php_info_print_table_end(); Index: php4/ext/fbsql/php_fbsql.c diff -u php4/ext/fbsql/php_fbsql.c:1.38 php4/ext/fbsql/php_fbsql.c:1.39 --- php4/ext/fbsql/php_fbsql.c:1.38 Sat Jul 28 07:35:48 2001 +++ php4/ext/fbsql/php_fbsql.c Mon Jul 30 02:17:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fbsql.c,v 1.38 2001/07/28 11:35:48 zeev Exp $ */ +/* $Id: php_fbsql.c,v 1.39 2001/07/30 06:17:51 zeev Exp $ */ /* TODO: * @@ -405,7 +405,6 @@ PHP_MINFO_FUNCTION(fbsql) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "FrontBase support", "enabled"); Index: php4/ext/filepro/filepro.c diff -u php4/ext/filepro/filepro.c:1.35 php4/ext/filepro/filepro.c:1.36 --- php4/ext/filepro/filepro.c:1.35 Sat Jul 28 07:35:50 2001 +++ php4/ext/filepro/filepro.c Mon Jul 30 02:17:51 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filepro.c,v 1.35 2001/07/28 11:35:50 zeev Exp $ */ +/* $Id: filepro.c,v 1.36 2001/07/30 06:17:51 zeev Exp $ */ /* filePro 4.x support developed by Chad Robinson, chadr@brttech.com @@ -120,10 +120,11 @@ SET_MUTEX(fp_mutex); numthreads--; if (!numthreads){ - if (!TlsFree(FPTls)){ - FREE_MUTEX(fp_mutex); - return 0; - }} + if (!TlsFree(FPTls)){ + FREE_MUTEX(fp_mutex); + return 0; + } + } FREE_MUTEX(fp_mutex); #endif #endif Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.36 php4/ext/ftp/php_ftp.c:1.37 --- php4/ext/ftp/php_ftp.c:1.36 Mon Jul 30 00:57:56 2001 +++ php4/ext/ftp/php_ftp.c Mon Jul 30 02:17:52 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.36 2001/07/30 04:57:56 zeev Exp $ */ +/* $Id: php_ftp.c,v 1.37 2001/07/30 06:17:52 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -98,9 +98,9 @@ PHP_MINFO_FUNCTION(ftp) { - php_info_print_table_start(); - php_info_print_table_row(2, "FTP support", "enabled"); - php_info_print_table_end(); + php_info_print_table_start(); + php_info_print_table_row(2, "FTP support", "enabled"); + php_info_print_table_end(); } Index: php4/ext/gmp/gmp.c diff -u php4/ext/gmp/gmp.c:1.13 php4/ext/gmp/gmp.c:1.14 --- php4/ext/gmp/gmp.c:1.13 Sun Jul 29 21:56:25 2001 +++ php4/ext/gmp/gmp.c Mon Jul 30 02:17:52 2001 @@ -154,9 +154,6 @@ */ ZEND_MSHUTDOWN_FUNCTION(gmp) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ return SUCCESS; } /* }}} */ Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.86 php4/ext/hyperwave/hw.c:1.87 --- php4/ext/hyperwave/hw.c:1.86 Sun Jul 29 21:56:25 2001 +++ php4/ext/hyperwave/hw.c Mon Jul 30 02:17:53 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.86 2001/07/30 01:56:25 zeev Exp $ */ +/* $Id: hw.c,v 1.87 2001/07/30 06:17:53 zeev Exp $ */ #include <stdlib.h> #include <errno.h> @@ -196,8 +196,6 @@ static PHP_INI_MH(OnHyperwavePort) { - TSRMLS_FETCH(); - if (new_value==NULL) { HwSG(default_port) = HG_SERVER_PORT; } else { Index: php4/ext/iisfunc/setup.c diff -u php4/ext/iisfunc/setup.c:1.5 php4/ext/iisfunc/setup.c:1.6 --- php4/ext/iisfunc/setup.c:1.5 Thu May 24 06:07:08 2001 +++ php4/ext/iisfunc/setup.c Mon Jul 30 02:17:53 2001 @@ -15,7 +15,7 @@ | Authors: Frank M. Kromann <fmk@swwwing.com> | +----------------------------------------------------------------------+ */ -/* $Id: setup.c,v 1.5 2001/05/24 10:07:08 ssb Exp $ */ +/* $Id: setup.c,v 1.6 2001/07/30 06:17:53 zeev Exp $ */ #ifdef COMPILE_DL_IISFUNC #define HAVE_IISFUNC 1 @@ -98,7 +98,6 @@ { php_info_print_table_start(); php_info_print_table_row(2, "IIS Admin Functions support", "enabled"); - php_info_print_table_end(); } Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.87 php4/ext/imap/php_imap.c:1.88 --- php4/ext/imap/php_imap.c:1.87 Sat Jul 28 07:35:54 2001 +++ php4/ext/imap/php_imap.c Mon Jul 30 02:17:53 2001 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.87 2001/07/28 11:35:54 zeev Exp $ */ +/* $Id: php_imap.c,v 1.88 2001/07/30 06:17:53 zeev Exp $ */ #define IMAP41 @@ -310,7 +310,6 @@ { ERRORLIST *ecur = NIL; STRINGLIST *acur = NIL; - TSRMLS_FETCH(); if (IMAPG(imap_errorstack) != NIL) { /* output any remaining errors at their original error level */ Index: php4/ext/ingres_ii/ii.c diff -u php4/ext/ingres_ii/ii.c:1.19 php4/ext/ingres_ii/ii.c:1.20 --- php4/ext/ingres_ii/ii.c:1.19 Sat Jul 28 07:35:56 2001 +++ php4/ext/ingres_ii/ii.c Mon Jul 30 02:17:54 2001 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.19 2001/07/28 11:35:56 zeev Exp $ */ +/* $Id: ii.c,v 1.20 2001/07/30 06:17:54 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -67,14 +67,14 @@ }; zend_module_entry ingres_ii_module_entry = { - "ingres_ii", - ii_functions, - PHP_MINIT(ii), - PHP_MSHUTDOWN(ii), - PHP_RINIT(ii), - PHP_RSHUTDOWN(ii), - PHP_MINFO(ii), - STANDARD_MODULE_PROPERTIES + "ingres_ii", + ii_functions, + PHP_MINIT(ii), + PHP_MSHUTDOWN(ii), + PHP_RINIT(ii), + PHP_RSHUTDOWN(ii), + PHP_MINFO(ii), + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_INGRES_II @@ -312,8 +312,6 @@ */ PHP_RSHUTDOWN_FUNCTION(ii) { - TSRMLS_FETCH(); - if (IIG(default_link)!=-1) { zend_list_delete(IIG(default_link)); IIG(default_link) = -1; @@ -326,7 +324,6 @@ PHP_MINFO_FUNCTION(ii) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "Ingres II Support", "enabled"); Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.61 php4/ext/interbase/interbase.c:1.62 --- php4/ext/interbase/interbase.c:1.61 Mon Jul 30 00:57:57 2001 +++ php4/ext/interbase/interbase.c Mon Jul 30 02:17:55 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.61 2001/07/30 04:57:57 zeev Exp $ */ +/* $Id: interbase.c,v 1.62 2001/07/30 06:17:55 zeev Exp $ */ /* TODO: Arrays, roles? @@ -554,8 +554,6 @@ PHP_RSHUTDOWN_FUNCTION(ibase) { - TSRMLS_FETCH(); - if (IBG(timestampformat)) DL_FREE(IBG(timestampformat)); IBG(timestampformat) = NULL; @@ -583,7 +581,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.61 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.62 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif Index: php4/ext/ircg/ircg.c diff -u php4/ext/ircg/ircg.c:1.90 php4/ext/ircg/ircg.c:1.91 --- php4/ext/ircg/ircg.c:1.90 Sun Jul 29 23:05:51 2001 +++ php4/ext/ircg/ircg.c Mon Jul 30 02:17:55 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ircg.c,v 1.90 2001/07/30 03:05:51 sas Exp $ */ +/* $Id: ircg.c,v 1.91 2001/07/30 06:17:55 zeev Exp $ */ #include <time.h> @@ -1731,6 +1731,7 @@ PHP_MINFO_FUNCTION(ircg) { char buf[100]; + php_info_print_table_start(); php_info_print_table_header(2, "ircg support", "enabled"); sprintf(buf, "%lu", cache_hits); Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.50 php4/ext/java/java.c:1.51 --- php4/ext/java/java.c:1.50 Sun Jul 29 21:56:28 2001 +++ php4/ext/java/java.c Mon Jul 30 02:17:56 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.50 2001/07/30 01:56:28 zeev Exp $ */ +/* $Id: java.c,v 1.51 2001/07/30 06:17:56 zeev Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -106,10 +106,11 @@ static zend_class_entry java_class_entry; -static PHP_INI_MH(OnIniUpdate) { - if (new_value) *(char**)mh_arg1 = new_value; - iniUpdated=1; - return SUCCESS; +static PHP_INI_MH(OnIniUpdate) +{ + if (new_value) *(char**)mh_arg1 = new_value; + iniUpdated=1; + return SUCCESS; } PHP_INI_BEGIN() Index: php4/ext/mbstring/mbstring.c diff -u php4/ext/mbstring/mbstring.c:1.25 php4/ext/mbstring/mbstring.c:1.26 --- php4/ext/mbstring/mbstring.c:1.25 Mon Jul 30 01:36:13 2001 +++ php4/ext/mbstring/mbstring.c Mon Jul 30 02:17:56 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.25 2001/07/30 05:36:13 zeev Exp $ */ +/* $Id: mbstring.c,v 1.26 2001/07/30 06:17:56 zeev Exp $ */ /* * PHP4 Multibyte String module "mbstring" (currently only for Japanese) @@ -287,7 +287,6 @@ static PHP_INI_MH(OnUpdate_mbstring_detect_order) { int *list, size; - TSRMLS_FETCH(); if (php_mbstring_parse_encoding_list(new_value, new_value_length, &list, &size, 1)) { if (MBSTRG(detect_order_list) != NULL) { @@ -305,7 +304,6 @@ static PHP_INI_MH(OnUpdate_mbstring_http_input) { int *list, size; - TSRMLS_FETCH(); if (php_mbstring_parse_encoding_list(new_value, new_value_length, &list, &size, 1)) { if (MBSTRG(http_input_list) != NULL) { @@ -323,7 +321,6 @@ static PHP_INI_MH(OnUpdate_mbstring_http_output) { enum mbfl_no_encoding no_encoding; - TSRMLS_FETCH(); no_encoding = mbfl_name2no_encoding(new_value); if (no_encoding != mbfl_no_encoding_invalid) { @@ -341,7 +338,6 @@ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding) { enum mbfl_no_encoding no_encoding; - TSRMLS_FETCH(); no_encoding = mbfl_name2no_encoding(new_value); if (no_encoding != mbfl_no_encoding_invalid) { @@ -358,8 +354,6 @@ static PHP_INI_MH(OnUpdate_mbstring_substitute_character) { - TSRMLS_FETCH(); - if (new_value != NULL) { if (strcasecmp("none", new_value) == 0) { MBSTRG(filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE; @@ -428,7 +422,6 @@ PHP_MSHUTDOWN_FUNCTION(mbstring) { - TSRMLS_FETCH(); UNREGISTER_INI_ENTRIES(); if (MBSTRG(http_input_list)) { @@ -477,8 +470,6 @@ PHP_RSHUTDOWN_FUNCTION(mbstring) { - TSRMLS_FETCH(); - if (MBSTRG(current_detect_order_list) != NULL) { efree(MBSTRG(current_detect_order_list)); MBSTRG(current_detect_order_list) = NULL; Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.42 php4/ext/mcal/php_mcal.c:1.43 --- php4/ext/mcal/php_mcal.c:1.42 Thu May 24 06:07:11 2001 +++ php4/ext/mcal/php_mcal.c Mon Jul 30 02:17:56 2001 @@ -139,8 +139,8 @@ { char tmp[128]; - php_info_print_table_start(); - php_info_print_table_row(2, "MCAL Support", "enabled" ); + php_info_print_table_start(); + php_info_print_table_row(2, "MCAL Support", "enabled" ); #ifdef MCALVER snprintf(tmp, 128, "%s<BR>%d", CALVER, MCALVER); #else Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.59 php4/ext/mssql/php_mssql.c:1.60 --- php4/ext/mssql/php_mssql.c:1.59 Mon Jul 30 00:57:58 2001 +++ php4/ext/mssql/php_mssql.c Mon Jul 30 02:17:57 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.59 2001/07/30 04:57:58 zeev Exp $ */ +/* $Id: php_mssql.c,v 1.60 2001/07/30 06:17:57 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -348,8 +348,6 @@ PHP_RSHUTDOWN_FUNCTION(mssql) { - TSRMLS_FETCH(); - STR_FREE(MS_SQL_G(appname)); if (MS_SQL_G(server_message)) { STR_FREE(MS_SQL_G(server_message)); @@ -360,7 +358,6 @@ PHP_MINFO_FUNCTION(mssql) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "MSSQL Support", "enabled"); Index: php4/ext/muscat/muscat.c diff -u php4/ext/muscat/muscat.c:1.6 php4/ext/muscat/muscat.c:1.7 --- php4/ext/muscat/muscat.c:1.6 Mon Jul 30 00:57:59 2001 +++ php4/ext/muscat/muscat.c Mon Jul 30 02:17:58 2001 @@ -112,9 +112,6 @@ PHP_MSHUTDOWN_FUNCTION(muscat) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ return SUCCESS; } Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.91 php4/ext/mysql/php_mysql.c:1.92 --- php4/ext/mysql/php_mysql.c:1.91 Sat Jul 28 15:02:53 2001 +++ php4/ext/mysql/php_mysql.c Mon Jul 30 02:17:58 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.91 2001/07/28 19:02:53 andi Exp $ */ +/* $Id: php_mysql.c,v 1.92 2001/07/30 06:17:58 zeev Exp $ */ /* TODO: @@ -211,10 +211,8 @@ /* {{{ php_mysql_set_default_link */ -static void php_mysql_set_default_link(int id) +static void php_mysql_set_default_link(int id TSRMLS_DC) { - TSRMLS_FETCH(); - if (MySG(default_link)!=-1) { zend_list_delete(MySG(default_link)); } @@ -261,8 +259,6 @@ */ static PHP_INI_MH(OnMySQLPort) { - TSRMLS_FETCH(); - if (new_value==NULL) { /* default port */ #ifndef PHP_WIN32 struct servent *serv_ptr; @@ -360,7 +356,6 @@ */ PHP_RSHUTDOWN_FUNCTION(mysql) { - TSRMLS_FETCH(); if (MySG(connect_error)!=NULL) { efree(MySG(connect_error)); } @@ -373,7 +368,6 @@ PHP_MINFO_FUNCTION(mysql) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "MySQL Support", "enabled"); @@ -606,7 +600,7 @@ if (ptr && (type==le_link || type==le_plink)) { zend_list_addref(link); return_value->value.lval = link; - php_mysql_set_default_link(link); + php_mysql_set_default_link(link TSRMLS_CC); return_value->type = IS_RESOURCE; efree(hashed_details); MYSQL_DO_CONNECT_CLEANUP(); @@ -656,7 +650,7 @@ } efree(hashed_details); - php_mysql_set_default_link(return_value->value.lval); + php_mysql_set_default_link(return_value->value.lval TSRMLS_CC); MYSQL_DO_CONNECT_CLEANUP(); } /* }}} */ @@ -953,11 +947,10 @@ /* {{{ php_mysql_do_query_general */ -static void php_mysql_do_query_general(zval **query, zval **mysql_link, int link_id, zval **db, int use_store, zval *return_value) +static void php_mysql_do_query_general(zval **query, zval **mysql_link, int link_id, zval **db, int use_store, zval *return_value TSRMLS_DC) { php_mysql_conn *mysql; MYSQL_RES *mysql_result; - TSRMLS_FETCH(); ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, link_id, "MySQL-Link", le_link, le_plink); @@ -1039,7 +1032,7 @@ WRONG_PARAM_COUNT; break; } - php_mysql_do_query_general(query, mysql_link, id, NULL, use_store, return_value); + php_mysql_do_query_general(query, mysql_link, id, NULL, use_store, return_value TSRMLS_CC); } /* }}} */ @@ -1089,7 +1082,7 @@ zend_error(E_NOTICE, "%s is deprecated; use mysql_select_db() and mysql_query() instead", get_active_function_name()); - php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value); + php_mysql_do_query_general(query, mysql_link, id, db, MYSQL_STORE_RESULT, return_value TSRMLS_CC); } /* }}} */ Index: php4/ext/ncurses/ncurses.c diff -u php4/ext/ncurses/ncurses.c:1.2 php4/ext/ncurses/ncurses.c:1.3 --- php4/ext/ncurses/ncurses.c:1.2 Sun Jul 29 21:56:32 2001 +++ php4/ext/ncurses/ncurses.c Mon Jul 30 02:17:58 2001 @@ -94,11 +94,6 @@ */ PHP_MSHUTDOWN_FUNCTION(ncurses) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); - endwin(); -*/ - return SUCCESS; } /* }}} */ Index: php4/ext/notes/php_notes.c diff -u php4/ext/notes/php_notes.c:1.3 php4/ext/notes/php_notes.c:1.4 --- php4/ext/notes/php_notes.c:1.3 Thu May 24 06:07:14 2001 +++ php4/ext/notes/php_notes.c Mon Jul 30 02:17:59 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_notes.c,v 1.3 2001/05/24 10:07:14 ssb Exp $ */ +/* $Id: php_notes.c,v 1.4 2001/07/30 06:17:59 zeev Exp $ */ #ifdef COMPILE_DL_NOTES #define HAVE_NOTES 1 @@ -140,7 +140,6 @@ { php_info_print_table_start(); - php_info_print_table_row(2, "Lotus Notes Database Support", "enabled"); php_info_print_table_end(); } Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.140 php4/ext/oci8/oci8.c:1.141 --- php4/ext/oci8/oci8.c:1.140 Mon Jul 30 00:57:59 2001 +++ php4/ext/oci8/oci8.c Mon Jul 30 02:17:59 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.140 2001/07/30 04:57:59 zeev Exp $ */ +/* $Id: oci8.c,v 1.141 2001/07/30 06:17:59 zeev Exp $ */ /* TODO list: * @@ -535,8 +535,6 @@ PHP_MSHUTDOWN_FUNCTION(oci) { - TSRMLS_FETCH(); - OCI(shutdown) = 1; oci_debug("START php_mshutdown_oci"); @@ -579,7 +577,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.140 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.141 $"); #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 ); Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.98 php4/ext/odbc/php_odbc.c:1.99 --- php4/ext/odbc/php_odbc.c:1.98 Mon Jul 30 00:58:00 2001 +++ php4/ext/odbc/php_odbc.c Mon Jul 30 02:18:00 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.98 2001/07/30 04:58:00 zeev Exp $ */ +/* $Id: php_odbc.c,v 1.99 2001/07/30 06:18:00 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -467,8 +467,6 @@ PHP_MSHUTDOWN_FUNCTION(odbc) { - TSRMLS_FETCH(); - UNREGISTER_INI_ENTRIES(); return SUCCESS; } @@ -476,7 +474,6 @@ PHP_MINFO_FUNCTION(odbc) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "ODBC Support", "enabled"); Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.68 php4/ext/oracle/oracle.c:1.69 --- php4/ext/oracle/oracle.c:1.68 Mon Jul 30 00:58:02 2001 +++ php4/ext/oracle/oracle.c Mon Jul 30 02:18:00 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.68 2001/07/30 04:58:02 zeev Exp $ */ +/* $Id: oracle.c,v 1.69 2001/07/30 06:18:00 zeev Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -361,11 +361,8 @@ */ PHP_MSHUTDOWN_FUNCTION(oracle) { - TSRMLS_FETCH(); - zend_hash_destroy(ORA(conns)); free(ORA(conns)); - return SUCCESS; } /* }}} */ @@ -1570,7 +1567,6 @@ */ PHP_MINFO_FUNCTION(oracle) { - php_info_print_table_start(); php_info_print_table_row(2, "Oracle Support", "enabled"); #ifndef PHP_WIN32 Index: php4/ext/pfpro/pfpro.c diff -u php4/ext/pfpro/pfpro.c:1.16 php4/ext/pfpro/pfpro.c:1.17 --- php4/ext/pfpro/pfpro.c:1.16 Sat Jul 28 07:36:07 2001 +++ php4/ext/pfpro/pfpro.c Mon Jul 30 02:18:01 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pfpro.c,v 1.16 2001/07/28 11:36:07 zeev Exp $ */ +/* $Id: pfpro.c,v 1.17 2001/07/30 06:18:01 zeev Exp $ */ /* {{{ includes */ @@ -107,8 +107,6 @@ PHP_RSHUTDOWN_FUNCTION(pfpro) { - TSRMLS_FETCH(); - if (PFPROG(initialized) == 1) { pfproCleanup(); } Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.117 php4/ext/pgsql/pgsql.c:1.118 --- php4/ext/pgsql/pgsql.c:1.117 Sat Jul 28 21:46:37 2001 +++ php4/ext/pgsql/pgsql.c Mon Jul 30 02:18:01 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.117 2001/07/29 01:46:37 jon Exp $ */ +/* $Id: pgsql.c,v 1.118 2001/07/30 06:18:01 zeev Exp $ */ #include <stdlib.h> @@ -293,7 +293,6 @@ */ PHP_RSHUTDOWN_FUNCTION(pgsql) { - TSRMLS_FETCH(); zend_hash_apply(&EG(persistent_list), (apply_func_t) _rollback_transactions); return SUCCESS; } @@ -304,7 +303,6 @@ PHP_MINFO_FUNCTION(pgsql) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "PostgreSQL Support", "enabled"); Index: php4/ext/printer/printer.c diff -u php4/ext/printer/printer.c:1.15 php4/ext/printer/printer.c:1.16 --- php4/ext/printer/printer.c:1.15 Sat Jul 28 07:36:10 2001 +++ php4/ext/printer/printer.c Mon Jul 30 02:18:01 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: printer.c,v 1.15 2001/07/28 11:36:10 zeev Exp $ */ +/* $Id: printer.c,v 1.16 2001/07/30 06:18:01 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -105,21 +105,17 @@ PHP_MINFO_FUNCTION(printer) { - TSRMLS_FETCH(); - php_info_print_table_start(); php_info_print_table_row(2, "Printer Support", "enabled"); php_info_print_table_row(2, "Default printing device", PRINTERG(default_printer) ? PRINTERG(default_printer) : "<b>not detected</b>"); php_info_print_table_row(2, "Module state", "working"); - php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.15 2001/07/28 11:36:10 zeev Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.16 2001/07/30 06:18:01 zeev Exp $"); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); } static PHP_INI_MH(OnUpdatePrinter) { - TSRMLS_FETCH(); - if(new_value != "") { if(PRINTERG(default_printer)) { efree(PRINTERG(default_printer)); Index: php4/ext/qtdom/qtdom.c diff -u php4/ext/qtdom/qtdom.c:1.7 php4/ext/qtdom/qtdom.c:1.8 --- php4/ext/qtdom/qtdom.c:1.7 Sun Jul 29 21:56:35 2001 +++ php4/ext/qtdom/qtdom.c Mon Jul 30 02:18:02 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: qtdom.c,v 1.7 2001/07/30 01:56:35 zeev Exp $ */ +/* $Id: qtdom.c,v 1.8 2001/07/30 06:18:02 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -91,7 +91,6 @@ PHP_MSHUTDOWN_FUNCTION(qtdom) { qdom_shutdown(); - return SUCCESS; } /* }}} */ Index: php4/ext/recode/recode.c diff -u php4/ext/recode/recode.c:1.16 php4/ext/recode/recode.c:1.17 --- php4/ext/recode/recode.c:1.16 Mon Jul 30 00:58:04 2001 +++ php4/ext/recode/recode.c Mon Jul 30 02:18:02 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.16 2001/07/30 04:58:04 zeev Exp $ */ +/* $Id: recode.c,v 1.17 2001/07/30 06:18:02 zeev Exp $ */ /* {{{ includes & prototypes */ @@ -84,22 +84,18 @@ PHP_MSHUTDOWN_FUNCTION(recode) { - TSRMLS_FETCH(); - - if (ReSG(outer)) + if (ReSG(outer)) { recode_delete_outer(ReSG(outer)); - + } return SUCCESS; } PHP_MINFO_FUNCTION(recode) { - TSRMLS_FETCH(); - php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.16 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.17 $"); php_info_print_table_end(); } Index: php4/ext/sablot/sablot.c diff -u php4/ext/sablot/sablot.c:1.44 php4/ext/sablot/sablot.c:1.45 --- php4/ext/sablot/sablot.c:1.44 Sat Jul 28 07:36:11 2001 +++ php4/ext/sablot/sablot.c Mon Jul 30 02:18:02 2001 @@ -239,22 +239,16 @@ PHP_MSHUTDOWN_FUNCTION(sablot) { - TSRMLS_FETCH(); - if (SABLOTG(processor)) { SablotUnregHandler(SABLOTG(processor), HLR_MESSAGE, NULL, NULL); SablotDestroyProcessor(SABLOTG(processor)); } - return SUCCESS; } PHP_RSHUTDOWN_FUNCTION(sablot) { - TSRMLS_FETCH(); - SABLOT_FREE_ERROR_HANDLE(SABLOTG_HANDLE); - return SUCCESS; } Index: php4/ext/satellite/php_orbit.c diff -u php4/ext/satellite/php_orbit.c:1.6 php4/ext/satellite/php_orbit.c:1.7 --- php4/ext/satellite/php_orbit.c:1.6 Thu May 24 06:07:23 2001 +++ php4/ext/satellite/php_orbit.c Mon Jul 30 02:18:02 2001 @@ -17,7 +17,7 @@ */ /* - * $Id: php_orbit.c,v 1.6 2001/05/24 10:07:23 ssb Exp $ + * $Id: php_orbit.c,v 1.7 2001/07/30 06:18:02 zeev Exp $ * vim: syntax=c tabstop=2 shiftwidth=2 */ @@ -80,14 +80,14 @@ * module entry */ zend_module_entry satellite_module_entry = { - "satellite", - satellite_functions, - PHP_MINIT(satellite), /* module startup */ - PHP_MSHUTDOWN(satellite), /* module shutdown */ - NULL, /* request startup */ - NULL, /* request shutdown */ - PHP_MINFO(satellite), /* module info */ - STANDARD_MODULE_PROPERTIES + "satellite", + satellite_functions, + PHP_MINIT(satellite), /* module startup */ + PHP_MSHUTDOWN(satellite), /* module shutdown */ + NULL, /* request startup */ + NULL, /* request shutdown */ + PHP_MINFO(satellite), /* module info */ + STANDARD_MODULE_PROPERTIES }; /* @@ -115,10 +115,8 @@ PHP_MSHUTDOWN_FUNCTION(satellite) { TypeManager_Shutdown(); - orbit_corba_shutdown(); - + orbit_corba_shutdown(); UNREGISTER_INI_ENTRIES(); - return SUCCESS; } @@ -132,7 +130,7 @@ php_info_print_table_header(2, "CORBA support via Satellite", "enabled"); php_info_print_table_end(); - DISPLAY_INI_ENTRIES(); + DISPLAY_INI_ENTRIES(); } /* instruct the type manager to load an IDL file if not already loaded */ Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.223 php4/ext/session/session.c:1.224 --- php4/ext/session/session.c:1.223 Sat Jul 28 07:36:12 2001 +++ php4/ext/session/session.c Mon Jul 30 02:18:02 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.223 2001/07/28 11:36:12 zeev Exp $ */ +/* $Id: session.c,v 1.224 2001/07/30 06:18:02 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -85,8 +85,6 @@ static PHP_INI_MH(OnUpdateSaveHandler) { - TSRMLS_FETCH(); - PS(mod) = _php_find_ps_module(new_value TSRMLS_CC); if(!PS(mod)) { php_error(E_ERROR,"Cannot find save handler %s",new_value); @@ -97,8 +95,6 @@ static PHP_INI_MH(OnUpdateSerializer) { - TSRMLS_FETCH(); - PS(serializer) = _php_find_ps_serializer(new_value TSRMLS_CC); if(!PS(serializer)) { php_error(E_ERROR,"Cannot find serialization handler %s",new_value); @@ -1404,8 +1400,6 @@ PHP_RSHUTDOWN_FUNCTION(session) { - TSRMLS_FETCH(); - php_session_flush(TSRMLS_C); php_rshutdown_session_globals(TSRMLS_C); return SUCCESS; @@ -1436,7 +1430,6 @@ PHP_MINFO_FUNCTION(session) { - php_info_print_table_start(); php_info_print_table_row(2, "Session Support", "enabled" ); php_info_print_table_end(); Index: php4/ext/skeleton/skeleton.c diff -u php4/ext/skeleton/skeleton.c:1.20 php4/ext/skeleton/skeleton.c:1.21 --- php4/ext/skeleton/skeleton.c:1.20 Sun Jun 24 19:29:13 2001 +++ php4/ext/skeleton/skeleton.c Mon Jul 30 02:18:05 2001 @@ -59,9 +59,6 @@ */ PHP_MINIT_FUNCTION(extname) { -/* Remove comments if you have entries in php.ini - REGISTER_INI_ENTRIES(); -*/ return SUCCESS; } /* }}} */ @@ -70,9 +67,6 @@ */ PHP_MSHUTDOWN_FUNCTION(extname) { -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ return SUCCESS; } /* }}} */ Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.38 php4/ext/standard/assert.c:1.39 --- php4/ext/standard/assert.c:1.38 Sun Jul 29 21:56:36 2001 +++ php4/ext/standard/assert.c Mon Jul 30 02:18:05 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.38 2001/07/30 01:56:36 zeev Exp $ */ +/* $Id: assert.c,v 1.39 2001/07/30 06:18:05 zeev Exp $ */ /* {{{ includes/startup/misc */ @@ -52,8 +52,6 @@ static PHP_INI_MH(OnChangeCallback) { - TSRMLS_FETCH(); - if (ASSERTG(callback)) { zval_ptr_dtor(&ASSERTG(callback)); } else { @@ -102,8 +100,6 @@ PHP_MSHUTDOWN_FUNCTION(assert) { - TSRMLS_FETCH(); - if (ASSERTG(callback)) { zval_ptr_dtor(&ASSERTG(callback)); } @@ -112,8 +108,6 @@ PHP_RSHUTDOWN_FUNCTION(assert) { - TSRMLS_FETCH(); - if (ASSERTG(callback)) { zval_ptr_dtor(&ASSERTG(callback)); ASSERTG(callback) = NULL; Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.366 php4/ext/standard/basic_functions.c:1.367 --- php4/ext/standard/basic_functions.c:1.366 Mon Jul 30 01:36:14 2001 +++ php4/ext/standard/basic_functions.c Mon Jul 30 02:18:05 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.366 2001/07/30 05:36:14 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.367 2001/07/30 06:18:05 zeev Exp $ */ #include "php.h" #include "php_main.h" @@ -618,7 +618,6 @@ char *protected_vars, *protected_var; char *token_buf; int dummy=1; - TSRMLS_FETCH(); protected_vars = estrndup(new_value, new_value_length); zend_hash_clean(&BG(sm_protected_env_vars)); @@ -635,8 +634,6 @@ static PHP_INI_MH(OnUpdateSafeModeAllowedEnvVars) { - TSRMLS_FETCH(); - if (BG(sm_allowed_env_vars)) { free(BG(sm_allowed_env_vars)); } @@ -799,9 +796,6 @@ PHP_MSHUTDOWN_FUNCTION(basic) { - TSRMLS_FETCH(); - - #ifdef ZTS ts_free_id(basic_globals_id); #else @@ -878,8 +872,6 @@ PHP_RSHUTDOWN_FUNCTION(basic) { - TSRMLS_FETCH(); - STR_FREE(BG(strtok_string)); BG(strtok_string) = NULL; #ifdef HAVE_PUTENV Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.56 php4/ext/standard/dl.c:1.57 --- php4/ext/standard/dl.c:1.56 Sat Jul 28 07:36:15 2001 +++ php4/ext/standard/dl.c Mon Jul 30 02:18:05 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dl.c,v 1.56 2001/07/28 11:36:15 zeev Exp $ */ +/* $Id: dl.c,v 1.57 2001/07/30 06:18:05 zeev Exp $ */ #include "php.h" #include "dl.h" @@ -203,7 +203,7 @@ PHP_MINFO_FUNCTION(dl) { - php_info_print_table_row(2, "Dynamic Library Support", "enabled"); + php_info_print_table_row(2, "Dynamic Library Support", "enabled"); } #else Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.171 php4/ext/standard/file.c:1.172 --- php4/ext/standard/file.c:1.171 Mon Jul 30 00:58:05 2001 +++ php4/ext/standard/file.c Mon Jul 30 02:18:06 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.171 2001/07/30 04:58:05 zeev Exp $ */ +/* $Id: file.c,v 1.172 2001/07/30 06:18:06 zeev Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -219,8 +219,6 @@ PHP_MSHUTDOWN_FUNCTION(file) { #ifndef ZTS - TSRMLS_FETCH(); - file_globals_dtor(&file_globals TSRMLS_CC); #endif return SUCCESS; Index: php4/ext/standard/filestat.c diff -u php4/ext/standard/filestat.c:1.72 php4/ext/standard/filestat.c:1.73 --- php4/ext/standard/filestat.c:1.72 Sat Jul 28 07:36:16 2001 +++ php4/ext/standard/filestat.c Mon Jul 30 02:18:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.72 2001/07/28 11:36:16 zeev Exp $ */ +/* $Id: filestat.c,v 1.73 2001/07/30 06:18:06 zeev Exp $ */ #include "php.h" #include "safe_mode.h" @@ -96,8 +96,6 @@ PHP_RSHUTDOWN_FUNCTION(filestat) { - TSRMLS_FETCH(); - if (BG(CurrentStatFile)) { efree (BG(CurrentStatFile)); } Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.72 php4/ext/standard/fsock.c:1.73 --- php4/ext/standard/fsock.c:1.72 Sat Jul 28 07:36:16 2001 +++ php4/ext/standard/fsock.c Mon Jul 30 02:18:06 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.72 2001/07/28 11:36:16 zeev Exp $ */ +/* $Id: fsock.c,v 1.73 2001/07/30 06:18:06 zeev Exp $ */ /* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */ /* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */ @@ -752,8 +752,6 @@ PHP_RSHUTDOWN_FUNCTION(fsock) { - TSRMLS_FETCH(); - php_cleanup_sockbuf(0 TSRMLS_CC); return SUCCESS; } Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.144 php4/ext/standard/info.c:1.145 --- php4/ext/standard/info.c:1.144 Sat Jul 28 07:36:17 2001 +++ php4/ext/standard/info.c Mon Jul 30 02:18:06 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.144 2001/07/28 11:36:17 zeev Exp $ */ +/* $Id: info.c,v 1.145 2001/07/30 06:18:06 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -42,10 +42,11 @@ static int _display_module_info(zend_module_entry *module, void *arg) { int show_info_func = *((int *) arg); + TSRMLS_FETCH(); if (show_info_func && module->info_func) { php_printf("<h2 align=\"center\"><a name=\"module_%s\">%s</a></h2>\n", module->name, module->name); - module->info_func(module); + module->info_func(module TSRMLS_CC); } else if (!show_info_func && !module->info_func) { php_printf("<tr valign=\"baseline\" bgcolor=\"" PHP_CONTENTS_COLOR "\">"); php_printf("<td>"); Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.40 php4/ext/standard/mail.c:1.41 --- php4/ext/standard/mail.c:1.40 Sat Jul 28 07:36:17 2001 +++ php4/ext/standard/mail.c Mon Jul 30 02:18:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.40 2001/07/28 11:36:17 zeev Exp $ */ +/* $Id: mail.c,v 1.41 2001/07/30 06:18:06 zeev Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -208,13 +208,17 @@ */ PHP_MINFO_FUNCTION(mail) { -#ifdef PHP_WIN32 char *sendmail_path = INI_STR("sendmail_path"); - if (!sendmail_path) - php_info_print_table_row(2, "Internal Sendmail Support for Windows 4", "enabled"); - else + +#ifdef PHP_WIN32 + if (!sendmail_path) { + php_info_print_table_row(2, "Internal Sendmail Support for Windows", "enabled"); + } else { + php_info_print_table_row(2, "Path to sendmail", sendmail_path); + } +#else + php_info_print_table_row(2, "Path to sendmail", sendmail_path); #endif - php_info_print_table_row(2, "Path to sendmail", INI_STR("sendmail_path") ); } /* }}} */ Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.46 php4/ext/standard/reg.c:1.47 --- php4/ext/standard/reg.c:1.46 Mon Jul 30 01:36:15 2001 +++ php4/ext/standard/reg.c Mon Jul 30 02:18:06 2001 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.46 2001/07/30 05:36:15 zeev Exp $ */ +/* $Id: reg.c,v 1.47 2001/07/30 06:18:06 zeev Exp $ */ #include <stdio.h> #include "php.h" @@ -102,8 +102,6 @@ PHP_MSHUTDOWN_FUNCTION(regex) { - TSRMLS_FETCH(); - zend_hash_destroy(®(ht_rc)); return SUCCESS; } Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.209 php4/ext/standard/string.c:1.210 --- php4/ext/standard/string.c:1.209 Sun Jul 29 21:56:37 2001 +++ php4/ext/standard/string.c Mon Jul 30 02:18:06 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.209 2001/07/30 01:56:37 zeev Exp $ */ +/* $Id: string.c,v 1.210 2001/07/30 06:18:06 zeev Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -160,9 +160,7 @@ PHP_MSHUTDOWN_FUNCTION(localeconv) { tsrm_mutex_free( locale_mutex ); - locale_mutex = NULL; - return SUCCESS; } /* }}} */ Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.30 php4/ext/standard/syslog.c:1.31 --- php4/ext/standard/syslog.c:1.30 Sat Jul 28 07:36:19 2001 +++ php4/ext/standard/syslog.c Mon Jul 30 02:18:06 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.30 2001/07/28 11:36:19 zeev Exp $ */ +/* $Id: syslog.c,v 1.31 2001/07/30 06:18:06 zeev Exp $ */ #include "php.h" @@ -116,8 +116,6 @@ PHP_RSHUTDOWN_FUNCTION(syslog) { - TSRMLS_FETCH(); - if (BG(syslog_device)) { efree(BG(syslog_device)); } Index: php4/ext/standard/url_scanner_ex.c diff -u php4/ext/standard/url_scanner_ex.c:1.34 php4/ext/standard/url_scanner_ex.c:1.35 --- php4/ext/standard/url_scanner_ex.c:1.34 Sat Jul 28 07:36:19 2001 +++ php4/ext/standard/url_scanner_ex.c Mon Jul 30 02:18:06 2001 @@ -47,7 +47,6 @@ char *key; char *lasts; char *tmp; - TSRMLS_FETCH(); ctx = &BG(url_adapt_state_ex); @@ -874,7 +873,6 @@ PHP_RSHUTDOWN_FUNCTION(url_scanner) { url_adapt_state_ex_t *ctx; - TSRMLS_FETCH(); ctx = &BG(url_adapt_state_ex); @@ -901,8 +899,6 @@ PHP_MSHUTDOWN_FUNCTION(url_scanner) { - TSRMLS_FETCH(); - UNREGISTER_INI_ENTRIES(); zend_hash_destroy(BG(url_adapt_state_ex).tags); free(BG(url_adapt_state_ex).tags); Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.23 php4/ext/sybase/php_sybase_db.c:1.24 --- php4/ext/sybase/php_sybase_db.c:1.23 Sun Jul 29 21:56:38 2001 +++ php4/ext/sybase/php_sybase_db.c Mon Jul 30 02:18:06 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.23 2001/07/30 01:56:38 zeev Exp $ */ +/* $Id: php_sybase_db.c,v 1.24 2001/07/30 06:18:06 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -1306,7 +1306,7 @@ PHP_MINFO_FUNCTION(sybase) { - char maxp[32],maxl[32]; + char maxp[32], maxl[32]; if (php_sybase_module.max_persistent==-1) { snprintf(maxp, 31, "%ld/unlimited", php_sybase_module.num_persistent ); Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.55 php4/ext/sybase_ct/php_sybase_ct.c:1.56 --- php4/ext/sybase_ct/php_sybase_ct.c:1.55 Sun Jul 29 21:56:39 2001 +++ php4/ext/sybase_ct/php_sybase_ct.c Mon Jul 30 02:18:07 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.55 2001/07/30 01:56:39 zeev Exp $ */ +/* $Id: php_sybase_ct.c,v 1.56 2001/07/30 06:18:07 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -367,8 +367,6 @@ PHP_RSHUTDOWN_FUNCTION(sybase) { - TSRMLS_FETCH(); - efree(SybCtG(appname)); STR_FREE(SybCtG(server_message)); return SUCCESS; @@ -1652,7 +1650,6 @@ PHP_MINFO_FUNCTION(sybase) { char buf[32]; - TSRMLS_FETCH(); php_info_print_table_start(); php_info_print_table_header(2, "Sybase_CT Support", "enabled" ); Index: php4/ext/vpopmail/php_vpopmail.c diff -u php4/ext/vpopmail/php_vpopmail.c:1.16 php4/ext/vpopmail/php_vpopmail.c:1.17 --- php4/ext/vpopmail/php_vpopmail.c:1.16 Sat Jul 28 07:36:23 2001 +++ php4/ext/vpopmail/php_vpopmail.c Mon Jul 30 02:18:08 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_vpopmail.c,v 1.16 2001/07/28 11:36:23 zeev Exp $ */ +/* $Id: php_vpopmail.c,v 1.17 2001/07/30 06:18:08 zeev Exp $ */ /* TODO: move to config.m4 when support for old versions is ready or just * don't support rather old vpopmail. current version must bail out if @@ -137,12 +137,9 @@ PHP_RSHUTDOWN_FUNCTION(vpopmail) { - TSRMLS_FETCH(); - if (VPOPMAILG(vpopmail_open) != 0) { vclose(); } - return SUCCESS; } Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.87 php4/ext/xml/xml.c:1.88 --- php4/ext/xml/xml.c:1.87 Mon Jul 30 00:58:06 2001 +++ php4/ext/xml/xml.c Mon Jul 30 02:18:08 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.87 2001/07/30 04:58:06 zeev Exp $ */ +/* $Id: xml.c,v 1.88 2001/07/30 06:18:08 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -229,12 +229,11 @@ PHP_MINFO_FUNCTION(xml) { - - php_info_print_table_start(); - php_info_print_table_row(2, "XML Support", "active"); - php_info_print_table_row(2, "XML Namespace Support", "active"); - php_info_print_table_row(2, "EXPAT Version",XML_ExpatVersion()); - php_info_print_table_end(); + php_info_print_table_start(); + php_info_print_table_row(2, "XML Support", "active"); + php_info_print_table_row(2, "XML Namespace Support", "active"); + php_info_print_table_row(2, "EXPAT Version",XML_ExpatVersion()); + php_info_print_table_end(); } /* }}} */ Index: php4/ext/yp/yp.c diff -u php4/ext/yp/yp.c:1.24 php4/ext/yp/yp.c:1.25 --- php4/ext/yp/yp.c:1.24 Sat Jul 28 07:36:25 2001 +++ php4/ext/yp/yp.c Mon Jul 30 02:18:09 2001 @@ -16,7 +16,7 @@ | Fredrik Ohrn | +----------------------------------------------------------------------+ */ -/* $Id: yp.c,v 1.24 2001/07/28 11:36:25 zeev Exp $ */ +/* $Id: yp.c,v 1.25 2001/07/30 06:18:09 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -394,7 +394,8 @@ YP(error) = 0; } -PHP_MINFO_FUNCTION(yp) { +PHP_MINFO_FUNCTION(yp) +{ php_info_print_table_start(); php_info_print_table_row(2, "YP Support", "enabled"); php_info_print_table_end(); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.86 php4/ext/zlib/zlib.c:1.87 --- php4/ext/zlib/zlib.c:1.86 Sun Jul 29 21:56:41 2001 +++ php4/ext/zlib/zlib.c Mon Jul 30 02:18:10 2001 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.86 2001/07/30 01:56:41 zeev Exp $ */ +/* $Id: zlib.c,v 1.87 2001/07/30 06:18:10 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -204,8 +204,6 @@ PHP_MSHUTDOWN_FUNCTION(zlib) { #if HAVE_FOPENCOOKIE - TSRMLS_FETCH(); - if(PG(allow_url_fopen)) { php_unregister_url_wrapper("zlib"); } Index: php4/main/main.c diff -u php4/main/main.c:1.388 php4/main/main.c:1.389 --- php4/main/main.c:1.388 Sun Jul 29 21:56:42 2001 +++ php4/main/main.c Mon Jul 30 02:18:10 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.388 2001/07/30 01:56:42 zeev Exp $ */ +/* $Id: main.c,v 1.389 2001/07/30 06:18:10 zeev Exp $ */ /* {{{ includes */ @@ -91,8 +91,6 @@ */ static PHP_INI_MH(OnSetPrecision) { - TSRMLS_FETCH(); - EG(precision) = atoi(new_value); return SUCCESS; } @@ -119,8 +117,6 @@ */ static PHP_INI_MH(OnUpdateErrorReporting) { - TSRMLS_FETCH(); - if (!new_value) { EG(error_reporting) = E_ALL & ~E_NOTICE; } else { @@ -151,8 +147,6 @@ */ static PHP_INI_MH(OnUpdateTimeout) { - TSRMLS_FETCH(); - EG(timeout_seconds) = atoi(new_value); if (stage==PHP_INI_STAGE_STARTUP) { /* Don't set a timeout on startup, only per-request */ Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.38 php4/sapi/apache/php_apache.c:1.39 --- php4/sapi/apache/php_apache.c:1.38 Sat Jul 28 10:01:24 2001 +++ php4/sapi/apache/php_apache.c Mon Jul 30 02:18:11 2001 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.38 2001/07/28 14:01:24 rasmus Exp $ */ +/* $Id: php_apache.c,v 1.39 2001/07/30 06:18:11 zeev Exp $ */ #define NO_REGEX_EXTRA_H @@ -182,7 +182,6 @@ extern char *user_name; extern gid_t group_id; extern int max_requests_per_child; - TSRMLS_FETCH(); serv = ((request_rec *) SG(server_context))->server;