From 38993d60a8a072a0c26ca083993dbb6cf38824b2 Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Sun, 18 Oct 2026 13:21:00 +0000
Subject: [PATCH 1/3] Merge r1939247 from trunk (conflicts resolved in
 support/ab.c):

ab: remove SVN keywords in copyright msg

Github: closes #858

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1939247 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit a3dcfc1504b7dc7e64c23756b559e583d3281c6f)
---
 support/ab.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/support/ab.c b/support/ab.c
index 824bf808aa9..d2962afc9a5 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -2128,14 +2128,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-        printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision$>");
+        printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION);
         printf("Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
         printf("Licensed to 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><br>\n", AP_AB_BASEREVISION, "$Revision$");
+        printf(" This is ApacheBench, Version %s<br>\n", AP_AB_BASEREVISION);
         printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
         printf(" Licensed to The Apache Software Foundation, http://www.apache.org/<br>\n");
         printf("</p>\n<p>\n");

From 979789d5feced8ccbcb6cf2a21e0e706382472fc Mon Sep 17 00:00:00 2001
From: Eric Covener <ecovener@us.ibm.com>
Date: Sat, 14 Nov 2026 21:13:15 -0500
Subject: [PATCH 2/3] STATUS: remove the ab SVN-keywords entry, now proposed as
 a PR

---
 STATUS | 6 ------
 1 file changed, 6 deletions(-)

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.

From ce7a9d27ee476bb360d225382d88d63076c9241d Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Fri, 27 Dec 2019 20:20:32 +0000
Subject: [PATCH 3/3] Merge r1872033 from trunk (conflicts resolved in
 support/ab.c):

ab.c: Replace zeustech.net with web archive link

closes #84

https://github.com/apache/httpd/pull/84
https://issues.apache.org/jira/browse/LEGAL-502

Submitted By: Josua Schmid <josua.schmid renuo.ch>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872033 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 9fa96d9a23597489a1300a2cc9fac986c2fac817)
---
 support/ab.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/support/ab.c b/support/ab.c
index d2962afc9a5..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
@@ -2129,14 +2130,14 @@ static void copyright(void)
 {
     if (!use_html) {
         printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION);
-        printf("Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
+        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("<p>\n");
         printf(" This is ApacheBench, Version %s<br>\n", AP_AB_BASEREVISION);
-        printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
+        printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://web.archive.org/web/20000304112933/http://www.zeustech.net/<br>\n");
         printf(" Licensed to The Apache Software Foundation, http://www.apache.org/<br>\n");
         printf("</p>\n<p>\n");
     }