From 45cb9dc7b1f335ad24aba1bcd699ce0e8cd96dfc Mon Sep 17 00:00:00 2001 From: Edin Kadribasic Date: Thu, 26 Dec 2002 13:27:08 +0000 Subject: [PATCH] Made ZLIB extension built in on Windows. Fixes #21139. # Approved by the release master. # Will merge this patch into HEAD a bit later. --- main/config.w32.h.in | 3 +++ main/internal_functions_win32.c | 6 ++++++ php.ini-dist | 1 - php.ini-recommended | 1 - win32/php4dllts.dsp | 32 ++++++++++++++++++++++++++++---- 5 files changed, 37 insertions(+), 6 deletions(-) diff --git a/main/config.w32.h.in b/main/config.w32.h.in index 218366553f..d5c73673e3 100644 --- a/main/config.w32.h.in +++ b/main/config.w32.h.in @@ -75,6 +75,9 @@ /* Enable / Disable XML extension (default: enabled) */ #define HAVE_LIBEXPAT 1 +/* Enable / Disable ZLIB extension (default: enabled) */ +#define HAVE_ZLIB 1 + /* PHP Runtime Configuration */ #define FORCE_CGI_REDIRECT 1 #define PHP_URL_FOPEN 1 diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c index 1d49999f55..771a1bc127 100644 --- a/main/internal_functions_win32.c +++ b/main/internal_functions_win32.c @@ -90,6 +90,9 @@ #if HAVE_TOKENIZER #include "ext/tokenizer/php_tokenizer.h" #endif +#if HAVE_ZLIB +#include "ext/zlib/php_zlib.h" +#endif /* }}} */ /* {{{ php_builtin_extensions[] @@ -140,6 +143,9 @@ zend_module_entry *php_builtin_extensions[] = { #if HAVE_LIBEXPAT && HAVE_WDDX ,phpext_wddx_ptr #endif +#if HAVE_ZLIB + ,phpext_zlib_ptr +#endif }; /* }}} */ diff --git a/php.ini-dist b/php.ini-dist index 539f523668..8eaa0d9120 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -564,7 +564,6 @@ default_socket_timeout = 60 ;extension=php_xslt.dll ;extension=php_yaz.dll ;extension=php_zip.dll -;extension=php_zlib.dll ;;;;;;;;;;;;;;;;;;; diff --git a/php.ini-recommended b/php.ini-recommended index b6f96079ea..3fffd4dbd0 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -579,7 +579,6 @@ default_socket_timeout = 60 ;extension=php_xslt.dll ;extension=php_yaz.dll ;extension=php_zip.dll -;extension=php_zlib.dll ;;;;;;;;;;;;;;;;;;; diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp index 95720e61f7..94077e6cc9 100644 --- a/win32/php4dllts.dsp +++ b/win32/php4dllts.dsp @@ -55,7 +55,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" @@ -81,7 +81,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS_inline" @@ -108,7 +108,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS_inline" /libpath:"Release_TS_Inline" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS_inline" /libpath:"Release_TS_Inline" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TSDbg" @@ -135,7 +135,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TSDbg" /libpath:"Release_TSDbg" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib zlib.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TSDbg" /libpath:"Release_TSDbg" !ENDIF @@ -1907,6 +1907,30 @@ SOURCE=..\ext\standard\url_scanner_ex.h # End Source File # End Group # End Group +# Begin Group "zlib" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 10" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\ext\zlib\zlib.c +# End Source File +# Begin Source File + +SOURCE=..\ext\zlib\zlib_fopen_wrapper.c +# End Source File +# End Group +# Begin Group "Header Files No. 10" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\ext\zlib\php_zlib.h +# End Source File +# End Group +# End Group # End Group # Begin Group "Win32" -- 2.40.0