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/12/20 17:44:06 UTC
cvs commit: httpd-2.0/modules/proxy mod_proxy.h proxy_ftp.c proxy_util.c
trawick 00/12/20 08:44:05
Modified: . acinclude.m4 configure.in
include ap_config.h httpd.h util_ebcdic.h
modules/experimental mod_charset_lite.c
modules/filters mod_include.h
os/bs2000 ebcdic.c
os/tpf ebcdic.c
server main.c util.c util_ebcdic.c util_md5.c
util_script.c
support htdigest.c htpasswd.c
modules/proxy mod_proxy.h proxy_ftp.c proxy_util.c
Log:
Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.
Revision Changes Path
1.58 +0 -18 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- acinclude.m4 2000/12/20 06:17:53 1.57
+++ acinclude.m4 2000/12/20 16:43:29 1.58
@@ -203,24 +203,6 @@
fi
])
-AC_DEFUN(APACHE_EBCDIC,[
- AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[
- AC_TRY_RUN( [
-int main(void) {
- return (unsigned char)'A' != (unsigned char)0xC1;
-}
-],[
- ac_cv_ebcdic="yes"
-],[
- ac_cv_ebcdic="no"
-],[
- ac_cv_ebcdic="no"
-])])
- if test "$ac_cv_ebcdic" = "yes"; then
- AC_DEFINE(AP_CHARSET_EBCDIC,, [Define if system uses EBCDIC])
- fi
-])
-
dnl APACHE_MODPATH_INIT(modpath)
AC_DEFUN(APACHE_MODPATH_INIT,[
current_dir=$1
1.105 +0 -2 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- configure.in 2000/12/19 19:45:06 1.104
+++ configure.in 2000/12/20 16:43:30 1.105
@@ -110,8 +110,6 @@
AC_CHECK_LIB(socket, socket)
AC_CHECK_LIB(resolv, sethostent)
-APACHE_EBCDIC
-
AC_ARG_WITH(optim,[ --with-optim="FLAGS" compiler optimisation flags],
[OPTIM="$withval"])
1.50 +1 -1 httpd-2.0/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/ap_config.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ap_config.h 2000/12/19 17:05:11 1.49
+++ ap_config.h 2000/12/20 16:43:33 1.50
@@ -243,7 +243,7 @@
#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
#endif
-#if defined(AP_CHARSET_EBCDIC) && !defined(APACHE_XLATE)
+#if APR_CHARSET_EBCDIC && !defined(APACHE_XLATE)
#define APACHE_XLATE
#endif
1.128 +3 -3 httpd-2.0/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/httpd.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- httpd.h 2000/12/19 17:05:12 1.127
+++ httpd.h 2000/12/20 16:43:34 1.128
@@ -517,11 +517,11 @@
#define DIR_MAGIC_TYPE "httpd/unix-directory"
/* Just in case your linefeed isn't the one the other end is expecting. */
-#ifndef AP_CHARSET_EBCDIC
+#if !APR_CHARSET_EBCDIC
#define LF 10
#define CR 13
#define CRLF "\015\012"
-#else /* AP_CHARSET_EBCDIC */
+#else /* APR_CHARSET_EBCDIC */
/* For platforms using the EBCDIC charset, the transition ASCII->EBCDIC is done
* in the buff package (bread/bputs/bwrite). Everywhere else, we use
* "native EBCDIC" CR and NL characters. These are therefore
@@ -531,7 +531,7 @@
#define CR '\r'
#define LF '\n'
#define CRLF "\r\n"
-#endif /* AP_CHARSET_EBCDIC */
+#endif /* APR_CHARSET_EBCDIC */
/* Possible values for request_rec.read_body (set by handling module):
* REQUEST_NO_BODY Send 413 error if message has any body
1.10 +3 -3 httpd-2.0/include/util_ebcdic.h
Index: util_ebcdic.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/util_ebcdic.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- util_ebcdic.h 2000/12/19 17:05:12 1.9
+++ util_ebcdic.h 2000/12/20 16:43:34 1.10
@@ -72,7 +72,7 @@
* @package Utilities for EBCDIC conversion
*/
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
/**
* Setup all of the global translation handlers
@@ -100,11 +100,11 @@
}
#endif
-#else /* AP_CHARSET_EBCDIC */
+#else /* APR_CHARSET_EBCDIC */
#define ap_xlate_proto_to_ascii(x,y) /* NOOP */
#define ap_xlate_proto_from_ascii(x,y) /* NOOP */
-#endif /* AP_CHARSET_EBCDIC */
+#endif /* APR_CHARSET_EBCDIC */
#endif /* !APACHE_UTIL_EBCDIC_H */
1.34 +1 -1 httpd-2.0/modules/experimental/mod_charset_lite.c
Index: mod_charset_lite.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_charset_lite.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_charset_lite.c 2000/12/19 17:05:12 1.33
+++ mod_charset_lite.c 2000/12/20 16:43:36 1.34
@@ -291,7 +291,7 @@
*/
if (strncasecmp(mime_type, "text/", 5) &&
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
/* On an EBCDIC machine, be willing to translate mod_autoindex-
* generated output. Otherwise, it doesn't look too cool.
*
1.6 +3 -3 httpd-2.0/modules/filters/mod_include.h
Index: mod_include.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_include.h 2000/12/19 17:05:13 1.5
+++ mod_include.h 2000/12/20 16:43:37 1.6
@@ -69,11 +69,11 @@
#define SIZEFMT_BYTES 0
#define SIZEFMT_KMG 1
#define TMP_BUF_SIZE 1024
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
#define RAW_ASCII_CHAR(ch) apr_xlate_conv_byte(ap_hdrs_from_ascii, (unsigned char)ch)
-#else /*AP_CHARSET_EBCDIC*/
+#else /*APR_CHARSET_EBCDIC*/
#define RAW_ASCII_CHAR(ch) (ch)
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
module AP_MODULE_DECLARE_DATA includes_module;
1.7 +2 -2 httpd-2.0/os/bs2000/ebcdic.c
Index: ebcdic.c
===================================================================
RCS file: /home/cvs/httpd-2.0/os/bs2000/ebcdic.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ebcdic.c 2000/12/19 17:05:14 1.6
+++ ebcdic.c 2000/12/20 16:43:40 1.7
@@ -56,8 +56,8 @@
* University of Illinois, Urbana-Champaign.
*/
-#ifdef AP_CHARSET_EBCDIC
#include "ap_config.h"
+#if APR_CHARSET_EBCDIC
#include "ebcdic.h"
/*
Initial Port for Apache-1.3 by <Ma...@Mch.SNI.De>
@@ -249,4 +249,4 @@
*dest++ = os_toebcdic[*srce++];
}
}
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
1.7 +2 -2 httpd-2.0/os/tpf/ebcdic.c
Index: ebcdic.c
===================================================================
RCS file: /home/cvs/httpd-2.0/os/tpf/ebcdic.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ebcdic.c 2000/12/19 17:05:14 1.6
+++ ebcdic.c 2000/12/20 16:43:44 1.7
@@ -56,8 +56,8 @@
* University of Illinois, Urbana-Champaign.
*/
-#ifdef AP_CHARSET_EBCDIC
#include "ap_config.h"
+#if APR_CHARSET_EBCDIC
#include "ebcdic.h"
/*
This code does basic character mapping for IBM's TPF operating system.
@@ -217,5 +217,5 @@
*udest++ = os_toebcdic[*usrce++];
}
}
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
1.80 +3 -3 httpd-2.0/server/main.c
Index: main.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/main.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- main.c 2000/12/19 17:05:15 1.79
+++ main.c 2000/12/20 16:43:47 1.80
@@ -156,8 +156,8 @@
printf(" -D PIPE_BUF=%ld\n",(long)PIPE_BUF);
#endif
#endif
-#ifdef AP_CHARSET_EBCDIC
- printf(" -D AP_CHARSET_EBCDIC\n");
+#if APR_CHARSET_EBCDIC
+ printf(" -D APR_CHARSET_EBCDIC\n");
#endif
#ifdef APACHE_XLATE
printf(" -D APACHE_XLATE\n");
@@ -308,7 +308,7 @@
pconf = process->pconf;
ap_server_argv0 = process->short_name;
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
if (ap_init_ebcdic(pglobal) != APR_SUCCESS) {
destroy_and_exit_process(process, 1);
}
1.86 +5 -5 httpd-2.0/server/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- util.c 2000/12/19 17:05:15 1.85
+++ util.c 2000/12/20 16:43:47 1.86
@@ -1495,11 +1495,11 @@
{
register char digit;
-#ifndef AP_CHARSET_EBCDIC
+#if !APR_CHARSET_EBCDIC
digit = ((what[0] >= 'A') ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0'));
digit *= 16;
digit += (what[1] >= 'A' ? ((what[1] & 0xdf) - 'A') + 10 : (what[1] - '0'));
-#else /*AP_CHARSET_EBCDIC*/
+#else /*APR_CHARSET_EBCDIC*/
char xstr[5];
xstr[0]='0';
xstr[1]='x';
@@ -1507,7 +1507,7 @@
xstr[3]=what[1];
xstr[4]='\0';
digit = apr_xlate_conv_byte(ap_hdrs_from_ascii, 0xFF & strtol(xstr, NULL, 16));
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
return (digit);
}
@@ -1583,9 +1583,9 @@
static apr_inline unsigned char *c2x(unsigned what, unsigned char *where)
{
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
what = apr_xlate_conv_byte(ap_hdrs_to_ascii, (unsigned char)what);
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
*where++ = '%';
*where++ = c2x_table[what >> 4];
*where++ = c2x_table[what & 0xf];
1.16 +2 -2 httpd-2.0/server/util_ebcdic.c
Index: util_ebcdic.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_ebcdic.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- util_ebcdic.c 2000/12/19 17:05:15 1.15
+++ util_ebcdic.c 2000/12/20 16:43:48 1.16
@@ -58,7 +58,7 @@
#include "ap_config.h"
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
#include "apr_strings.h"
#include "httpd.h"
@@ -141,4 +141,4 @@
buffer, &outbytes_left);
}
-#endif /* AP_CHARSET_EBCDIC */
+#endif /* APR_CHARSET_EBCDIC */
1.24 +1 -1 httpd-2.0/server/util_md5.c
Index: util_md5.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_md5.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- util_md5.c 2000/12/19 17:05:15 1.23
+++ util_md5.c 2000/12/20 16:43:48 1.24
@@ -105,7 +105,7 @@
*/
apr_MD5Init(&my_md5);
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
apr_MD5SetXlate(&my_md5, ap_hdrs_to_ascii);
#endif
apr_MD5Update(&my_md5, buf, (unsigned int)length);
1.52 +2 -2 httpd-2.0/server/util_script.c
Index: util_script.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_script.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- util_script.c 2000/12/19 17:05:15 1.51
+++ util_script.c 2000/12/20 16:43:49 1.52
@@ -462,7 +462,7 @@
/* if we see a bogus header don't ignore it. Shout and scream */
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
/* Chances are that we received an ASCII header text instead of
* the expected EBCDIC header lines. Try to auto-detect:
*/
@@ -487,7 +487,7 @@
w, &inbytes_left, w, &outbytes_left);
}
}
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
if (!(l = strchr(w, ':'))) {
char malformed[(sizeof MALFORMED_MESSAGE) + 1
+ MALFORMED_HEADER_LENGTH_TO_SHOW];
1.17 +5 -9 httpd-2.0/support/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/htdigest.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- htdigest.c 2000/12/19 17:05:47 1.16
+++ htdigest.c 2000/12/20 16:43:54 1.17
@@ -92,23 +92,19 @@
#include <conio.h>
#endif
-#if 'A' == 0xC1
-#define AP_CHARSET_EBCDIC
-#endif
-
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
#define LF '\n'
#define CR '\r'
#else
#define LF 10
#define CR 13
-#endif /* AP_CHARSET_EBCDIC */
+#endif /* APR_CHARSET_EBCDIC */
#define MAX_STRING_LEN 256
char *tn;
apr_pool_t *cntxt;
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
apr_xlate_t *to_ascii;
#endif
@@ -192,7 +188,7 @@
sprintf(string, "%s:%s:%s", user, realm, pw);
apr_MD5Init(&context);
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
apr_MD5SetXlate(&context, to_ascii);
#endif
apr_MD5Update(&context, (unsigned char *) string, strlen(string));
@@ -241,7 +237,7 @@
atexit(apr_terminate);
apr_create_pool(&cntxt, NULL);
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt);
if (rv) {
fprintf(stderr, "apr_xlate_open(): %s (%d)\n",
1.27 +5 -5 httpd-2.0/support/htpasswd.c
Index: htpasswd.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/htpasswd.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- htpasswd.c 2000/12/19 17:05:48 1.26
+++ htpasswd.c 2000/12/20 16:43:54 1.27
@@ -104,13 +104,13 @@
#define unlink _unlink
#endif
-#ifndef AP_CHARSET_EBCDIC
+#if !APR_CHARSET_EBCDIC
#define LF 10
#define CR 13
-#else /*AP_CHARSET_EBCDIC*/
+#else /*APR_CHARSET_EBCDIC*/
#define LF '\n'
#define CR '\r'
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
#define MAX_STRING_LEN 256
#define ALG_PLAIN 0
@@ -384,7 +384,7 @@
int noninteractive = 0;
int i;
int args_left = 2;
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
apr_pool_t *pool;
apr_status_t rv;
apr_xlate_t *to_ascii;
@@ -408,7 +408,7 @@
fprintf(stderr, "apr_MD5InitEBCDIC()->%d\n", rv);
exit(1);
}
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
tempfilename = NULL;
signal(SIGINT, (void (*)(int)) interrupted);
1.23 +3 -3 httpd-2.0/modules/proxy/mod_proxy.h
Index: mod_proxy.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mod_proxy.h 2000/12/19 17:05:13 1.22
+++ mod_proxy.h 2000/12/20 16:44:00 1.23
@@ -142,11 +142,11 @@
#define HDR_APP (0) /* append header, for proxy_add_header() */
#define HDR_REP (1) /* replace header, for proxy_add_header() */
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
#define CRLF "\r\n"
-#else /*AP_CHARSET_EBCDIC*/
+#else /*APR_CHARSET_EBCDIC*/
#define CRLF "\015\012"
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
#define DEFAULT_FTP_DATA_PORT 20
#define DEFAULT_FTP_PORT 21
1.27 +5 -5 httpd-2.0/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_ftp.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- proxy_ftp.c 2000/12/19 17:05:14 1.26
+++ proxy_ftp.c 2000/12/20 16:44:00 1.27
@@ -110,11 +110,11 @@
ch = ap_proxy_hex2c(&x[i + 1]);
i += 2;
}
-#ifndef AP_CHARSET_EBCDIC
+#if !APR_CHARSET_EBCDIC
if (ch == '\015' || ch == '\012' || (ch & 0x80))
-#else /*AP_CHARSET_EBCDIC*/
+#else /*APR_CHARSET_EBCDIC*/
if (ch == '\r' || ch == '\n' || (os_toascii[ch] & 0x80))
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
return 0;
}
return 1;
@@ -602,9 +602,9 @@
ap_bpush_socket(f, sock);
/* shouldn't we implement telnet control options here? */
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
ap_bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 1);
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
/* possible results: */
/* 120 Service ready in nnn minutes. */
1.34 +7 -7 httpd-2.0/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_util.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- proxy_util.c 2000/12/19 17:05:14 1.33
+++ proxy_util.c 2000/12/20 16:44:01 1.34
@@ -78,7 +78,7 @@
{
int i, ch;
-#ifndef AP_CHARSET_EBCDIC
+#if !APR_CHARSET_EBCDIC
ch = x[0];
if (apr_isdigit(ch))
i = ch - '0';
@@ -96,14 +96,14 @@
else
i += ch - ('a' - 10);
return i;
-#else /*AP_CHARSET_EBCDIC*/
+#else /*APR_CHARSET_EBCDIC*/
return (1 == sscanf(x, "%2x", &i)) ? os_toebcdic[i&0xFF] : 0;
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
}
void ap_proxy_c2hex(int ch, char *x)
{
-#ifndef AP_CHARSET_EBCDIC
+#if !APR_CHARSET_EBCDIC
int i;
x[0] = '%';
@@ -118,14 +118,14 @@
x[2] = ('A' - 10) + i;
else
x[2] = '0' + i;
-#else /*AP_CHARSET_EBCDIC*/
+#else /*APR_CHARSET_EBCDIC*/
static const char ntoa[] = { "0123456789ABCDEF" };
ch &= 0xFF;
x[0] = '%';
x[1] = ntoa[(os_toascii[ch]>>4)&0x0F];
x[2] = ntoa[os_toascii[ch]&0x0F];
x[3] = '\0';
-#endif /*AP_CHARSET_EBCDIC*/
+#endif /*APR_CHARSET_EBCDIC*/
}
/*
@@ -480,7 +480,7 @@
if (c) ap_cache_el_data(c, &cachefp);
#if 0
-#ifdef AP_CHARSET_EBCDIC
+#if APR_CHARSET_EBCDIC
/* The cache copy is ASCII, not EBCDIC, even for text/html) */
ap_bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 0);
if (c != NULL && c->fp != NULL)