httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@hyperreal.org>
Subject cvs commit: apache/src/nt modules.c
Date Sat, 09 Aug 1997 11:52:10 GMT
ben         97/08/09 04:52:09

  Modified:    src      ApacheCore.dsp ApacheCore.mak http_request.c
                        mod_cgi.c
               src/nt   modules.c
  Log:
  Make things compile under Win32 once more. Fix some warnings.
  
  Revision  Changes    Path
  1.4       +8 -4      apache/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===================================================================
  RCS file: /export/home/cvs/apache/src/ApacheCore.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheCore.dsp	1997/07/22 19:25:17	1.3
  +++ ApacheCore.dsp	1997/08/09 11:52:03	1.4
  @@ -109,6 +109,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\fnmatch.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\nt\getopt.c
   # End Source File
   # Begin Source File
  @@ -169,10 +173,6 @@
   # End Source File
   # Begin Source File
   
  -SOURCE=.\mod_browser.c
  -# End Source File
  -# Begin Source File
  -
   SOURCE=.\mod_cgi.c
   # End Source File
   # Begin Source File
  @@ -210,6 +210,10 @@
   # Begin Source File
   
   SOURCE=.\mod_negotiation.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\mod_setenvif.c
   # End Source File
   # Begin Source File
   
  
  
  
  1.10      +328 -244  apache/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===================================================================
  RCS file: /export/home/cvs/apache/src/ApacheCore.mak,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheCore.mak	1997/07/22 19:25:17	1.9
  +++ ApacheCore.mak	1997/08/09 11:52:04	1.10
  @@ -28,10 +28,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -MTL=midl.exe
  -RSC=rc.exe
  -
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
   OUTDIR=.\CoreR
  @@ -54,6 +50,7 @@
   	-@erase "$(INTDIR)\alloc.obj"
   	-@erase "$(INTDIR)\buff.obj"
   	-@erase "$(INTDIR)\explain.obj"
  +	-@erase "$(INTDIR)\fnmatch.obj"
   	-@erase "$(INTDIR)\getopt.obj"
   	-@erase "$(INTDIR)\http_bprintf.obj"
   	-@erase "$(INTDIR)\http_config.obj"
  @@ -69,7 +66,6 @@
   	-@erase "$(INTDIR)\mod_asis.obj"
   	-@erase "$(INTDIR)\mod_auth.obj"
   	-@erase "$(INTDIR)\mod_autoindex.obj"
  -	-@erase "$(INTDIR)\mod_browser.obj"
   	-@erase "$(INTDIR)\mod_cgi.obj"
   	-@erase "$(INTDIR)\mod_dir.obj"
   	-@erase "$(INTDIR)\mod_dll.obj"
  @@ -80,6 +76,7 @@
   	-@erase "$(INTDIR)\mod_log_config.obj"
   	-@erase "$(INTDIR)\mod_mime.obj"
   	-@erase "$(INTDIR)\mod_negotiation.obj"
  +	-@erase "$(INTDIR)\mod_setenvif.obj"
   	-@erase "$(INTDIR)\mod_userdir.obj"
   	-@erase "$(INTDIR)\modules.obj"
   	-@erase "$(INTDIR)\multithread.obj"
  @@ -99,12 +96,46 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /D "WIN32" /D "NDEBUG" /D\
    "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
    /FD /c 
   CPP_OBJS=.\CoreR/
   CPP_SBRS=.
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +MTL=midl.exe
   MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  +RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" 
   BSC32_SBRS= \
  @@ -122,6 +153,7 @@
   	"$(INTDIR)\alloc.obj" \
   	"$(INTDIR)\buff.obj" \
   	"$(INTDIR)\explain.obj" \
  +	"$(INTDIR)\fnmatch.obj" \
   	"$(INTDIR)\getopt.obj" \
   	"$(INTDIR)\http_bprintf.obj" \
   	"$(INTDIR)\http_config.obj" \
  @@ -137,7 +169,6 @@
   	"$(INTDIR)\mod_asis.obj" \
   	"$(INTDIR)\mod_auth.obj" \
   	"$(INTDIR)\mod_autoindex.obj" \
  -	"$(INTDIR)\mod_browser.obj" \
   	"$(INTDIR)\mod_cgi.obj" \
   	"$(INTDIR)\mod_dir.obj" \
   	"$(INTDIR)\mod_dll.obj" \
  @@ -148,6 +179,7 @@
   	"$(INTDIR)\mod_log_config.obj" \
   	"$(INTDIR)\mod_mime.obj" \
   	"$(INTDIR)\mod_negotiation.obj" \
  +	"$(INTDIR)\mod_setenvif.obj" \
   	"$(INTDIR)\mod_userdir.obj" \
   	"$(INTDIR)\modules.obj" \
   	"$(INTDIR)\multithread.obj" \
  @@ -190,6 +222,8 @@
   	-@erase "$(INTDIR)\buff.sbr"
   	-@erase "$(INTDIR)\explain.obj"
   	-@erase "$(INTDIR)\explain.sbr"
  +	-@erase "$(INTDIR)\fnmatch.obj"
  +	-@erase "$(INTDIR)\fnmatch.sbr"
   	-@erase "$(INTDIR)\getopt.obj"
   	-@erase "$(INTDIR)\getopt.sbr"
   	-@erase "$(INTDIR)\http_bprintf.obj"
  @@ -220,8 +254,6 @@
   	-@erase "$(INTDIR)\mod_auth.sbr"
   	-@erase "$(INTDIR)\mod_autoindex.obj"
   	-@erase "$(INTDIR)\mod_autoindex.sbr"
  -	-@erase "$(INTDIR)\mod_browser.obj"
  -	-@erase "$(INTDIR)\mod_browser.sbr"
   	-@erase "$(INTDIR)\mod_cgi.obj"
   	-@erase "$(INTDIR)\mod_cgi.sbr"
   	-@erase "$(INTDIR)\mod_dir.obj"
  @@ -242,6 +274,8 @@
   	-@erase "$(INTDIR)\mod_mime.sbr"
   	-@erase "$(INTDIR)\mod_negotiation.obj"
   	-@erase "$(INTDIR)\mod_negotiation.sbr"
  +	-@erase "$(INTDIR)\mod_setenvif.obj"
  +	-@erase "$(INTDIR)\mod_setenvif.sbr"
   	-@erase "$(INTDIR)\mod_userdir.obj"
   	-@erase "$(INTDIR)\mod_userdir.sbr"
   	-@erase "$(INTDIR)\modules.obj"
  @@ -276,18 +310,53 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /D "WIN32" /D "_DEBUG"\
    /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch" /YX\
    /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
   CPP_OBJS=.\CoreD/
   CPP_SBRS=.\CoreD/
  +
  +.c{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_OBJS)}.obj::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.c{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cpp{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +.cxx{$(CPP_SBRS)}.sbr::
  +   $(CPP) @<<
  +   $(CPP_PROJ) $< 
  +<<
  +
  +MTL=midl.exe
   MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  +RSC=rc.exe
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc" 
   BSC32_SBRS= \
   	"$(INTDIR)\alloc.sbr" \
   	"$(INTDIR)\buff.sbr" \
   	"$(INTDIR)\explain.sbr" \
  +	"$(INTDIR)\fnmatch.sbr" \
   	"$(INTDIR)\getopt.sbr" \
   	"$(INTDIR)\http_bprintf.sbr" \
   	"$(INTDIR)\http_config.sbr" \
  @@ -303,7 +372,6 @@
   	"$(INTDIR)\mod_asis.sbr" \
   	"$(INTDIR)\mod_auth.sbr" \
   	"$(INTDIR)\mod_autoindex.sbr" \
  -	"$(INTDIR)\mod_browser.sbr" \
   	"$(INTDIR)\mod_cgi.sbr" \
   	"$(INTDIR)\mod_dir.sbr" \
   	"$(INTDIR)\mod_dll.sbr" \
  @@ -314,6 +382,7 @@
   	"$(INTDIR)\mod_log_config.sbr" \
   	"$(INTDIR)\mod_mime.sbr" \
   	"$(INTDIR)\mod_negotiation.sbr" \
  +	"$(INTDIR)\mod_setenvif.sbr" \
   	"$(INTDIR)\mod_userdir.sbr" \
   	"$(INTDIR)\modules.sbr" \
   	"$(INTDIR)\multithread.sbr" \
  @@ -344,6 +413,7 @@
   	"$(INTDIR)\alloc.obj" \
   	"$(INTDIR)\buff.obj" \
   	"$(INTDIR)\explain.obj" \
  +	"$(INTDIR)\fnmatch.obj" \
   	"$(INTDIR)\getopt.obj" \
   	"$(INTDIR)\http_bprintf.obj" \
   	"$(INTDIR)\http_config.obj" \
  @@ -359,7 +429,6 @@
   	"$(INTDIR)\mod_asis.obj" \
   	"$(INTDIR)\mod_auth.obj" \
   	"$(INTDIR)\mod_autoindex.obj" \
  -	"$(INTDIR)\mod_browser.obj" \
   	"$(INTDIR)\mod_cgi.obj" \
   	"$(INTDIR)\mod_dir.obj" \
   	"$(INTDIR)\mod_dll.obj" \
  @@ -370,6 +439,7 @@
   	"$(INTDIR)\mod_log_config.obj" \
   	"$(INTDIR)\mod_mime.obj" \
   	"$(INTDIR)\mod_negotiation.obj" \
  +	"$(INTDIR)\mod_setenvif.obj" \
   	"$(INTDIR)\mod_userdir.obj" \
   	"$(INTDIR)\modules.obj" \
   	"$(INTDIR)\multithread.obj" \
  @@ -389,36 +459,6 @@
   
   !ENDIF 
   
  -.c{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_OBJS)}.obj::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.c{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cpp{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
  -.cxx{$(CPP_SBRS)}.sbr::
  -   $(CPP) @<<
  -   $(CPP_PROJ) $< 
  -<<
  -
   
   !IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
    "ApacheCore - Win32 Debug"
  @@ -434,6 +474,11 @@
   	".\multithread.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_ALLOC=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
  @@ -449,11 +494,6 @@
   	".\multithread.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_ALLOC=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\alloc.obj"	"$(INTDIR)\alloc.sbr" : $(SOURCE) $(DEP_CPP_ALLOC)\
  @@ -474,6 +514,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_BUFF_=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
  @@ -489,11 +534,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_BUFF_=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\buff.obj"	"$(INTDIR)\buff.sbr" : $(SOURCE) $(DEP_CPP_BUFF_)\
  @@ -522,6 +562,26 @@
   
   !ENDIF 
   
  +SOURCE=.\fnmatch.c
  +DEP_CPP_FNMAT=\
  +	".\fnmatch.h"\
  +	
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
  +
  +"$(INTDIR)\fnmatch.obj" : $(SOURCE) $(DEP_CPP_FNMAT) "$(INTDIR)"
  +
  +
  +!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  +
  +
  +"$(INTDIR)\fnmatch.obj"	"$(INTDIR)\fnmatch.sbr" : $(SOURCE) $(DEP_CPP_FNMAT)\
  + "$(INTDIR)"
  +
  +
  +!ENDIF 
  +
   SOURCE=.\nt\getopt.c
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
  @@ -551,6 +611,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_HTTP_=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
  @@ -565,11 +630,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_HTTP_=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\http_bprintf.obj"	"$(INTDIR)\http_bprintf.sbr" : $(SOURCE)\
  @@ -595,6 +655,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_HTTP_C=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
  @@ -615,11 +680,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_HTTP_C=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\http_config.obj"	"$(INTDIR)\http_config.sbr" : $(SOURCE)\
  @@ -636,6 +696,7 @@
   	".\alloc.h"\
   	".\buff.h"\
   	".\conf.h"\
  +	".\fnmatch.h"\
   	".\http_conf_globals.h"\
   	".\http_config.h"\
   	".\http_core.h"\
  @@ -649,6 +710,11 @@
   	".\rfc1413.h"\
   	".\scoreboard.h"\
   	".\util_md5.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_HTTP_CO=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
  @@ -660,6 +726,7 @@
   	".\alloc.h"\
   	".\buff.h"\
   	".\conf.h"\
  +	".\fnmatch.h"\
   	".\http_conf_globals.h"\
   	".\http_config.h"\
   	".\http_core.h"\
  @@ -673,11 +740,6 @@
   	".\rfc1413.h"\
   	".\scoreboard.h"\
   	".\util_md5.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_HTTP_CO=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\http_core.obj"	"$(INTDIR)\http_core.sbr" : $(SOURCE)\
  @@ -700,6 +762,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_HTTP_L=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
  @@ -717,11 +784,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_HTTP_L=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\http_log.obj"	"$(INTDIR)\http_log.sbr" : $(SOURCE) $(DEP_CPP_HTTP_L)\
  @@ -753,6 +815,11 @@
   	".\nt\service.h"\
   	".\regex\regex.h"\
   	".\scoreboard.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_HTTP_M=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
  @@ -779,11 +846,6 @@
   	".\nt\service.h"\
   	".\regex\regex.h"\
   	".\scoreboard.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_HTTP_M=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\http_main.obj"	"$(INTDIR)\http_main.sbr" : $(SOURCE)\
  @@ -800,6 +862,7 @@
   	".\alloc.h"\
   	".\buff.h"\
   	".\conf.h"\
  +	".\http_conf_globals.h"\
   	".\http_config.h"\
   	".\http_core.h"\
   	".\http_log.h"\
  @@ -809,6 +872,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_date.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_HTTP_P=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
  @@ -820,6 +888,7 @@
   	".\alloc.h"\
   	".\buff.h"\
   	".\conf.h"\
  +	".\http_conf_globals.h"\
   	".\http_config.h"\
   	".\http_core.h"\
   	".\http_log.h"\
  @@ -829,11 +898,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_date.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_HTTP_P=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\http_protocol.obj"	"$(INTDIR)\http_protocol.sbr" : $(SOURCE)\
  @@ -850,6 +914,7 @@
   	".\alloc.h"\
   	".\buff.h"\
   	".\conf.h"\
  +	".\fnmatch.h"\
   	".\http_config.h"\
   	".\http_core.h"\
   	".\http_log.h"\
  @@ -860,6 +925,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\scoreboard.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_HTTP_R=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
  @@ -871,6 +941,7 @@
   	".\alloc.h"\
   	".\buff.h"\
   	".\conf.h"\
  +	".\fnmatch.h"\
   	".\http_config.h"\
   	".\http_core.h"\
   	".\http_log.h"\
  @@ -881,11 +952,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\scoreboard.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_HTTP_R=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\http_request.obj"	"$(INTDIR)\http_request.sbr" : $(SOURCE)\
  @@ -902,6 +968,8 @@
   	".\conf.h"\
   	".\md5.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)"
  @@ -913,8 +981,6 @@
   	".\conf.h"\
   	".\md5.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\md5c.obj"	"$(INTDIR)\md5c.sbr" : $(SOURCE) $(DEP_CPP_MD5C_)\
  @@ -938,6 +1004,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_A=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
  @@ -956,11 +1027,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_A=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_access.obj"	"$(INTDIR)\mod_access.sbr" : $(SOURCE)\
  @@ -987,6 +1053,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_AC=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
  @@ -1008,11 +1079,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_AC=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_actions.obj"	"$(INTDIR)\mod_actions.sbr" : $(SOURCE)\
  @@ -1033,6 +1099,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_AL=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
  @@ -1048,11 +1119,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_AL=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_alias.obj"	"$(INTDIR)\mod_alias.sbr" : $(SOURCE)\
  @@ -1078,6 +1144,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_AS=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
  @@ -1098,11 +1169,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_AS=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_asis.obj"	"$(INTDIR)\mod_asis.sbr" : $(SOURCE) $(DEP_CPP_MOD_AS)\
  @@ -1126,8 +1192,13 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
  -
  +NODEP_CPP_MOD_AU=\
  +	".\sfio.h"\
  +	
  +
   "$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
   
   
  @@ -1144,11 +1215,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_AU=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_auth.obj"	"$(INTDIR)\mod_auth.sbr" : $(SOURCE) $(DEP_CPP_MOD_AU)\
  @@ -1175,6 +1241,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_AUT=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
  @@ -1196,11 +1267,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_AUT=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_autoindex.obj"	"$(INTDIR)\mod_autoindex.sbr" : $(SOURCE)\
  @@ -1209,46 +1275,6 @@
   
   !ENDIF 
   
  -SOURCE=.\mod_browser.c
  -
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -DEP_CPP_MOD_B=\
  -	".\alloc.h"\
  -	".\buff.h"\
  -	".\conf.h"\
  -	".\http_config.h"\
  -	".\httpd.h"\
  -	".\nt\readdir.h"\
  -	".\regex\regex.h"\
  -	
  -
  -"$(INTDIR)\mod_browser.obj" : $(SOURCE) $(DEP_CPP_MOD_B) "$(INTDIR)"
  -
  -
  -!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  -
  -DEP_CPP_MOD_B=\
  -	".\alloc.h"\
  -	".\buff.h"\
  -	".\conf.h"\
  -	".\http_config.h"\
  -	".\httpd.h"\
  -	".\nt\readdir.h"\
  -	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_B=\
  -	".\sfio.h"\
  -	
  -
  -"$(INTDIR)\mod_browser.obj"	"$(INTDIR)\mod_browser.sbr" : $(SOURCE)\
  - $(DEP_CPP_MOD_B) "$(INTDIR)"
  -
  -
  -!ENDIF 
  -
   SOURCE=.\mod_cgi.c
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
  @@ -1268,6 +1294,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_C=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
  @@ -1290,11 +1321,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_C=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_cgi.obj"	"$(INTDIR)\mod_cgi.sbr" : $(SOURCE) $(DEP_CPP_MOD_C)\
  @@ -1321,6 +1347,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_D=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
  @@ -1342,11 +1373,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_D=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_dir.obj"	"$(INTDIR)\mod_dir.sbr" : $(SOURCE) $(DEP_CPP_MOD_D)\
  @@ -1367,6 +1393,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_DL=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_dll.obj" : $(SOURCE) $(DEP_CPP_MOD_DL) "$(INTDIR)"
  @@ -1383,11 +1414,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_DL=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_dll.obj"	"$(INTDIR)\mod_dll.sbr" : $(SOURCE) $(DEP_CPP_MOD_DL)\
  @@ -1409,6 +1435,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_E=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
  @@ -1424,11 +1455,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_E=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_env.obj"	"$(INTDIR)\mod_env.sbr" : $(SOURCE) $(DEP_CPP_MOD_E)\
  @@ -1455,6 +1481,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_I=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
  @@ -1476,11 +1507,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_I=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_imap.obj"	"$(INTDIR)\mod_imap.sbr" : $(SOURCE) $(DEP_CPP_MOD_I)\
  @@ -1507,6 +1533,13 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_IN=\
  +	".\config.h"\
  +	".\modules\perl\mod_perl.h"\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
  @@ -1528,13 +1561,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_IN=\
  -	".\config.h"\
  -	".\modules\perl\mod_perl.h"\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_include.obj"	"$(INTDIR)\mod_include.sbr" : $(SOURCE)\
  @@ -1544,6 +1570,9 @@
   !ENDIF 
   
   SOURCE=.\nt\mod_isapi.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_MOD_IS=\
   	".\alloc.h"\
   	".\buff.h"\
  @@ -1564,15 +1593,26 @@
   	".\sfio.h"\
   	
   
  -!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  -
  -
   "$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  +DEP_CPP_MOD_IS=\
  +	".\alloc.h"\
  +	".\buff.h"\
  +	".\conf.h"\
  +	".\http_config.h"\
  +	".\http_core.h"\
  +	".\http_log.h"\
  +	".\http_protocol.h"\
  +	".\http_request.h"\
  +	".\httpd.h"\
  +	".\nt\readdir.h"\
  +	".\regex\regex.h"\
  +	".\util_script.h"\
  +	
   
   "$(INTDIR)\mod_isapi.obj"	"$(INTDIR)\mod_isapi.sbr" : $(SOURCE)\
    $(DEP_CPP_MOD_IS) "$(INTDIR)"
  @@ -1594,6 +1634,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_L=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
  @@ -1610,11 +1655,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_L=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_log_config.obj"	"$(INTDIR)\mod_log_config.sbr" : $(SOURCE)\
  @@ -1636,6 +1676,11 @@
   	".\mod_mime.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_M=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
  @@ -1652,11 +1697,6 @@
   	".\mod_mime.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_M=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_mime.obj"	"$(INTDIR)\mod_mime.sbr" : $(SOURCE) $(DEP_CPP_MOD_M)\
  @@ -1681,6 +1721,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_N=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
  @@ -1700,11 +1745,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MOD_N=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\mod_negotiation.obj"	"$(INTDIR)\mod_negotiation.sbr" : $(SOURCE)\
  @@ -1713,25 +1753,54 @@
   
   !ENDIF 
   
  -SOURCE=.\mod_userdir.c
  +SOURCE=.\mod_setenvif.c
   
   !IF  "$(CFG)" == "ApacheCore - Win32 Release"
   
  -DEP_CPP_MOD_U=\
  +DEP_CPP_MOD_S=\
   	".\alloc.h"\
   	".\buff.h"\
   	".\conf.h"\
   	".\http_config.h"\
  +	".\http_core.h"\
  +	".\http_log.h"\
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MOD_S=\
  +	".\sfio.h"\
   	
   
  -"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  +"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
   
   
   !ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
   
  +DEP_CPP_MOD_S=\
  +	".\alloc.h"\
  +	".\buff.h"\
  +	".\conf.h"\
  +	".\http_config.h"\
  +	".\http_core.h"\
  +	".\http_log.h"\
  +	".\httpd.h"\
  +	".\nt\readdir.h"\
  +	".\regex\regex.h"\
  +	
  +
  +"$(INTDIR)\mod_setenvif.obj"	"$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\
  + $(DEP_CPP_MOD_S) "$(INTDIR)"
  +
  +
  +!ENDIF 
  +
  +SOURCE=.\mod_userdir.c
  +
  +!IF  "$(CFG)" == "ApacheCore - Win32 Release"
  +
   DEP_CPP_MOD_U=\
   	".\alloc.h"\
   	".\buff.h"\
  @@ -1747,6 +1816,21 @@
   	".\sfio.h"\
   	
   
  +"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
  +
  +
  +!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
  +
  +DEP_CPP_MOD_U=\
  +	".\alloc.h"\
  +	".\buff.h"\
  +	".\conf.h"\
  +	".\http_config.h"\
  +	".\httpd.h"\
  +	".\nt\readdir.h"\
  +	".\regex\regex.h"\
  +	
  +
   "$(INTDIR)\mod_userdir.obj"	"$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\
    $(DEP_CPP_MOD_U) "$(INTDIR)"
   
  @@ -1765,6 +1849,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_MODUL=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
  @@ -1781,11 +1870,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_MODUL=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\modules.obj"	"$(INTDIR)\modules.sbr" : $(SOURCE) $(DEP_CPP_MODUL)\
  @@ -1803,6 +1887,8 @@
   	".\conf.h"\
   	".\multithread.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
  @@ -1815,8 +1901,6 @@
   	".\conf.h"\
   	".\multithread.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\multithread.obj"	"$(INTDIR)\multithread.sbr" : $(SOURCE)\
  @@ -1832,6 +1916,7 @@
   
   DEP_CPP_READD=\
   	".\nt\readdir.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
  @@ -1842,7 +1927,6 @@
   
   DEP_CPP_READD=\
   	".\nt\readdir.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\readdir.obj"	"$(INTDIR)\readdir.sbr" : $(SOURCE) $(DEP_CPP_READD)\
  @@ -1866,6 +1950,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\rfc1413.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_RFC14=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
  @@ -1883,11 +1972,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\rfc1413.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_RFC14=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\rfc1413.obj"	"$(INTDIR)\rfc1413.sbr" : $(SOURCE) $(DEP_CPP_RFC14)\
  @@ -1905,6 +1989,8 @@
   	".\multithread.h"\
   	".\nt\service.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
  @@ -1918,8 +2004,6 @@
   	".\multithread.h"\
   	".\nt\service.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\service.obj"	"$(INTDIR)\service.sbr" : $(SOURCE) $(DEP_CPP_SERVI)\
  @@ -1941,6 +2025,11 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_UTIL_=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
  @@ -1956,11 +2045,6 @@
   	".\httpd.h"\
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_UTIL_=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\util.obj"	"$(INTDIR)\util.sbr" : $(SOURCE) $(DEP_CPP_UTIL_)\
  @@ -1977,6 +2061,8 @@
   	".\conf.h"\
   	".\regex\regex.h"\
   	".\util_date.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
  @@ -1988,8 +2074,6 @@
   	".\conf.h"\
   	".\regex\regex.h"\
   	".\util_date.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\util_date.obj"	"$(INTDIR)\util_date.sbr" : $(SOURCE)\
  @@ -2011,6 +2095,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_md5.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_UTIL_M=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
  @@ -2027,11 +2116,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_md5.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_UTIL_M=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\util_md5.obj"	"$(INTDIR)\util_md5.sbr" : $(SOURCE) $(DEP_CPP_UTIL_M)\
  @@ -2059,6 +2143,11 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
  +	
  +NODEP_CPP_UTIL_S=\
  +	".\sfio.h"\
   	
   
   "$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
  @@ -2081,11 +2170,6 @@
   	".\nt\readdir.h"\
   	".\regex\regex.h"\
   	".\util_script.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
  -	
  -NODEP_CPP_UTIL_S=\
  -	".\sfio.h"\
   	
   
   "$(INTDIR)\util_script.obj"	"$(INTDIR)\util_script.sbr" : $(SOURCE)\
  @@ -2101,6 +2185,8 @@
   DEP_CPP_UTIL_SN=\
   	".\conf.h"\
   	".\regex\regex.h"\
  +	{$(INCLUDE)}"sys\stat.h"\
  +	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\util_snprintf.obj" : $(SOURCE) $(DEP_CPP_UTIL_SN) "$(INTDIR)"
  @@ -2111,8 +2197,6 @@
   DEP_CPP_UTIL_SN=\
   	".\conf.h"\
   	".\regex\regex.h"\
  -	{$(INCLUDE)}"sys\stat.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
   "$(INTDIR)\util_snprintf.obj"	"$(INTDIR)\util_snprintf.sbr" : $(SOURCE)\
  
  
  
  1.74      +3 -2      apache/src/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_request.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- http_request.c	1997/08/08 08:00:20	1.73
  +++ http_request.c	1997/08/09 11:52:04	1.74
  @@ -253,8 +253,9 @@
       int num_sec = sec_array->nelts;
       char *test_filename = pstrdup (r->pool, r->filename);
       char *test_dirname;
  -    int num_dirs, res;
  -    int i, j, test_filename_len;
  +    int res;
  +    unsigned i,num_dirs;
  +    int j, test_filename_len;
   
       /* Are we dealing with a file? If not, we can (hopefuly) safely assume
        * we have a handler that doesn't require one, but for safety's sake,
  
  
  
  1.53      +1 -1      apache/src/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- mod_cgi.c	1997/07/28 18:22:55	1.52
  +++ mod_cgi.c	1997/08/09 11:52:06	1.53
  @@ -458,7 +458,7 @@
   	    }
   	    reset_timeout(r);
   	    if (bwrite(script_out, argsbuffer, len_read)
  -	            < (size_t)len_read) {
  +	            < len_read) {
   	        /* silly script stopped reading, soak up remaining message */
   	        while (get_client_block(r, argsbuffer, HUGE_STRING_LEN) > 0)
   	            ; /* dump it */
  
  
  
  1.5       +3 -3      apache/src/nt/modules.c
  
  Index: modules.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/nt/modules.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- modules.c	1997/07/22 19:25:20	1.4
  +++ modules.c	1997/08/09 11:52:08	1.5
  @@ -22,7 +22,7 @@
   extern module asis_module;
   extern module imap_module;
   extern module action_module;
  -extern module browser_module;
  +extern module setenvif_module;
   extern module isapi_module;
   
   module *prelinked_modules[] = {
  @@ -43,7 +43,7 @@
     &asis_module,
     &imap_module,
     &action_module,
  -  &browser_module,
  +  &setenvif_module,
     &isapi_module,
     NULL
   };
  @@ -65,7 +65,7 @@
     &asis_module,
     &imap_module,
     &action_module,
  -  &browser_module,
  +  &setenvif_module,
     &isapi_module,
     NULL
   };
  
  
  

Mime
View raw message