cvs commit: apachen/src/main util_script.c

1997-09-13 Thread Rodent of Unusual Size 
coar97/09/13 05:15:41

  Modified:src/main util_script.c
  Log:
Add in the final missing #include needed to clean up the
set_last_modified() rework.
  
  Revision  ChangesPath
  1.72  +1 -0  apachen/src/main/util_script.c
  
  Index: util_script.c
  ===
  RCS file: /export/home/cvs/apachen/src/main/util_script.c,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- util_script.c 1997/09/12 18:56:05 1.71
  +++ util_script.c 1997/09/13 12:15:39 1.72
  @@ -60,6 +60,7 @@
   #include http_core.h   /* For document_root.  Sigh... */
   #include http_request.h   /* for sub_req_lookup_uri() */
   #include util_script.h
  +#include util_date.h   /* For parseHTTPdate() */
   
   /*
* Various utility functions which are common to a whole lot of

cvs commit: apachen/src/modules/proxy ApacheModuleProxy.dsp

1997-09-13 Thread Ben Laurie 
ben 97/09/13 16:10:53

  Modified:src  ApacheCore.mak
   src/main http_main.c scoreboard.h
   src/modules/proxy ApacheModuleProxy.dsp
  Log:
  Make things compile under Win32 again.
  
  Revision  ChangesPath
  1.16  +113 -289  apachen/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===
  RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ApacheCore.mak1997/09/12 08:05:42 1.15
  +++ ApacheCore.mak1997/09/13 23:10:47 1.16
  @@ -28,10 +28,6 @@
   NULL=nul
   !ENDIF 
   
  -CPP=cl.exe
  -MTL=midl.exe
  -RSC=rc.exe
  -
   !IF  $(CFG) == ApacheCore - Win32 Release
   
   OUTDIR=.\CoreR
  @@ -101,12 +97,46 @@
   $(OUTDIR) :
   if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /I .\regex /I .\main /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= \
  @@ -284,12 +314,46 @@
   $(OUTDIR) :
   if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
   
  +CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I .\regex /I .\main /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= \
  @@ -401,36 +465,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
  @@ -444,7 +478,6 @@
.\main\conf.h\
.\main\httpd.h\
.\main\multithread.h\
  - .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\

  @@ -461,7 +494,7 @@
.\main\conf.h\
.\main\httpd.h\
.\main\multithread.h\
  - .\os\win32\os.h\
  + .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\

  @@ -483,14 +516,8 @@
.\main\conf.h\
.\main\http_main.h\
.\main\httpd.h\
  - .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
  - {$(INCLUDE)}sys\stat.h\
  - {$(INCLUDE)}sys\types.h\
  - 
  -NODEP_CPP_BUFF_=\
  - .\main\sfio.h\

   
   $(INTDIR)\buff.obj : $(SOURCE) $(DEP_CPP_BUFF_) $(INTDIR)
  @@ -505,7 +532,7 @@
.\main\conf.h\
.\main\http_main.h\
.\main\httpd.h\
  - .\os\win32\os.h\
  + .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\

  @@ -588,14 +615,8 @@
.\main\buff.h\
.\main\conf.h\
.\main\httpd.h\
  - .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
  - {$(INCLUDE)}sys\stat.h\
  - {$(INCLUDE)}sys\types.h\
  - 
  -NODEP_CPP_HTTP_=\
  - .\main\sfio.h\

   
   $(INTDIR)\http_bprintf.obj : $(SOURCE) $(DEP_CPP_HTTP_) $(INTDIR)
  @@ -609,7 +630,7 @@
.\main\buff.h\
.\main\conf.h\
.\main\httpd.h\
  - .\os\win32\os.h\
  + .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\

  @@ -636,14 +657,8 @@
.\main\http_log.h\
.\main\http_request.h\
.\main\httpd.h\
  - .\main\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\
  - {$(INCLUDE)}sys\stat.h\
  - {$(INCLUDE)}sys\types.h\
  -

cvs commit: apachen/src/os/win32 ApacheOS.dsp ApacheOS.mak

1997-09-13 Thread Ben Laurie 
ben 97/09/13 16:46:31

  Modified:src  ApacheCore.dsp ApacheCore.mak
   src/main conf.h
   src/os/win32 ApacheOS.dsp ApacheOS.mak
  Log:
  Use os.h in its original place.
  
  Revision  ChangesPath
  1.10  +4 -0  apachen/src/ApacheCore.dsp
  
  Index: ApacheCore.dsp
  ===
  RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheCore.dsp1997/09/12 08:05:41 1.9
  +++ ApacheCore.dsp1997/09/13 23:46:25 1.10
  @@ -337,6 +337,10 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=.\os\win32\os.h
  +# End Source File
  +# Begin Source File
  +
   SOURCE=.\os\win32\readdir.h
   # End Source File
   # Begin Source File
  
  
  
  1.17  +72 -106   apachen/src/ApacheCore.mak
  
  Index: ApacheCore.mak
  ===
  RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ApacheCore.mak1997/09/13 23:10:47 1.16
  +++ ApacheCore.mak1997/09/13 23:46:26 1.17
  @@ -28,6 +28,10 @@
   NULL=nul
   !ENDIF 
   
  +CPP=cl.exe
  +MTL=midl.exe
  +RSC=rc.exe
  +
   !IF  $(CFG) == ApacheCore - Win32 Release
   
   OUTDIR=.\CoreR
  @@ -97,46 +101,12 @@
   $(OUTDIR) :
   if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /GX /O2 /I .\regex /I .\main /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= \
  @@ -314,46 +284,12 @@
   $(OUTDIR) :
   if not exist $(OUTDIR)/$(NULL) mkdir $(OUTDIR)
   
  -CPP=cl.exe
   CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I .\regex /I .\main /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= \
  @@ -465,6 +401,36 @@
   
   !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
  @@ -494,7 +460,7 @@
.\main\conf.h\
.\main\httpd.h\
.\main\multithread.h\
  - .\main\os.h\
  + .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\

  @@ -532,7 +498,7 @@
.\main\conf.h\
.\main\http_main.h\
.\main\httpd.h\
  - .\main\os.h\
  + .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\

  @@ -630,7 +596,7 @@
.\main\buff.h\
.\main\conf.h\
.\main\httpd.h\
  - .\main\os.h\
  + .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\

  @@ -678,7 +644,7 @@
.\main\http_log.h\
.\main\http_request.h\
.\main\httpd.h\
  - .\main\os.h\
  + .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\

  @@ -734,10 +700,10 @@
.\main\http_request.h\
.\main\httpd.h\
.\main\md5.h\
  - .\main\os.h\
.\main\rfc1413.h\
.\main\scoreboard.h\
.\main\util_md5.h\
  + .\os\win32\os.h\
.\os\win32\readdir.h\
.\regex\regex.h\

  @@ -780,7 +746,7 @@
.\main\http_log.h\