[packages/php.git] / php-dl-zlib.patch

diff -burN php-4.3.2/main/SAPI.c php-4.3.2-dl_zlib/main/SAPI.c
--- php-4.3.2/main/SAPI.c	Wed Feb 12 00:30:13 2003
+++ php-4.3.2-dl_zlib/main/SAPI.c	Wed Jun 11 09:41:47 2003
@@ -556,7 +556,7 @@
 				while (*ptr == ' ' && *ptr != '\0') {
 					ptr++;
 				}
-#if HAVE_ZLIB
+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 				if(!strncmp(ptr, "image/", sizeof("image/")-1)) {
 					zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
 				}
@@ -704,7 +704,7 @@
 		return SUCCESS;
 	}
 
-#if HAVE_ZLIB
+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 	/* Add output compression headers at this late stage in order to make
 	   it possible to switch it off inside the script. */
Commit	Line	Data
a224c566 AG	1	diff -burN php-4.3.2/main/SAPI.c php-4.3.2-dl_zlib/main/SAPI.c
	2	--- php-4.3.2/main/SAPI.c Wed Feb 12 00:30:13 2003
	3	+++ php-4.3.2-dl_zlib/main/SAPI.c Wed Jun 11 09:41:47 2003
	4	@@ -556,7 +556,7 @@
1f4d00db JB	5	while (ptr == ' ' && ptr != '\0') {
	6	ptr++;
	7	}
	8	-#if HAVE_ZLIB
	9	+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
	10	if(!strncmp(ptr, "image/", sizeof("image/")-1)) {
a224c566	11	zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
1f4d00db	12	}
a224c566	13	@@ -704,7 +704,7 @@
1f4d00db JB	14	return SUCCESS;
	15	}
	16
	17	-#if HAVE_ZLIB
	18	+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
	19	/* Add output compression headers at this late stage in order to make
	20	it possible to switch it off inside the script. */
1f4d00db	21