diff --git a/STATUS b/STATUS index 3a5d0bfff8d..06f03847511 100644 --- a/STATUS +++ b/STATUS @@ -251,12 +251,6 @@ HISTORIC PATCHES PROPOSED TO BACKPORT FROM TRUNK: +1: jorton, covener covener: docs need fixup for "2.5.1" - *) ab: remove SVN keywords in copyright msg - trunk patch: https://svn.apache.org/r1939247 - +1: covener - covener: trivial patch probably needs to manually re-applied due to the - keyword expansion. - *) mod_proxy: Update the shared worker status word atomically, so a change to one status bit (error, initialized, ...) can't be lost to a concurrent change of another. diff --git a/support/ab.c b/support/ab.c index 824bf808aa9..598ab958b2a 100644 --- a/support/ab.c +++ b/support/ab.c @@ -16,7 +16,8 @@ /* ** This program is based on ZeusBench V1.0 written by Adam Twiss - ** which is Copyright (c) 1996 by Zeus Technology Ltd. http://www.zeustech.net/ + ** which is Copyright (c) 1996 by Zeus Technology Ltd. + ** http://web.archive.org/web/20000304112933/http://www.zeustech.net/ ** ** This software is provided "as is" and any express or implied warranties, ** including but not limited to, the implied warranties of merchantability and @@ -2128,15 +2129,15 @@ static void test(void) static void copyright(void) { if (!use_html) { - printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision$>"); - printf("Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n"); + printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION); + printf("Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://web.archive.org/web/20000304112933/http://www.zeustech.net/\n"); printf("Licensed to The Apache Software Foundation, http://www.apache.org/\n"); printf("\n"); } else { printf("
\n");
- printf(" This is ApacheBench, Version %s <%s>
\n", AP_AB_BASEREVISION, "$Revision$");
- printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/
\n");
+ printf(" This is ApacheBench, Version %s
\n", AP_AB_BASEREVISION);
+ printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://web.archive.org/web/20000304112933/http://www.zeustech.net/
\n");
printf(" Licensed to The Apache Software Foundation, http://www.apache.org/
\n");
printf("
\n"); }