cvs: /php4 ChangeLog MODULES_STATUS /php4/ext/zlib php3_zlib.h zlib.c

sr Mon Aug 2 17:12:16 1999 EDT Modified files: /php4 ChangeLog MODULES_STATUS /php4/ext/zlib php3_zlib.h zlib.c Log: Fix for Redhat libc 2.1 and dynamic loading in zlib module. Adapted zlib module to new PHP_Mxxx macros. Index: php4/ChangeLog diff -u php4/ChangeLog:1.33 php4/ChangeLog:1.34 --- php4/ChangeLog:1.33 Sat Jul 31 20:33:02 1999 +++ php4/ChangeLog Mon Aug 2 17:12:14 1999 @@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ??? ?? 1999, Version 4.0 Beta 2 +- Imported PHP3 fixes for problem with PHP as a dynamic module and Redhat + libc2.1 in zlib module (Stefan) - Fixed sybase_fetch_object() (Zeev) - Made the IMAP module work with PHP 4.0 (Zeev) - Fixed a problem with include()/require() of URLs (Sascha, Zeev) Index: php4/MODULES_STATUS diff -u php4/MODULES_STATUS:1.17 php4/MODULES_STATUS:1.18 --- php4/MODULES_STATUS:1.17 Fri Jul 23 05:34:13 1999 +++ php4/MODULES_STATUS Mon Aug 2 17:12:14 1999 @@ -15,3 +15,4 @@ oracle Working iptc Working informix Working +zlib Working Index: php4/ext/zlib/php3_zlib.h diff -u php4/ext/zlib/php3_zlib.h:1.4 php4/ext/zlib/php3_zlib.h:1.5 --- php4/ext/zlib/php3_zlib.h:1.4 Fri May 21 06:06:25 1999 +++ php4/ext/zlib/php3_zlib.h Mon Aug 2 17:12:15 1999 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php3_zlib.h,v 1.4 1999/05/21 10:06:25 sas Exp $ */ +/* $Id: php3_zlib.h,v 1.5 1999/08/02 21:12:15 sr Exp $ */ #ifndef _PHP3_ZLIB_H #define _PHP3_ZLIB_H @@ -38,9 +38,9 @@ extern php3_module_entry php3_zlib_module_entry; #define zlib_module_ptr &php3_zlib_module_entry -extern int php3_minit_zlib(INIT_FUNC_ARGS); -extern int php3_mshutdown_zlib(SHUTDOWN_FUNC_ARGS); -void php3_info_zlib(ZEND_MODULE_INFO_FUNC_ARGS); +extern PHP_MINIT_FUNCTION(zlib); +extern PHP_MSHUTDOWN_FUNCTION(zlib); +PHP_MINFO_FUNCTION(zlib); PHP_FUNCTION(gzopen); PHP_FUNCTION(gzclose); PHP_FUNCTION(gzeof); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.7 php4/ext/zlib/zlib.c:1.8 --- php4/ext/zlib/zlib.c:1.7 Mon Aug 2 15:16:53 1999 +++ php4/ext/zlib/zlib.c Mon Aug 2 17:12:16 1999 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.7 1999/08/02 19:16:53 zeev Exp $ */ +/* $Id: zlib.c,v 1.8 1999/08/02 21:12:16 sr Exp $ */ #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE #endif @@ -106,33 +106,44 @@ #endif function_entry php3_zlib_functions[] = { - {"readgzfile", php3_readgzfile, NULL}, - {"gzrewind", php3_gzrewind, NULL}, - {"gzclose", php3_gzclose, NULL}, - {"gzeof", php3_gzeof, NULL}, - {"gzgetc", php3_gzgetc, NULL}, - {"gzgets", php3_gzgets, NULL}, - {"gzgetss", php3_gzgetss, NULL}, - {"gzread", php3_gzread, NULL}, - {"gzopen", php3_gzopen, NULL}, - {"gzpassthru", php3_gzpassthru, NULL}, - {"gzseek", php3_gzseek, NULL}, - {"gztell", php3_gztell, NULL}, - {"gzwrite", php3_gzwrite, NULL}, - {"gzputs", php3_gzwrite, NULL}, - {"gzfile", php3_gzfile, NULL}, + PHP_FE(readgzfile, NULL) + PHP_FE(gzrewind, NULL) + PHP_FE(gzclose, NULL) + PHP_FE(gzeof, NULL) + PHP_FE(gzgetc, NULL) + PHP_FE(gzgets, NULL) + PHP_FE(gzgetss, NULL) + PHP_FE(gzread, NULL) + PHP_FE(gzopen, NULL) + PHP_FE(gzpassthru, NULL) + PHP_FE(gzseek, NULL) + PHP_FE(gztell, NULL) + PHP_FE(gzwrite, NULL) + PHP_FALIAS(gzputs, gzwrite, NULL) + PHP_FE(gzfile, NULL) {NULL, NULL, NULL} }; php3_module_entry php3_zlib_module_entry = { - "zlib", php3_zlib_functions, php3_minit_zlib, php3_mshutdown_zlib, NULL, NULL, php3_info_zlib, STANDARD_MODULE_PROPERTIES + "zlib", + php3_zlib_functions, + PHP_MINIT(zlib), + PHP_MSHUTDOWN(zlib), + NULL, + NULL, + PHP_MINFO(zlib), + STANDARD_MODULE_PROPERTIES }; #if defined(COMPILE_DL) DLEXPORT php3_module_entry *get_module(void) { return &php3_zlib_module_entry; } #endif -int php3_minit_zlib(INIT_FUNC_ARGS) +static void php3i_destructor_gzclose(gzFile *zp) { + (void)gzclose(zp); +} + +PHP_MINIT_FUNCTION(zlib) { #ifdef THREAD_SAFE zlib_global_struct *zlib_globals; @@ -152,11 +163,12 @@ return FAILURE; } #endif - ZLIB_GLOBAL(le_zp) = register_list_destructors(gzclose,NULL); + ZLIB_GLOBAL(le_zp) = register_list_destructors(php3i_destructor_gzclose,NULL); return SUCCESS; } -int php3_mshutdown_zlib(SHUTDOWN_FUNC_ARGS){ +PHP_MSHUTDOWN_FUNCTION(zlib) +{ #if defined(THREAD_SAFE) ZLIB_TLS_VARS; PHP3_TLS_THREAD_FREE(zlib_globals); @@ -173,7 +185,7 @@ return SUCCESS; } -void php3_info_zlib(ZEND_MODULE_INFO_FUNC_ARGS) +PHP_MINFO_FUNCTION(zlib) { PUTS("Zlib support active (compiled with "); PUTS(ZLIB_VERSION); @@ -895,5 +907,6 @@ /* * Local variables: * tab-width: 4 + * c-basic-offset: 4 * End: */