diff -uwr httpd-2.0.53.orig/modules/filters/mod_deflate.dep httpd-2.0.53/modules/filters/mod_deflate.dep --- httpd-2.0.53.orig/modules/filters/mod_deflate.dep 2004-11-24 11:31:10.000000000 -0800 +++ httpd-2.0.53/modules/filters/mod_deflate.dep 2005-02-16 17:56:08.140625000 -0800 @@ -5,52 +5,32 @@ "..\..\srclib\zlib\zlib.h"\ -..\..\srclib\zlib\crc32.c : \ +..\..\srclib\zlib\compress.c : \ "..\..\srclib\zlib\zconf.h"\ "..\..\srclib\zlib\zlib.h"\ -..\..\srclib\zlib\deflate.c : \ - "..\..\srclib\zlib\deflate.h"\ - "..\..\srclib\zlib\zconf.h"\ - "..\..\srclib\zlib\zlib.h"\ - "..\..\srclib\zlib\zutil.h"\ - - -..\..\srclib\zlib\infblock.c : \ - "..\..\srclib\zlib\infblock.h"\ - "..\..\srclib\zlib\infcodes.h"\ - "..\..\srclib\zlib\inftrees.h"\ - "..\..\srclib\zlib\infutil.h"\ +..\..\srclib\zlib\crc32.c : \ "..\..\srclib\zlib\zconf.h"\ "..\..\srclib\zlib\zlib.h"\ - "..\..\srclib\zlib\zutil.h"\ -..\..\srclib\zlib\infcodes.c : \ - "..\..\srclib\zlib\infblock.h"\ - "..\..\srclib\zlib\infcodes.h"\ - "..\..\srclib\zlib\inffast.h"\ - "..\..\srclib\zlib\inftrees.h"\ - "..\..\srclib\zlib\infutil.h"\ +..\..\srclib\zlib\deflate.c : \ + "..\..\srclib\zlib\deflate.h"\ "..\..\srclib\zlib\zconf.h"\ "..\..\srclib\zlib\zlib.h"\ "..\..\srclib\zlib\zutil.h"\ ..\..\srclib\zlib\inffast.c : \ - "..\..\srclib\zlib\infblock.h"\ - "..\..\srclib\zlib\infcodes.h"\ "..\..\srclib\zlib\inffast.h"\ "..\..\srclib\zlib\inftrees.h"\ - "..\..\srclib\zlib\infutil.h"\ "..\..\srclib\zlib\zconf.h"\ "..\..\srclib\zlib\zlib.h"\ "..\..\srclib\zlib\zutil.h"\ ..\..\srclib\zlib\inflate.c : \ - "..\..\srclib\zlib\infblock.h"\ "..\..\srclib\zlib\zconf.h"\ "..\..\srclib\zlib\zlib.h"\ "..\..\srclib\zlib\zutil.h"\ @@ -64,16 +44,6 @@ "..\..\srclib\zlib\zutil.h"\ -..\..\srclib\zlib\infutil.c : \ - "..\..\srclib\zlib\infblock.h"\ - "..\..\srclib\zlib\infcodes.h"\ - "..\..\srclib\zlib\inftrees.h"\ - "..\..\srclib\zlib\infutil.h"\ - "..\..\srclib\zlib\zconf.h"\ - "..\..\srclib\zlib\zlib.h"\ - "..\..\srclib\zlib\zutil.h"\ - - ..\..\srclib\zlib\trees.c : \ "..\..\srclib\zlib\deflate.h"\ "..\..\srclib\zlib\trees.h"\ diff -uwr httpd-2.0.53.orig/modules/filters/mod_deflate.dsp httpd-2.0.53/modules/filters/mod_deflate.dsp --- httpd-2.0.53.orig/modules/filters/mod_deflate.dsp 2004-11-24 11:31:10.000000000 -0800 +++ httpd-2.0.53/modules/filters/mod_deflate.dsp 2005-02-16 17:56:15.593750000 -0800 @@ -96,19 +96,15 @@ # End Source File # Begin Source File -SOURCE=..\..\srclib\zlib\crc32.c -# End Source File -# Begin Source File - -SOURCE=..\..\srclib\zlib\deflate.c +SOURCE=..\..\srclib\zlib\compress.c # End Source File # Begin Source File -SOURCE=..\..\srclib\zlib\infblock.c +SOURCE=..\..\srclib\zlib\crc32.c # End Source File # Begin Source File -SOURCE=..\..\srclib\zlib\infcodes.c +SOURCE=..\..\srclib\zlib\deflate.c # End Source File # Begin Source File @@ -124,10 +120,6 @@ # End Source File # Begin Source File -SOURCE=..\..\srclib\zlib\infutil.c -# End Source File -# Begin Source File - SOURCE=..\..\srclib\zlib\trees.c # End Source File # Begin Source File diff -uwr httpd-2.0.53.orig/modules/filters/mod_deflate.mak httpd-2.0.53/modules/filters/mod_deflate.mak --- httpd-2.0.53.orig/modules/filters/mod_deflate.mak 2004-11-24 11:31:10.000000000 -0800 +++ httpd-2.0.53/modules/filters/mod_deflate.mak 2005-02-16 17:55:53.031250000 -0800 @@ -49,14 +49,12 @@ CLEAN : !ENDIF -@erase "$(INTDIR)\adler32.obj" + -@erase "$(INTDIR)\compress.obj" -@erase "$(INTDIR)\crc32.obj" -@erase "$(INTDIR)\deflate.obj" - -@erase "$(INTDIR)\infblock.obj" - -@erase "$(INTDIR)\infcodes.obj" -@erase "$(INTDIR)\inffast.obj" -@erase "$(INTDIR)\inflate.obj" -@erase "$(INTDIR)\inftrees.obj" - -@erase "$(INTDIR)\infutil.obj" -@erase "$(INTDIR)\mod_deflate.obj" -@erase "$(INTDIR)\mod_deflate.res" -@erase "$(INTDIR)\mod_deflate_src.idb" @@ -116,14 +114,12 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_deflate.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_deflate.so" /implib:"$(OUTDIR)\mod_deflate.lib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so /opt:ref LINK32_OBJS= \ "$(INTDIR)\adler32.obj" \ + "$(INTDIR)\compress.obj" \ "$(INTDIR)\crc32.obj" \ "$(INTDIR)\deflate.obj" \ - "$(INTDIR)\infblock.obj" \ - "$(INTDIR)\infcodes.obj" \ "$(INTDIR)\inffast.obj" \ "$(INTDIR)\inflate.obj" \ "$(INTDIR)\inftrees.obj" \ - "$(INTDIR)\infutil.obj" \ "$(INTDIR)\trees.obj" \ "$(INTDIR)\zutil.obj" \ "$(INTDIR)\mod_deflate.obj" \ @@ -161,14 +157,12 @@ CLEAN : !ENDIF -@erase "$(INTDIR)\adler32.obj" + -@erase "$(INTDIR)\compress.obj" -@erase "$(INTDIR)\crc32.obj" -@erase "$(INTDIR)\deflate.obj" - -@erase "$(INTDIR)\infblock.obj" - -@erase "$(INTDIR)\infcodes.obj" -@erase "$(INTDIR)\inffast.obj" -@erase "$(INTDIR)\inflate.obj" -@erase "$(INTDIR)\inftrees.obj" - -@erase "$(INTDIR)\infutil.obj" -@erase "$(INTDIR)\mod_deflate.obj" -@erase "$(INTDIR)\mod_deflate.res" -@erase "$(INTDIR)\mod_deflate_src.idb" @@ -228,14 +222,12 @@ LINK32_FLAGS=kernel32.lib /nologo /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\mod_deflate.pdb" /debug /machine:I386 /out:"$(OUTDIR)\mod_deflate.so" /implib:"$(OUTDIR)\mod_deflate.lib" /base:@..\..\os\win32\BaseAddr.ref,mod_deflate.so LINK32_OBJS= \ "$(INTDIR)\adler32.obj" \ + "$(INTDIR)\compress.obj" \ "$(INTDIR)\crc32.obj" \ "$(INTDIR)\deflate.obj" \ - "$(INTDIR)\infblock.obj" \ - "$(INTDIR)\infcodes.obj" \ "$(INTDIR)\inffast.obj" \ "$(INTDIR)\inflate.obj" \ "$(INTDIR)\inftrees.obj" \ - "$(INTDIR)\infutil.obj" \ "$(INTDIR)\trees.obj" \ "$(INTDIR)\zutil.obj" \ "$(INTDIR)\mod_deflate.obj" \ @@ -268,27 +260,21 @@ $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\srclib\zlib\crc32.c - -"$(INTDIR)\crc32.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=..\..\srclib\zlib\compress.c - -SOURCE=..\..\srclib\zlib\deflate.c - -"$(INTDIR)\deflate.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\compress.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\srclib\zlib\infblock.c +SOURCE=..\..\srclib\zlib\crc32.c -"$(INTDIR)\infblock.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\crc32.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\srclib\zlib\infcodes.c +SOURCE=..\..\srclib\zlib\deflate.c -"$(INTDIR)\infcodes.obj" : $(SOURCE) "$(INTDIR)" +"$(INTDIR)\deflate.obj" : $(SOURCE) "$(INTDIR)" $(CPP) $(CPP_PROJ) $(SOURCE) @@ -310,12 +296,6 @@ $(CPP) $(CPP_PROJ) $(SOURCE) -SOURCE=..\..\srclib\zlib\infutil.c - -"$(INTDIR)\infutil.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - SOURCE=..\..\srclib\zlib\trees.c "$(INTDIR)\trees.obj" : $(SOURCE) "$(INTDIR)"