You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by mc...@us.ibm.com on 2000/01/06 23:29:33 UTC
Re: [PATCH] strictly unnecessary
The patch checks out OK on TPF.
-David McCreedy
McCreedy@US.IBM.COM
pg@sweng.stortek.com@apache.org on 12/21/99 06:43:34 PM
Please respond to new-httpd@apache.org
Sent by: new-httpd-owner@apache.org
To: new-httpd@apache.org (Apache Developers List)
cc:
Subject: [PATCH] strictly unnecessary
This patch completes the simplification recently enabled by introduction
of the CRLF macro. ebcdic2ascii_strictly is renamed ebcdic2ascii;
os_toascii_strictly is renamed os_toascii. The former loose conversion
functions are removed, and references suitably changed.
I submit the changes to os/bs2000 blindly; I have no way to test them;
changes to os/tpf are only weakly tested insofar as I have an OS/390
port based on the tpf code. Changes outside the src/os tree have been
tested on OS/390. More testing obviously needed.
-- gil
--
StorageTek
INFORMATION made POWERFUL
========================================================================
diff -bru orig/apache-1.3/src/README.EBCDIC apache-1.3/src/README.EBCDIC
--- orig/apache-1.3/src/README.EBCDIC Thu Oct 1 13:12:21 1998
+++ apache-1.3/src/README.EBCDIC Sun Dec 12 12:03:07 1999
@@ -42,10 +42,9 @@
* This port therefore features a built-in protocol level conversion
for the server-internal strings (which the compiler translated to
- EBCDIC strings) and server-generated documents. The hard coded
- ASCII escapes \012 and \015 which are ubiquitious in the server
- code are an exception: they are not converted to ASCII a second
- time.
+ EBCDIC strings) and server-generated documents. This presumes that
+ hard coded ASCII escapes \012 and \015 will not exist in the server
+ code; rather coders will use the CRLF, CR, and LF macros.
* By examining the call hierarchy for the BUFF management routines,
I added an "ebcdic/ascii conversion layer" which would be crossed
diff -bru orig/apache-1.3/src/ap/ap_md5c.c apache-1.3/src/ap/ap_md5c.c
--- orig/apache-1.3/src/ap/ap_md5c.c Sun Aug 15 19:12:52 1999
+++ apache-1.3/src/ap/ap_md5c.c Sun Dec 12 11:57:58 1999
@@ -232,12 +232,12 @@
memcpy(&context->buffer[idx], &input[i], inputLen - i);
#else /*CHARSET_EBCDIC*/
if (inputLen >= partLen) {
- ebcdic2ascii_strictly(&context->buffer[idx], input, partLen);
+ ebcdic2ascii(&context->buffer[idx], input, partLen);
MD5Transform(context->state, context->buffer);
for (i = partLen; i + 63 < inputLen; i += 64) {
unsigned char inp_tmp[64];
- ebcdic2ascii_strictly(inp_tmp, &input[i], 64);
+ ebcdic2ascii(inp_tmp, &input[i], 64);
MD5Transform(context->state, inp_tmp);
}
@@ -248,7 +248,7 @@
}
/* Buffer remaining input */
- ebcdic2ascii_strictly(&context->buffer[idx], &input[i], inputLen - i);
+ ebcdic2ascii(&context->buffer[idx], &input[i], inputLen - i);
#endif /*CHARSET_EBCDIC*/
}
diff -bru orig/apache-1.3/src/ap/ap_sha1.c apache-1.3/src/ap/ap_sha1.c
--- orig/apache-1.3/src/ap/ap_sha1.c Sun Aug 15 19:12:52 1999
+++ apache-1.3/src/ap/ap_sha1.c Sun Dec 12 11:56:54 1999
@@ -292,7 +292,7 @@
if (i > count) {
i = count;
}
- ebcdic2ascii_strictly(((AP_BYTE *) sha_info->data) + sha_info->local,
+ ebcdic2ascii(((AP_BYTE *) sha_info->data) + sha_info->local,
buffer, i);
count -= i;
buffer += i;
@@ -306,13 +306,13 @@
}
}
while (count >= SHA_BLOCKSIZE) {
- ebcdic2ascii_strictly((AP_BYTE *)sha_info->data, buffer,
SHA_BLOCKSIZE);
+ ebcdic2ascii((AP_BYTE *)sha_info->data, buffer, SHA_BLOCKSIZE);
buffer += SHA_BLOCKSIZE;
count -= SHA_BLOCKSIZE;
maybe_byte_reverse(sha_info->data, SHA_BLOCKSIZE);
sha_transform(sha_info);
}
- ebcdic2ascii_strictly((AP_BYTE *)sha_info->data, buffer, count);
+ ebcdic2ascii((AP_BYTE *)sha_info->data, buffer, count);
sha_info->local = count;
#else
ap_SHA1Update_binary(sha_info, (const unsigned char *) buf, count);
diff -bru orig/apache-1.3/src/os/bs2000/ebcdic.h
apache-1.3/src/os/bs2000/ebcdic.h
--- orig/apache-1.3/src/os/bs2000/ebcdic.h Thu Dec 9 10:12:48 1999
+++ apache-1.3/src/os/bs2000/ebcdic.h Sun Dec 12 11:55:57 1999
@@ -8,9 +8,4 @@
void *ebcdic2ascii(void *dest, const void *srce, size_t count);
void *ascii2ebcdic(void *dest, const void *srce, size_t count);
-/* Provide backward compatibility until all EBCDIC platforms
- * have switched to using ebcdic2ascii() only:
- */
-#define ebcdic2ascii_strictly(_to,_from,_len) ebcdic2ascii(_to,_from,_len)
-
#endif /*AP_EBCDIC_H*/
diff -bru orig/apache-1.3/src/os/os390/ebcdic.h
apache-1.3/src/os/os390/ebcdic.h
--- orig/apache-1.3/src/os/os390/ebcdic.h Fri Dec 10 10:14:36 1999
+++ apache-1.3/src/os/os390/ebcdic.h Sun Dec 12 11:51:21 1999
@@ -4,8 +4,3 @@
extern const unsigned char os_toebcdic[256];
void ebcdic2ascii(void *dest, const void *srce, size_t count);
void ascii2ebcdic(void *dest, const void *srce, size_t count);
-
-/* Provide backward compatibility until all EBCDIC platforms
- * have switched to using ebcdic2ascii() only:
- */
-#define ebcdic2ascii_strictly(_to,_from,_len) ebcdic2ascii(_to,_from,_len)
diff -bru orig/apache-1.3/src/os/tpf/ebcdic.c
apache-1.3/src/os/tpf/ebcdic.c
--- orig/apache-1.3/src/os/tpf/ebcdic.c Fri Jan 1 13:12:28 1999
+++ apache-1.3/src/os/tpf/ebcdic.c Sun Dec 12 11:53:50 1999
@@ -69,53 +69,9 @@
Bijective EBCDIC (character set IBM-1047) to US-ASCII table:
This table is bijective - there are no ambigous or duplicate characters.
*/
-const unsigned char os_toascii_strictly[256] = {
- 0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f, /* 00-0f: */
- 0x87, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* ................ */
- 0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97, /* 10-1f: */
- 0x18, 0x19, 0x9c, 0x9d, 0x1c, 0x1d, 0x1e, 0x1f, /* ................ */
- 0x80, 0x81, 0x82, 0x83, 0x84, 0x92, 0x17, 0x1b, /* 20-2f: */
- 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, /* ................ */
- 0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, /* 30-3f: */
- 0x98, 0x99, 0x9a, 0x9b, 0x14, 0x15, 0x9e, 0x1a, /* ................ */
- 0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5, /* 40-4f: */
- 0xe7, 0xf1, 0xa2, 0x2e, 0x3c, 0x28, 0x2b, 0x7c, /* ...........<(+| */
- 0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef, /* 50-5f: */
- 0xec, 0xdf, 0x21, 0x24, 0x2a, 0x29, 0x3b, 0x5e, /* &.........!$*);^ */
- 0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5, /* 60-6f: */
- 0xc7, 0xd1, 0xa6, 0x2c, 0x25, 0x5f, 0x3e, 0x3f, /* -/.........,%_>? */
- 0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf, /* 70-7f: */
- 0xcc, 0x60, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22, /* .........`:#@'=" */
- 0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 80-8f: */
- 0x68, 0x69, 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, /* .abcdefghi...... */
- 0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, /* 90-9f: */
- 0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8, 0xc6, 0xa4, /* .jklmnopqr...... */
- 0xb5, 0x7e, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, /* a0-af: */
- 0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0x5b, 0xde, 0xae, /* .~stuvwxyz...[.. */
- 0xac, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc, /* b0-bf: */
- 0xbd, 0xbe, 0xdd, 0xa8, 0xaf, 0x5d, 0xb4, 0xd7, /* .............].. */
- 0x7b, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* c0-cf: */
- 0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5, /* {ABCDEFGHI...... */
- 0x7d, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, /* d0-df: */
- 0x51, 0x52, 0xb9, 0xfb, 0xfc, 0xf9, 0xfa, 0xff, /* }JKLMNOPQR...... */
- 0x5c, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, /* e0-ef: */
- 0x59, 0x5a, 0xb2, 0xd4, 0xd6, 0xd2, 0xd3, 0xd5, /* \.STUVWXYZ...... */
- 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* f0-ff: */
- 0x38, 0x39, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0x9f /* 0123456789...... */
-};
-
-/*
-Server EBCDIC (character set IBM-1047) to US-ASCII table:
-This table is a copy of the os_toascii_strictly bijective table above.
-The only change is that hex 0a (\012 octal) is mapped to hex 0a
-(ASCII's line feed) instead of hex 8e. This is done because throughout
-Apache, protocol string definitions hardcode the linefeed as \012 (octal):
-"Content-Type: text/plain\015\012". Without this kludge all protocol
-string definitions would need to be changed from ...\012 to ...\025.
-*/
const unsigned char os_toascii[256] = {
0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f, /* 00-0f: */
- 0x87, 0x8d, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* ................ */
+ 0x87, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /* ................ */
0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97, /* 10-1f: */
0x18, 0x19, 0x9c, 0x9d, 0x1c, 0x1d, 0x1e, 0x1f, /* ................ */
0x80, 0x81, 0x82, 0x83, 0x84, 0x92, 0x17, 0x1b, /* 20-2f: */
@@ -198,13 +154,6 @@
const unsigned char *usrce = srce;
while (count-- != 0) {
*udest++ = os_toascii[*usrce++];
- }
-}
-void
-ebcdic2ascii_strictly(unsigned char *dest, const unsigned char *srce,
size_t count)
-{
- while (count-- != 0) {
- *dest++ = os_toascii_strictly[*srce++];
}
}
void
diff -bru orig/apache-1.3/src/os/tpf/ebcdic.h
apache-1.3/src/os/tpf/ebcdic.h
--- orig/apache-1.3/src/os/tpf/ebcdic.h Tue Nov 3 15:06:31 1998
+++ apache-1.3/src/os/tpf/ebcdic.h Sun Dec 12 11:52:20 1999
@@ -3,6 +3,5 @@
extern const unsigned char os_toascii[256];
extern const unsigned char os_toebcdic[256];
void ebcdic2ascii(void *dest, const void *srce, size_t count);
-void ebcdic2ascii_strictly(unsigned char *dest, const unsigned char *srce,
size_t count);
void ascii2ebcdic(void *dest, const void *srce, size_t count);