httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: httpd-2.0/support ab.c ab.dsp htdigest.c htdigest.dsp htpasswd.c htpasswd.dsp logresolve.c logresolve.dsp rotatelogs.c rotatelogs.dsp
Date Thu, 21 Dec 2000 21:00:48 GMT
wrowe       00/12/21 13:00:48

  Modified:    support  ab.c ab.dsp htdigest.c htdigest.dsp htpasswd.c
                        htpasswd.dsp logresolve.c logresolve.dsp
                        rotatelogs.c rotatelogs.dsp
  Log:
    All the supports now build on APR (+APRUTIL), no reliance on httpd.
  
  Revision  Changes    Path
  1.45      +6 -6      httpd-2.0/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- ab.c	2000/12/21 20:29:26	1.44
  +++ ab.c	2000/12/21 21:00:43	1.45
  @@ -130,16 +130,16 @@
   #ifdef NOT_ASCII
   #include "apr_xlate.h"
   #endif
  -#ifdef HAVE_STRING_H
  +#if APR_HAVE_STRING_H
   #include <string.h>
   #endif
  -#ifdef HAVE_STDIO_H
  +#if APR_HAVE_STDIO_H
   #include <stdio.h>
   #endif
  -#ifdef HAVE_STDLIB_H
  +#if APR_HAVE_STDLIB_H
   #include <stdlib.h>
   #endif
  -#ifdef HAVE_CTYPE_H
  +#if APR_HAVE_CTYPE_H
   #include <ctype.h>
   #endif
   
  @@ -893,14 +893,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.44 $>
apache-2.0");
  +        printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.45 $>
apache-2.0");
           printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
           printf("Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/\n");
           printf("\n");
       }
       else {
           printf("<p>\n");
  -        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i>
apache-2.0<br>\n", AB_VERSION, "$Revision: 1.44 $");
  +        printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i>
apache-2.0<br>\n", AB_VERSION, "$Revision: 1.45 $");
           printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
           printf(" Copyright (c) 1998-2000 The Apache Software Foundation, http://www.apache.org/<br>\n");
           printf("</p>\n<p>\n");
  
  
  
  1.16      +12 -15    httpd-2.0/support/ab.dsp
  
  Index: ab.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/ab.dsp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ab.dsp	2000/12/21 01:25:09	1.15
  +++ ab.dsp	2000/12/21 21:00:44	1.16
  @@ -32,8 +32,8 @@
   
   # PROP BASE Use_MFC 0
   # PROP BASE Use_Debug_Libraries 0
  -# PROP BASE Output_Dir "ab"
  -# PROP BASE Intermediate_Dir "ab"
  +# PROP BASE Output_Dir "Release"
  +# PROP BASE Intermediate_Dir "Release"
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 0
  @@ -41,24 +41,23 @@
   # PROP Intermediate_Dir "Release"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD
/c
  -# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Release/ab" /FD /c
  +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Release/ab"
/FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/map /machine:I386
  -# SUBTRACT LINK32 /pdb:none
  +# ADD BASE LINK32 kernel32.lib user32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "ab - Win32 Debug"
   
   # PROP BASE Use_MFC 0
   # PROP BASE Use_Debug_Libraries 1
  -# PROP BASE Output_Dir "ab0"
  -# PROP BASE Intermediate_Dir "ab0"
  +# PROP BASE Output_Dir "Debug"
  +# PROP BASE Intermediate_Dir "Debug"
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 1
  @@ -66,18 +65,16 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Debug/ab" /FD /c
  -# SUBTRACT CPP /YX
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/ab"
/FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# SUBTRACT LINK32 /incremental:no /map
  +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
   
   !ENDIF 
   
  
  
  
  1.18      +3 -3      httpd-2.0/support/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- htdigest.c	2000/12/20 16:43:54	1.17
  +++ htdigest.c	2000/12/21 21:00:44	1.18
  @@ -74,15 +74,15 @@
   #include <stdio.h>
   #endif
   
  -#ifdef HAVE_SYS_TYPES_H
  +#if APR_HAVE_SYS_TYPES_H
   #include <sys/types.h>
   #endif
   
  -#ifdef HAVE_SYS_SIGNAL_H
  +#if APR_HAVE_SYS_SIGNAL_H
   #include <sys/signal.h>
   #endif
   
  -#ifdef HAVE_SIGNAL_H
  +#if APR_HAVE_SIGNAL_H
   #include <signal.h>
   #endif
   
  
  
  
  1.17      +12 -15    httpd-2.0/support/htdigest.dsp
  
  Index: htdigest.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.dsp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- htdigest.dsp	2000/12/21 01:25:10	1.16
  +++ htdigest.dsp	2000/12/21 21:00:44	1.17
  @@ -32,8 +32,8 @@
   
   # PROP BASE Use_MFC 0
   # PROP BASE Use_Debug_Libraries 0
  -# PROP BASE Output_Dir "htdigest"
  -# PROP BASE Intermediate_Dir "htdigest"
  +# PROP BASE Output_Dir "Release"
  +# PROP BASE Intermediate_Dir "Release"
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 0
  @@ -41,24 +41,23 @@
   # PROP Intermediate_Dir "Release"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD
/c
  -# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Release/htdigest" /FD /c
  +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Release/htdigest"
/FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/map /machine:I386
  -# SUBTRACT LINK32 /pdb:none
  +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "htdigest - Win32 Debug"
   
   # PROP BASE Use_MFC 0
   # PROP BASE Use_Debug_Libraries 1
  -# PROP BASE Output_Dir "htdiges0"
  -# PROP BASE Intermediate_Dir "htdiges0"
  +# PROP BASE Output_Dir "Debug"
  +# PROP BASE Intermediate_Dir "Debug"
   # PROP BASE Target_Dir ""
   # PROP Use_MFC 0
   # PROP Use_Debug_Libraries 1
  @@ -66,18 +65,16 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Debug/htdigest" /FD /c
  -# SUBTRACT CPP /YX
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/htdigest"
/FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# SUBTRACT LINK32 /incremental:no /map
  +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
   
   !ENDIF 
   
  
  
  
  1.29      +3 -1      httpd-2.0/support/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htpasswd.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- htpasswd.c	2000/12/21 20:32:33	1.28
  +++ htpasswd.c	2000/12/21 21:00:44	1.29
  @@ -92,10 +92,12 @@
   
   #include "apr_md5.h"
   #include "ap_sha1.h"
  +#if APR_HAVE_SIGNAL_H
   #include <signal.h>
  +#endif
   #include <time.h>
   
  -#ifdef HAVE_CRYPT_H
  +#if APR_HAVE_CRYPT_H
   #include <crypt.h>
   #endif
   
  
  
  
  1.17      +8 -11     httpd-2.0/support/htpasswd.dsp
  
  Index: htpasswd.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htpasswd.dsp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- htpasswd.dsp	2000/12/21 01:25:10	1.16
  +++ htpasswd.dsp	2000/12/21 21:00:45	1.17
  @@ -41,17 +41,16 @@
   # PROP Intermediate_Dir "Release"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD
/c
  -# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Release/htpasswd" /FD /c
  -# SUBTRACT CPP /YX
  +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Release/htpasswd"
/FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/map /machine:I386
  +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "htpasswd - Win32 Debug"
   
  @@ -66,18 +65,16 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Debug/htpasswd" /FD /c
  -# SUBTRACT CPP /YX
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/htpasswd"
/FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# SUBTRACT LINK32 /pdb:none /incremental:no /map
  +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
   
   !ENDIF 
   
  
  
  
  1.13      +8 -6      httpd-2.0/support/logresolve.c
  
  Index: logresolve.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/logresolve.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- logresolve.c	2000/12/21 20:33:50	1.12
  +++ logresolve.c	2000/12/21 21:00:45	1.13
  @@ -40,20 +40,22 @@
    */
   
   #include "apr_lib.h"
  +#if APR_HAVE_STDIO_H
   #include <stdio.h>
  -#ifdef HAVE_CTYPE_H
  +#endif
  +#if APR_HAVE_CTYPE_H
   #include <ctype.h>
   #endif
  -#ifdef HAVE_NETDB_H
  +#if APR_HAVE_NETDB_H
   #include <netdb.h>
   #endif
  -#ifdef HAVE_NETINET_IN_H
  +#if APR_HAVE_NETINET_IN_H
   #include <netinet/in.h>
   #endif
  -#ifdef HAVE_SYS_SOCKET_H
  +#if APR_HAVE_SYS_SOCKET_H
   #include <sys/socket.h>
   #endif
  -#ifdef HAVE_ARPA_INET_H
  +#if APR_HAVE_ARPA_INET_H
   #include <arpa/inet.h>
   #endif
   
  @@ -77,7 +79,7 @@
   /* number of buckets in cache hash apr_table_t */
   #define BUCKETS 256
   
  -#if defined(NEED_STRDUP)
  +#if !APR_HAVE_STRDUP
   char *strdup (const char *str)
   {
       char *dup;
  
  
  
  1.15      +8 -11     httpd-2.0/support/logresolve.dsp
  
  Index: logresolve.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/logresolve.dsp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- logresolve.dsp	2000/12/21 01:25:10	1.14
  +++ logresolve.dsp	2000/12/21 21:00:45	1.15
  @@ -41,17 +41,16 @@
   # PROP Intermediate_Dir "Release"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Release/logresolve" /FD /c
  +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Release/logresolve"
/FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/map /machine:I386
  -# SUBTRACT LINK32 /pdb:none /nodefaultlib
  +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /machine:I386
   
   !ELSEIF  "$(CFG)" == "logresolve - Win32 Debug"
   
  @@ -66,18 +65,16 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Debug/logresolve" /FD /c
  -# SUBTRACT CPP /Fr
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/logresolve"
/FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# SUBTRACT LINK32 /pdb:none /incremental:no /map /nodefaultlib
  +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
   
   !ENDIF 
   
  
  
  
  1.12      +12 -5     httpd-2.0/support/rotatelogs.c
  
  Index: rotatelogs.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/rotatelogs.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- rotatelogs.c	2000/11/21 18:40:35	1.11
  +++ rotatelogs.c	2000/12/21 21:00:45	1.12
  @@ -61,15 +61,22 @@
    */
   
   
  -#include "ap_config.h"
  -#include <stdio.h>
  -#ifdef HAVE_UNISTD_H
  -#include <unistd.h>
  -#endif
  +#include "apr.h"
   #include <stdlib.h>
   #include <time.h>
   #include <errno.h>
  +#if APR_HAVE_STDIO_H
  +#include <stdio.h>
  +#endif
  +#if APR_HAVE_UNISTD_H
  +#include <unistd.h>
  +#endif
  +#if APR_HAVE_IO_H
  +#include <io.h>
  +#endif
  +#if APR_HAVE_FCNTL_H
   #include <fcntl.h>
  +#endif
   
   #define BUFSIZE         65536
   #define ERRMSGSZ        82
  
  
  
  1.16      +7 -9      httpd-2.0/support/rotatelogs.dsp
  
  Index: rotatelogs.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/rotatelogs.dsp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- rotatelogs.dsp	2000/12/21 01:25:10	1.15
  +++ rotatelogs.dsp	2000/12/21 21:00:45	1.16
  @@ -41,15 +41,15 @@
   # PROP Intermediate_Dir "Release"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD
/c
  -# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Release/rotatelogs" /FD /c
  +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Release/rotatelogs"
/FD /c
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/machine:I386
  +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/machine:I386
   # ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/map /machine:I386
   
   !ELSEIF  "$(CFG)" == "rotatelogs - Win32 Debug"
  @@ -65,18 +65,16 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/I "../include" /I "../os/win32" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC"
/D "AP_DECLARE_STATIC" /Fd"Debug/rotatelogs" /FD /c
  -# SUBTRACT CPP /YX
  +# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include"
/D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "APR_DECLARE_STATIC" /D "APU_DECLARE_STATIC" /Fd"Debug/rotatelogs"
/FD /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
   LINK32=link.exe
  -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/debug /machine:I386 /pdbtype:sept
  -# SUBTRACT LINK32 /incremental:no /map
  +# ADD BASE LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib wsock32.lib ws2_32.lib /nologo /subsystem:console
/incremental:no /map /debug /machine:I386
   
   !ENDIF 
   
  
  
  

Mime
View raw message