httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@hyperreal.org>
Subject cvs commit: apachen/src/core http_main.c
Date Sun, 17 Aug 1997 12:57:05 GMT
ben         97/08/17 05:57:04

  Modified:    src      Makefile.nt
               src/core http_main.c
  Log:
  More NT fixes.
  
  Revision  Changes    Path
  1.13      +20 -20    apachen/src/Makefile.nt
  
  Index: Makefile.nt
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/Makefile.nt,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.nt	1997/08/16 14:24:02	1.12
  +++ Makefile.nt	1997/08/17 12:57:00	1.13
  @@ -1,5 +1,5 @@
  -# Makefile for NT
  -# Note that this doesn't quite work... apache.exe doesn't depend on proxy.lib
  +# Makefile for Win32
  +# Note that this doesn't quite work... ApacheCore.dll doesn't depend on proxy.lib
   # or regex.lib. Nor can it, without some messing about - the debug and release
   # versions need different dependencies, and that isn't an option.
   # One way that occurs to me to solve the problem is to have the proxy and
  @@ -36,38 +36,38 @@
   	cd os\win32 & set CFG=ApacheModuleUserTrack - Win32 Debug& nmake /nologo -f ApacheModuleUserTrack.mak
   	cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Debug& nmake /nologo -f ApacheModuleProxy.mak
   
  -installr: apacher
  +installr: _apacher
   	-mkdir \Apache
   	-mkdir \Apache\modules
   	-mkdir \Apache\logs
   	-mkdir \Apache\conf
   	copy ApacheR\Apache.exe \Apache
   	copy CoreR\ApacheCore.dll \Apache
  -	copy nt\ApacheModuleStatusR\ApacheModuleStatus.dll \Apache\modules
  -#       copy nt\ApacheModuleInfoR\ApacheModuleInfo.dll \Apache\modules
  -	copy nt\ApacheModuleAuthAnonR\ApacheModuleAuthAnon.dll \Apache\modules
  -	copy nt\ApacheModuleDigestR\ApacheModuleDigest.dll \Apache\modules
  -	copy nt\ApacheModuleCERNMetaR\ApacheModuleCERNMeta.dll \Apache\modules
  -	copy nt\ApacheModuleExpiresR\ApacheModuleExpires.dll \Apache\modules
  -	copy nt\ApacheModuleHeadersR\ApacheModuleHeaders.dll \Apache\modules
  -	copy nt\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll \Apache\modules
  +	copy os\win32\ApacheModuleStatusR\ApacheModuleStatus.dll \Apache\modules
  +#       copy os\win32\ApacheModuleInfoR\ApacheModuleInfo.dll \Apache\modules
  +	copy os\win32\ApacheModuleAuthAnonR\ApacheModuleAuthAnon.dll \Apache\modules
  +	copy os\win32\ApacheModuleDigestR\ApacheModuleDigest.dll \Apache\modules
  +	copy os\win32\ApacheModuleCERNMetaR\ApacheModuleCERNMeta.dll \Apache\modules
  +	copy os\win32\ApacheModuleExpiresR\ApacheModuleExpires.dll \Apache\modules
  +	copy os\win32\ApacheModuleHeadersR\ApacheModuleHeaders.dll \Apache\modules
  +	copy os\win32\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll \Apache\modules
   	copy modules\proxy\Release\ApacheModuleProxy.dll \Apache\modules
   
  -installd: apached
  +installd: _apached
   	-mkdir \Apache
   	-mkdir \Apache\modules
   	-mkdir \Apache\logs
   	-mkdir \Apache\conf
   	copy ApacheD\Apache.exe \Apache
   	copy CoreD\ApacheCore.dll \Apache
  -	copy nt\ApacheModuleStatusD\ApacheModuleStatus.dll \Apache\modules
  -#       copy nt\ApacheModuleInfoD\ApacheModuleInfo.dll \Apache\modules
  -	copy nt\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll \Apache\modules
  -	copy nt\ApacheModuleDigestD\ApacheModuleDigest.dll \Apache\modules
  -	copy nt\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules
  -	copy nt\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules
  -	copy nt\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache\modules
  -	copy nt\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache\modules
  +	copy os\win32\ApacheModuleStatusD\ApacheModuleStatus.dll \Apache\modules
  +#       copy os\win32\ApacheModuleInfoD\ApacheModuleInfo.dll \Apache\modules
  +	copy os\win32\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll \Apache\modules
  +	copy os\win32\ApacheModuleDigestD\ApacheModuleDigest.dll \Apache\modules
  +	copy os\win32\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules
  +	copy os\win32\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules
  +	copy os\win32\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache\modules
  +	copy os\win32\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache\modules
   	copy modules\proxy\Debug\ApacheModuleProxy.dll \Apache\modules
   
   cleanr:
  
  
  
  1.203     +2 -0      apachen/src/core/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/core/http_main.c,v
  retrieving revision 1.202
  retrieving revision 1.203
  diff -u -r1.202 -r1.203
  --- http_main.c	1997/08/17 11:40:12	1.202
  +++ http_main.c	1997/08/17 12:57:03	1.203
  @@ -1457,7 +1457,9 @@
       old_status = ss->status;
       ss->x.pid = my_pid;
       ss->status = status;
  +#ifdef OPTIMIZE_TIMEOUTS
       ++ss->cur_vtime;
  +#endif
   
   #if defined(STATUS)
   #ifdef OPTIMIZE_TIMEOUTS
  
  
  

Mime
View raw message