edink Thu Dec 26 08:27:09 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4 php.ini-dist php.ini-recommended
/php4/main config.w32.h.in internal_functions_win32.c
/php4/win32 php4dllts.dsp
Log:
Made ZLIB extension built in on Windows. Fixes #21139.
# Approved by the release master.
# Will merge this patch into HEAD a bit later.
Index: php4/php.ini-dist
diff -u php4/php.ini-dist:1.171.2.3 php4/php.ini-dist:1.171.2.4
--- php4/php.ini-dist:1.171.2.3 Sat Dec 21 17:16:35 2002
+++ php4/php.ini-dist Thu Dec 26 08:27:08 2002
@@ -564,7 +564,6 @@
;extension=php_xslt.dll
;extension=php_yaz.dll
;extension=php_zip.dll
-;extension=php_zlib.dll
;;;;;;;;;;;;;;;;;;;
Index: php4/php.ini-recommended
diff -u php4/php.ini-recommended:1.119.2.2 php4/php.ini-recommended:1.119.2.3
--- php4/php.ini-recommended:1.119.2.2 Sat Dec 21 17:16:35 2002
+++ php4/php.ini-recommended Thu Dec 26 08:27:08 2002
@@ -579,7 +579,6 @@
;extension=php_xslt.dll
;extension=php_yaz.dll
;extension=php_zip.dll
-;extension=php_zlib.dll
;;;;;;;;;;;;;;;;;;;
Index: php4/main/config.w32.h.in
diff -u php4/main/config.w32.h.in:1.22.2.2 php4/main/config.w32.h.in:1.22.2.3
--- php4/main/config.w32.h.in:1.22.2.2 Sun Dec 1 18:30:22 2002
+++ php4/main/config.w32.h.in Thu Dec 26 08:27:08 2002
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h.in,v 1.22.2.2 2002/12/01 23:30:22 shane Exp $
+ $Id: config.w32.h.in,v 1.22.2.3 2002/12/26 13:27:08 edink Exp $
*/
/* Default PHP / PEAR directories */
@@ -74,6 +74,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
Index: php4/main/internal_functions_win32.c
diff -u php4/main/internal_functions_win32.c:1.65
php4/main/internal_functions_win32.c:1.65.2.1
--- php4/main/internal_functions_win32.c:1.65 Wed Sep 4 09:55:52 2002
+++ php4/main/internal_functions_win32.c Thu Dec 26 08:27:08 2002
@@ -16,7 +16,7 @@
| Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: internal_functions_win32.c,v 1.65 2002/09/04 13:55:52 sebastian Exp $
+ $Id: internal_functions_win32.c,v 1.65.2.1 2002/12/26 13:27:08 edink Exp $
*/
/* {{{ includes
@@ -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[]
@@ -139,6 +142,9 @@
#endif
#if HAVE_LIBEXPAT && HAVE_WDDX
,phpext_wddx_ptr
+#endif
+#if HAVE_ZLIB
+ ,phpext_zlib_ptr
#endif
};
/* }}} */
Index: php4/win32/php4dllts.dsp
diff -u php4/win32/php4dllts.dsp:1.87.2.1 php4/win32/php4dllts.dsp:1.87.2.2
--- php4/win32/php4dllts.dsp:1.87.2.1 Wed Nov 13 16:38:57 2002
+++ php4/win32/php4dllts.dsp Thu Dec 26 08:27:08 2002
@@ -55,7 +55,7 @@
# 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 @@
# 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 @@
# 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 @@
# 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
@@ -1904,6 +1904,30 @@
# Begin Source File
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
