cvs: /php3/functions zlib.c

sr Mon Sep 6 11:43:11 1999 EDT Modified files: /php3/functions zlib.c Log: Removed old php3.1 defines, fixed overwriting configuration settings. Index: php3/functions/zlib.c diff -u php3/functions/zlib.c:1.17 php3/functions/zlib.c:1.18 --- php3/functions/zlib.c:1.17 Mon Sep 6 04:59:34 1999 +++ php3/functions/zlib.c Mon Sep 6 11:43:10 1999 @@ -22,7 +22,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.17 1999/09/06 08:59:34 sr Exp $ */ +/* $Id: zlib.c,v 1.18 1999/09/06 15:43:10 sr Exp $ */ #if !PHP_31 && defined(THREAD_SAFE) #undef THREAD_SAFE #endif @@ -43,11 +43,7 @@ #include <windows.h> #include <winsock.h> #define O_RDONLY _O_RDONLY -#if PHP_31 -#include "os/nt/param.h" -#else #include "win32/param.h" -#endif #else #include <sys/param.h> /* #include <sys/uio.h> */ @@ -56,11 +52,7 @@ #include "internal_functions.h" #include "safe_mode.h" #include "php3_list.h" -#if PHP_31 -#include "ext/standard/php3_string.h" -#else #include "php3_string.h" -#endif #include "php3_zlib.h" #include "fopen-wrappers.h" #if HAVE_PWD_H @@ -79,11 +71,7 @@ #include <zlib.h> #if COMPILE_DL -#if PHP_31 -#include "ext/phpdl.h" -#else #include "dl/phpdl.h" -#endif #ifndef PUTS #define PUTS(a) php3_printf("%s",a) #endif @@ -102,12 +90,6 @@ #endif int gzgetss_state; int le_zp; -#if PHP_31 - int magic_quotes_runtime; - int safe_mode; - char *include_path; - char *doc_root; -#endif #if defined(THREAD_SAFE) }zlib_global_struct; #endif @@ -126,11 +108,7 @@ #define ZLIB_TLS_VARS #endif -#if PHP_31 -# define ZLIB_INI(a) ZLIB_GLOBAL(a) -#else -# define ZLIB_INI(a) php3_ini.a -#endif +#define ZLIB_INI(a) php3_ini.a function_entry php3_zlib_functions[] = { {"readgzfile", php3_readgzfile, NULL}, @@ -183,11 +161,6 @@ return FAILURE; } #endif - /* get our ini variables here */ - cfg_get_long("safe_mode",&ZLIB_INI(safe_mode)); - cfg_get_long("magic_quotes_runtime",&ZLIB_INI(magic_quotes_runtime)); - cfg_get_string("doc_root",&ZLIB_INI(doc_root)); - cfg_get_string("include_path",&ZLIB_INI(include_path)); ZLIB_GLOBAL(le_zp) = register_list_destructors(php3i_destructor_gzclose,NULL); return SUCCESS;