You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/05/10 03:22:34 UTC
cvs commit: apache-2.0/src/main util_ebcdic.c rfc1413.c
trawick 00/05/09 18:22:33
Modified: src/include util_ebcdic.h
src/main util_ebcdic.c rfc1413.c
Log:
namespace-protect hdrs_to_ascii, hdrs_from_ascii, locale_to_ascii, and
locale_from_ascii by adding ap_ prefix
Submitted by: Greg Stein
Revision Changes Path
1.2 +2 -2 apache-2.0/src/include/util_ebcdic.h
Index: util_ebcdic.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/util_ebcdic.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util_ebcdic.h 2000/05/09 20:25:00 1.1
+++ util_ebcdic.h 2000/05/10 01:22:29 1.2
@@ -67,8 +67,8 @@
#include "apr_xlate.h"
-extern ap_xlate_t *hdrs_to_ascii, *hdrs_from_ascii;
-extern ap_xlate_t *locale_to_ascii, *locale_from_ascii;
+extern ap_xlate_t *ap_hdrs_to_ascii, *ap_hdrs_from_ascii;
+extern ap_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii;
ap_status_t ap_init_ebcdic(ap_pool_t *);
1.2 +7 -7 apache-2.0/src/main/util_ebcdic.c
Index: util_ebcdic.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_ebcdic.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util_ebcdic.c 2000/05/09 20:24:55 1.1
+++ util_ebcdic.c 2000/05/10 01:22:31 1.2
@@ -65,32 +65,32 @@
#include "http_log.h"
#include "util_ebcdic.h"
-ap_xlate_t *hdrs_to_ascii, *hdrs_from_ascii;
-ap_xlate_t *locale_to_ascii, *locale_from_ascii;
+ap_xlate_t *ap_hdrs_to_ascii, *ap_hdrs_from_ascii;
+ap_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii;
ap_status_t ap_init_ebcdic(ap_pool_t *pool)
{
ap_status_t rv;
char buf[80];
- rv = ap_xlate_open(&hdrs_to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool);
+ rv = ap_xlate_open(&ap_hdrs_to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, pool);
if (rv) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
"ap_xlate_open() failed");
return rv;
}
- rv = ap_xlate_open(&hdrs_from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", pool);
+ rv = ap_xlate_open(&ap_hdrs_from_ascii, APR_DEFAULT_CHARSET, "ISO8859-1", pool);
if (rv) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
"ap_xlate_open() failed");
return rv;
}
- locale_to_ascii = hdrs_to_ascii; /* TODO: "ISO8859-1" to APR_LOCALE_CHARSET */
- locale_from_ascii = hdrs_from_ascii; /* TODO: APR_LOCALE_CHARSET to "ISO8859-1" */
+ ap_locale_to_ascii = ap_hdrs_to_ascii; /* TODO: "ISO8859-1" to APR_LOCALE_CHARSET */
+ ap_locale_from_ascii = ap_hdrs_from_ascii; /* TODO: APR_LOCALE_CHARSET to "ISO8859-1" */
- rv = ap_MD5InitEBCDIC(hdrs_to_ascii);
+ rv = ap_MD5InitEBCDIC(ap_hdrs_to_ascii);
if (rv) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
"ap_MD5InitEBCDIC() failed");
1.18 +2 -2 apache-2.0/src/main/rfc1413.c
Index: rfc1413.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rfc1413.c 2000/05/09 20:24:57 1.17
+++ rfc1413.c 2000/05/10 01:22:31 1.18
@@ -156,7 +156,7 @@
sav_our_port);
#ifdef CHARSET_EBCDIC
inbytes_left = outbytes_left = buflen;
- ap_xlate_conv_buffer(hdrs_to_ascii, buffer, &inbytes_left,
+ ap_xlate_conv_buffer(ap_hdrs_to_ascii, buffer, &inbytes_left,
buffer, &outbytes_left);
#endif
@@ -209,7 +209,7 @@
/* RFC1413_USERLEN = 512 */
#ifdef CHARSET_EBCDIC
inbytes_left = outbytes_left = i;
- ap_xlate_conv_buffer(hdrs_from_ascii, buffer, &inbytes_left,
+ ap_xlate_conv_buffer(ap_hdrs_from_ascii, buffer, &inbytes_left,
buffer, &outbytes_left);
#endif
if (sscanf(buffer, "%u , %u : USERID :%*[^:]:%512s", &rmt_port, &our_port,