Made ZLIB extension built in on Windows. Fixes #21139.

# Approved by the release master.
# Will merge this patch into HEAD a bit later.

Author: edinkad

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

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
 };
 /* }}} */
 

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
 
 
 ;;;;;;;;;;;;;;;;;;;

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
 
 
 ;;;;;;;;;;;;;;;;;;;