summaryrefslogtreecommitdiffstats
path: root/server/util_md5.c
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2000-05-18 21:54:44 +0200
committerJeff Trawick <trawick@apache.org>2000-05-18 21:54:44 +0200
commit4636c1e3c1e5ac8dde20038e8167802064821508 (patch)
treecf5fc9eb0cdbe778610abff406ab8c09b5756f26 /server/util_md5.c
parentrebuild mm's configure if mm's aclocal.m4 has been modified (diff)
downloadapache2-4636c1e3c1e5ac8dde20038e8167802064821508.tar.xz
apache2-4636c1e3c1e5ac8dde20038e8167802064821508.zip
Fix some bugs in the use of APACHE_XLATE vs. CHARSET_EBCDIC
which prevented building with APACHE_XLATE on an ASCII machine. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85247 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/util_md5.c')
-rw-r--r--server/util_md5.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/server/util_md5.c b/server/util_md5.c
index dde579669e..1f06ba6f68 100644
--- a/server/util_md5.c
+++ b/server/util_md5.c
@@ -194,7 +194,7 @@ API_EXPORT(char *) ap_md5contextTo64(ap_pool_t *a, ap_md5_ctx_t *context)
return encodedDigest;
}
-#ifdef CHARSET_EBCDIC
+#ifdef APACHE_XLATE
API_EXPORT(char *) ap_md5digest(ap_pool_t *p, ap_file_t *infile,
ap_xlate_t *xlate)
@@ -203,14 +203,11 @@ API_EXPORT(char *) ap_md5digest(ap_pool_t *p, ap_file_t *infile,
unsigned char buf[1000];
long length = 0;
int nbytes;
- ap_size_t inbytes_left, outbytes_left;
ap_MD5Init(&context);
-#ifdef CHARSET_EBCDIC
if (xlate) {
ap_MD5SetXlate(&context, xlate);
}
-#endif
nbytes = sizeof(buf);
while (ap_read(infile, buf, &nbytes) == APR_SUCCESS) {
length += nbytes;