diff options
Diffstat (limited to 'support')
| -rw-r--r-- | support/ab.c | 12 | ||||
| -rw-r--r-- | support/htdigest.c | 2 | ||||
| -rw-r--r-- | support/htpasswd.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/support/ab.c b/support/ab.c index 5be01f2043..5b3b56a4b0 100644 --- a/support/ab.c +++ b/support/ab.c @@ -862,14 +862,14 @@ static void test(void) static void copyright(void) { if (!use_html) { - printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.22 $> apache-2.0"); + printf("This is ApacheBench, Version %s\n", AB_VERSION " <$Revision: 1.23 $> 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><%s></i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.22 $"); + printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AB_VERSION, "$Revision: 1.23 $"); 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"); @@ -989,14 +989,14 @@ int main(int argc, char **argv) apr_create_pool(&cntxt, NULL); #ifdef NOT_ASCII - status = ap_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt); + status = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt); if (status) { - fprintf(stderr, "ap_xlate_open(to ASCII)->%d\n", status); + fprintf(stderr, "apr_xlate_open(to ASCII)->%d\n", status); exit(1); } - status = ap_xlate_open(&from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", cntxt); + status = apr_xlate_open(&from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", cntxt); if (status) { - fprintf(stderr, "ap_xlate_open(from ASCII)->%d\n", status); + fprintf(stderr, "apr_xlate_open(from ASCII)->%d\n", status); exit(1); } status = ap_base64init_ebcdic(to_ascii, from_ascii); diff --git a/support/htdigest.c b/support/htdigest.c index 195e241304..0699b97a73 100644 --- a/support/htdigest.c +++ b/support/htdigest.c @@ -186,7 +186,7 @@ static void add_password(char *user, char *realm, apr_file_t *f) apr_MD5Init(&context); #ifdef CHARSET_EBCDIC - ap_MD5SetXlate(&context, to_ascii); + apr_MD5SetXlate(&context, to_ascii); #endif apr_MD5Update(&context, (unsigned char *) string, strlen(string)); apr_MD5Final(digest, &context); diff --git a/support/htpasswd.c b/support/htpasswd.c index 89013c5c83..ad9fa94499 100644 --- a/support/htpasswd.c +++ b/support/htpasswd.c @@ -384,9 +384,9 @@ int main(int argc, char *argv[]) atexit(apr_terminate); apr_create_pool(&pool, NULL); - rv = ap_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool); + rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool); if (rv) { - fprintf(stderr, "ap_xlate_open(to ASCII)->%d\n", rv); + fprintf(stderr, "apr_xlate_open(to ASCII)->%d\n", rv); exit(1); } rv = ap_SHA1InitEBCDIC(to_ascii); @@ -394,9 +394,9 @@ int main(int argc, char *argv[]) fprintf(stderr, "ap_SHA1InitEBCDIC()->%d\n", rv); exit(1); } - rv = ap_MD5InitEBCDIC(to_ascii); + rv = apr_MD5InitEBCDIC(to_ascii); if (rv) { - fprintf(stderr, "ap_MD5InitEBCDIC()->%d\n", rv); + fprintf(stderr, "apr_MD5InitEBCDIC()->%d\n", rv); exit(1); } #endif /*CHARSET_EBCDIC*/ |