Now that it's apr'ized, ab is most definately in a 2.0 revision cycle,

  and definately needs to track the Apache revision (especially because of
  apr and apr-util!)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90209 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/support/ab.c b/support/ab.c
index ec9d91e276d1f2feee11e336143f38d0cae3dc25..44d5386d8182a632a76aa4a7660da83905dbf3a6 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -115,8 +115,6 @@
  *   only an issue for loopback usage
  */
 
-#define AB_VERSION "1.3e"
-
 /*  -------------------------------------------------------------------- */
 
 #if 'A' != 0x41
@@ -139,6 +137,7 @@
 #include "apr_general.h"
 #include <signal.h>
 #include "apr_lib.h"
+#include "ap_release.h"
 
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
@@ -1155,7 +1154,7 @@ static void test(void)
                "%s" "\r\n",
                (posting == 0) ? "GET" : "HEAD",
                (isproxy) ? fullurl : path,
-               AB_VERSION,
+               AP_SERVER_BASEREVISION,
                keepalive ? "Connection: Keep-Alive\r\n" : "",
                cookie, auth, host_field, hdrs);
     }
@@ -1170,7 +1169,7 @@ static void test(void)
                "%s"
                "\r\n",
                (isproxy) ? fullurl : path,
-               AB_VERSION,
+               AP_SERVER_BASEREVISION,
                keepalive ? "Connection: Keep-Alive\r\n" : "",
                cookie, auth,
                host_field, postlen,
@@ -1302,14 +1301,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-       printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.80 $> apache-2.0");
+       printf("This is ApacheBench, Version %s\n", AP_SERVER_BASEREVISION " <$Revision: 1.81 $> apache-2.0");
        printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
        printf("Copyright (c) 1998-2001 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.80 $");
+       printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_SERVER_BASEREVISION, "$Revision: 1.81 $");
        printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
        printf(" Copyright (c) 1998-2001 The Apache Software Foundation, http://www.apache.org/<br>\n");
        printf("</p>\n<p>\n");

diff --git a/support/ab.dsp b/support/ab.dsp
index 40e691228f4029cc4b71bc1ff3cbf656405debbd..046371a4b107449671dcea0c32286e93e115bc35 100644 (file)
--- a/support/ab.dsp
+++ b/support/ab.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 CPP /nologo /MD /W3 /O2 /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../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
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # 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 CPP /nologo /MDd /W3 /GX /ZI /Od /I "../srclib/apr/include" /I "../srclib/apr-util/include" /I "../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