Re: cvs: php4 /ext/mime_magic mime_magic.c /ext/standard aggregation.c basic_functions.c image.c /main SAPI.c output.c

"Jani Taskinen" <sniper@iki.fi> wrote: > Index: php4/main/SAPI.c > diff -u php4/main/SAPI.c:1.163 php4/main/SAPI.c:1.164 > --- php4/main/SAPI.c:1.163 Tue Jan 21 06:03:57 2003 > +++ php4/main/SAPI.c Sun Feb 9 14:09:51 2003 > @@ -18,7 +18,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: SAPI.c,v 1.163 2003/01/21 11:03:57 sas Exp $ */ > +/* $Id: SAPI.c,v 1.164 2003/02/09 19:09:51 sniper Exp $ */ > > #include <ctype.h> > #include <sys/stat.h> > @@ -30,7 +30,7 @@ > #if (HAVE_PCRE || HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) > #include "ext/pcre/php_pcre.h" > #endif > -#if HAVE_ZLIB > +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) > #include "ext/zlib/php_zlib.h" > ZEND_EXTERN_MODULE_GLOBALS(zlib) > #endif > @@ -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)) { > ZLIBG(output_compression) = 0; > } > @@ -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. */ > if (ZLIBG(output_compression)) { Hmm, this change may cause another problem that I mentioned in http://lists.php.net/article.php?group=php.dev&article=92781 Moriyoshi