Skip to content

[2.4.x] ab: remove svn props and use archive.org for zeustech URL #1037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
covener wants to merge 3 commits into
base: 2.4.x
Choose a base branch
from
+6 −11
Open

[2.4.x] ab: remove svn props and use archive.org for zeustech URL #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38993d6
Merge r1939247 from trunk (conflicts resolved in support/ab.c):
covener Oct 18, 2026
979789d
STATUS: remove the ab SVN-keywords entry, now proposed as a PR
covener Nov 15, 2026
ce7a9d2
Merge r1872033 from trunk (conflicts resolved in support/ab.c):
covener Dec 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions STATUS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 6 additions & 5 deletions support/ab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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("<p>\n");
printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i><br>\n", AP_AB_BASEREVISION, "$Revision$");
printf(" Copyright 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
printf(" This is ApacheBench, Version %s<br>\n", AP_AB_BASEREVISION);
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");
}
Expand Down
Loading