www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Force all Apache functions to be linked into the executable, whether they

Browse Source 
are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87424 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan Bloom
2000-12-19 17:05:48 +00:00
parent b22291af26
commit b5440c348a
25 changed files with 99 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES
View File

@@ -1,4 +1,11 @@
Changes with Apache 2.0b1 Changes with Apache 2.0b1
*) Get the functions in server/linked into the server, regardless of
which modules linked into the server. This uses the same hack
for Apache that we use for APR and apr-util to ensure all of the
necessary functions are linked. As a part of thise, the CHARSET_EBCIDC
was renamed to AP_CHARSET_EBCDIC for namespace protection, and to make
the scripts a bit easier.
[Ryan Bloom]
*) Rework the RFC1413 handling to make it thread-safe, use a timeout *) Rework the RFC1413 handling to make it thread-safe, use a timeout
on the query, and remove IPv4 dependencies. [Jeff Trawick] on the query, and remove IPv4 dependencies. [Jeff Trawick]

2
Makefile.in
View File

@@ -12,7 +12,7 @@ PROGRAM_DEPENDENCIES = \
$(AP_LIBS) $(AP_LIBS)
PROGRAMS = $(PROGRAM_NAME) PROGRAMS = $(PROGRAM_NAME)
targets = $(PROGRAMS) targets = $(PROGRAMS)
phony_targets = $(srcdir)/buildmark.c phony_targets = $(srcdir)/buildmark.c
install_targets = install-conf install-htdocs install-icons install-other \ install_targets = install-conf install-htdocs install-icons install-other \
install-cgi install-include install-support install-cgi install-include install-support

3
acinclude.m4
View File

@@ -66,6 +66,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
APACHE_SUBST(sysconfdir) APACHE_SUBST(sysconfdir)
APACHE_SUBST(progname) APACHE_SUBST(progname)
APACHE_SUBST(prefix) APACHE_SUBST(prefix)
APACHE_SUBST(AWK)
APACHE_SUBST(CC) APACHE_SUBST(CC)
APACHE_SUBST(CFLAGS) APACHE_SUBST(CFLAGS)
APACHE_SUBST(CPPFLAGS) APACHE_SUBST(CPPFLAGS)
@@ -216,7 +217,7 @@ int main(void) {
ac_cv_ebcdic="no" ac_cv_ebcdic="no"
])]) ])])
if test "$ac_cv_ebcdic" = "yes"; then if test "$ac_cv_ebcdic" = "yes"; then
AC_DEFINE(CHARSET_EBCDIC,, [Define if system uses EBCDIC]) AC_DEFINE(AP_CHARSET_EBCDIC,, [Define if system uses EBCDIC])
fi fi
]) ])

4
build/buildexports.awk
View File

@@ -1,3 +1,3 @@
/^APR_/ { print "#if", $1 } /^(APR?_|defined)/ { print "#if", $1 }
/^\t*apr?_/ { print "const void *ap_hack_" $1 " = (const void *)" $1 ";" } /^\t*apr?_/ { print "const void *ap_hack_" $1 " = (const void *)" $1 ";" }
/^\/APR_/ { print "#endif /*", substr($1,2), "*/" } /^\/(APR?_|defined)/ { print "#endif /*", substr($1,2), "*/" }

7
build/buildexports.sh
View File

@@ -1,9 +1,9 @@
#! /bin/sh #! /bin/sh
if test -z "$1"; then if test -z "$1"; then
echo "USAGE: $0 SRCLIB-DIRECTORY" echo "USAGE: $0 HTTPD-DIRECTORY"
echo "" echo ""
echo "for example: $0 ../srclib" echo "for example: $0 .."
exit 1 exit 1
fi fi
@@ -12,9 +12,10 @@ echo " * link all of the APR functions into server regardless of whether"
echo " * the base server uses them." echo " * the base server uses them."
echo " */" echo " */"
echo "" echo ""
echo "#define CORE_PRIVATE"
cur_dir="`pwd`" cur_dir="`pwd`"
for dir in $1/apr/include $1/apr-util/include for dir in $1/srclib/apr/include $1/srclib/apr-util/include $1/include
do do
cd $dir cd $dir
for file in *.h; do for file in *.h; do

2
include/ap_config.h
View File

@@ -243,7 +243,7 @@ AP_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(AP,ret,name,args_decl,args_use,decline)
#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
#endif #endif
#if defined(CHARSET_EBCDIC) && !defined(APACHE_XLATE) #if defined(AP_CHARSET_EBCDIC) && !defined(APACHE_XLATE)
#define APACHE_XLATE #define APACHE_XLATE
#endif #endif

6
include/ap_listen.h
View File

@@ -56,6 +56,7 @@
#define AP_LISTEN_H #define AP_LISTEN_H
#include "apr_network_io.h" #include "apr_network_io.h"
#include "httpd.h"
#include "http_config.h" #include "http_config.h"
/** /**
@@ -114,7 +115,10 @@ void ap_listen_pre_config(void);
* Prefork or SPMT_OS2 MPMs. * Prefork or SPMT_OS2 MPMs.
*/ */
int ap_setup_listeners(server_rec *s); int ap_setup_listeners(server_rec *s);
#else #endif
/* Split into two #if's to make the exports scripts easier.
*/
#if defined(WIN32) || defined(SPMT_OS2_MPM)
/** /**
* Create and open a socket on the specified port. This includes listening * Create and open a socket on the specified port. This includes listening
* and binding the socket. * and binding the socket.

4
include/http_config.h
View File

@@ -447,6 +447,7 @@ struct module_struct {
NULL, \ NULL, \
MODULE_MAGIC_COOKIE MODULE_MAGIC_COOKIE
#if AP_RBB_HACK
/** /**
* Generic accessors for other modules to get at their own module-specific * Generic accessors for other modules to get at their own module-specific
* data * data
@@ -457,6 +458,8 @@ struct module_struct {
* @deffunc void *ap_get_module_config(void *conf_vector, module *m) * @deffunc void *ap_get_module_config(void *conf_vector, module *m)
*/ */
AP_DECLARE(void *) ap_get_module_config(void *conf_vector, module *m); AP_DECLARE(void *) ap_get_module_config(void *conf_vector, module *m);
#endif
#if AP_RBB_HACK
/** /**
* Generic accessors for other modules to set at their own module-specific * Generic accessors for other modules to set at their own module-specific
* data * data
@@ -467,6 +470,7 @@ AP_DECLARE(void *) ap_get_module_config(void *conf_vector, module *m);
* @deffunc void ap_set_module_config(void *conf_vector, module *m, void *val) * @deffunc void ap_set_module_config(void *conf_vector, module *m, void *val)
*/ */
AP_DECLARE(void) ap_set_module_config(void *conf_vector, module *m, void *val); AP_DECLARE(void) ap_set_module_config(void *conf_vector, module *m, void *val);
#endif
#define ap_get_module_config(v,m) \ #define ap_get_module_config(v,m) \
(((void **)(v))[(m)->module_index]) (((void **)(v))[(m)->module_index])

6
include/httpd.h
View File

@@ -517,11 +517,11 @@ struct ap_method_list_t {
#define DIR_MAGIC_TYPE "httpd/unix-directory" #define DIR_MAGIC_TYPE "httpd/unix-directory"
/* Just in case your linefeed isn't the one the other end is expecting. */ /* Just in case your linefeed isn't the one the other end is expecting. */
#ifndef CHARSET_EBCDIC #ifndef AP_CHARSET_EBCDIC
#define LF 10 #define LF 10
#define CR 13 #define CR 13
#define CRLF "\015\012" #define CRLF "\015\012"
#else /* CHARSET_EBCDIC */ #else /* AP_CHARSET_EBCDIC */
/* For platforms using the EBCDIC charset, the transition ASCII->EBCDIC is done /* For platforms using the EBCDIC charset, the transition ASCII->EBCDIC is done
* in the buff package (bread/bputs/bwrite). Everywhere else, we use * in the buff package (bread/bputs/bwrite). Everywhere else, we use
* "native EBCDIC" CR and NL characters. These are therefore * "native EBCDIC" CR and NL characters. These are therefore
@@ -531,7 +531,7 @@ struct ap_method_list_t {
#define CR '\r' #define CR '\r'
#define LF '\n' #define LF '\n'
#define CRLF "\r\n" #define CRLF "\r\n"
#endif /* CHARSET_EBCDIC */ #endif /* AP_CHARSET_EBCDIC */
/* Possible values for request_rec.read_body (set by handling module): /* Possible values for request_rec.read_body (set by handling module):
* REQUEST_NO_BODY Send 413 error if message has any body * REQUEST_NO_BODY Send 413 error if message has any body

7
include/util_ebcdic.h
View File

@@ -59,7 +59,6 @@
#ifndef APACHE_UTIL_EBCDIC_H #ifndef APACHE_UTIL_EBCDIC_H
#define APACHE_UTIL_EBCDIC_H #define APACHE_UTIL_EBCDIC_H
#ifdef CHARSET_EBCDIC
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -73,6 +72,8 @@ extern "C" {
* @package Utilities for EBCDIC conversion * @package Utilities for EBCDIC conversion
*/ */
#ifdef AP_CHARSET_EBCDIC
/** /**
* Setup all of the global translation handlers * Setup all of the global translation handlers
* @param pool pool to allocate out of * @param pool pool to allocate out of
@@ -99,11 +100,11 @@ void ap_xlate_proto_from_ascii(char *buffer, apr_size_t len);
} }
#endif #endif
#else /* CHARSET_EBCDIC */ #else /* AP_CHARSET_EBCDIC */
#define ap_xlate_proto_to_ascii(x,y) /* NOOP */ #define ap_xlate_proto_to_ascii(x,y) /* NOOP */
#define ap_xlate_proto_from_ascii(x,y) /* NOOP */ #define ap_xlate_proto_from_ascii(x,y) /* NOOP */
#endif /* CHARSET_EBCDIC */ #endif /* AP_CHARSET_EBCDIC */
#endif /* !APACHE_UTIL_EBCDIC_H */ #endif /* !APACHE_UTIL_EBCDIC_H */

2
modules/experimental/mod_charset_lite.c
View File

@@ -291,7 +291,7 @@ static int find_code_page(request_rec *r)
*/ */
if (strncasecmp(mime_type, "text/", 5) && if (strncasecmp(mime_type, "text/", 5) &&
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
/* On an EBCDIC machine, be willing to translate mod_autoindex- /* On an EBCDIC machine, be willing to translate mod_autoindex-
* generated output. Otherwise, it doesn't look too cool. * generated output. Otherwise, it doesn't look too cool.
* *

6
modules/filters/mod_include.h
View File

@@ -69,11 +69,11 @@
#define SIZEFMT_BYTES 0 #define SIZEFMT_BYTES 0
#define SIZEFMT_KMG 1 #define SIZEFMT_KMG 1
#define TMP_BUF_SIZE 1024 #define TMP_BUF_SIZE 1024
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
#define RAW_ASCII_CHAR(ch) apr_xlate_conv_byte(ap_hdrs_from_ascii, (unsigned char)ch) #define RAW_ASCII_CHAR(ch) apr_xlate_conv_byte(ap_hdrs_from_ascii, (unsigned char)ch)
#else /*CHARSET_EBCDIC*/ #else /*AP_CHARSET_EBCDIC*/
#define RAW_ASCII_CHAR(ch) (ch) #define RAW_ASCII_CHAR(ch) (ch)
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
module AP_MODULE_DECLARE_DATA includes_module; module AP_MODULE_DECLARE_DATA includes_module;

6
modules/proxy/mod_proxy.h
View File

@@ -142,11 +142,11 @@ enum enctype {
#define HDR_APP (0) /* append header, for proxy_add_header() */ #define HDR_APP (0) /* append header, for proxy_add_header() */
#define HDR_REP (1) /* replace header, for proxy_add_header() */ #define HDR_REP (1) /* replace header, for proxy_add_header() */
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
#define CRLF "\r\n" #define CRLF "\r\n"
#else /*CHARSET_EBCDIC*/ #else /*AP_CHARSET_EBCDIC*/
#define CRLF "\015\012" #define CRLF "\015\012"
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
#define DEFAULT_FTP_DATA_PORT 20 #define DEFAULT_FTP_DATA_PORT 20
#define DEFAULT_FTP_PORT 21 #define DEFAULT_FTP_PORT 21

10
modules/proxy/proxy_ftp.c
View File

@@ -110,11 +110,11 @@ static int ftp_check_string(const char *x)
ch = ap_proxy_hex2c(&x[i + 1]); ch = ap_proxy_hex2c(&x[i + 1]);
i += 2; i += 2;
} }
#ifndef CHARSET_EBCDIC #ifndef AP_CHARSET_EBCDIC
if (ch == '\015' || ch == '\012' || (ch & 0x80)) if (ch == '\015' || ch == '\012' || (ch & 0x80))
#else /*CHARSET_EBCDIC*/ #else /*AP_CHARSET_EBCDIC*/
if (ch == '\r' || ch == '\n' || (os_toascii[ch] & 0x80)) if (ch == '\r' || ch == '\n' || (os_toascii[ch] & 0x80))
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
return 0; return 0;
} }
return 1; return 1;
@@ -602,9 +602,9 @@ int ap_proxy_ftp_handler(request_rec *r, ap_cache_el *c, char *url)
ap_bpush_socket(f, sock); ap_bpush_socket(f, sock);
/* shouldn't we implement telnet control options here? */ /* shouldn't we implement telnet control options here? */
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
ap_bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 1); ap_bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 1);
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
/* possible results: */ /* possible results: */
/* 120 Service ready in nnn minutes. */ /* 120 Service ready in nnn minutes. */

14
modules/proxy/proxy_util.c
View File

@@ -78,7 +78,7 @@ int ap_proxy_hex2c(const char *x)
{ {
int i, ch; int i, ch;
#ifndef CHARSET_EBCDIC #ifndef AP_CHARSET_EBCDIC
ch = x[0]; ch = x[0];
if (apr_isdigit(ch)) if (apr_isdigit(ch))
i = ch - '0'; i = ch - '0';
@@ -96,14 +96,14 @@ int ap_proxy_hex2c(const char *x)
else else
i += ch - ('a' - 10); i += ch - ('a' - 10);
return i; return i;
#else /*CHARSET_EBCDIC*/ #else /*AP_CHARSET_EBCDIC*/
return (1 == sscanf(x, "%2x", &i)) ? os_toebcdic[i&0xFF] : 0; return (1 == sscanf(x, "%2x", &i)) ? os_toebcdic[i&0xFF] : 0;
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
} }
void ap_proxy_c2hex(int ch, char *x) void ap_proxy_c2hex(int ch, char *x)
{ {
#ifndef CHARSET_EBCDIC #ifndef AP_CHARSET_EBCDIC
int i; int i;
x[0] = '%'; x[0] = '%';
@@ -118,14 +118,14 @@ void ap_proxy_c2hex(int ch, char *x)
x[2] = ('A' - 10) + i; x[2] = ('A' - 10) + i;
else else
x[2] = '0' + i; x[2] = '0' + i;
#else /*CHARSET_EBCDIC*/ #else /*AP_CHARSET_EBCDIC*/
static const char ntoa[] = { "0123456789ABCDEF" }; static const char ntoa[] = { "0123456789ABCDEF" };
ch &= 0xFF; ch &= 0xFF;
x[0] = '%'; x[0] = '%';
x[1] = ntoa[(os_toascii[ch]>>4)&0x0F]; x[1] = ntoa[(os_toascii[ch]>>4)&0x0F];
x[2] = ntoa[os_toascii[ch]&0x0F]; x[2] = ntoa[os_toascii[ch]&0x0F];
x[3] = '\0'; x[3] = '\0';
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
} }
/* /*
@@ -480,7 +480,7 @@ long int ap_proxy_send_fb(proxy_completion *completion, BUFF *f, request_rec *r,
if (c) ap_cache_el_data(c, &cachefp); if (c) ap_cache_el_data(c, &cachefp);
#if 0 #if 0
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
/* The cache copy is ASCII, not EBCDIC, even for text/html) */ /* The cache copy is ASCII, not EBCDIC, even for text/html) */
ap_bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 0); ap_bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 0);
if (c != NULL && c->fp != NULL) if (c != NULL && c->fp != NULL)

4
os/bs2000/ebcdic.c
View File

@@ -56,7 +56,7 @@
* University of Illinois, Urbana-Champaign. * University of Illinois, Urbana-Champaign.
*/ */
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
#include "ap_config.h" #include "ap_config.h"
#include "ebcdic.h" #include "ebcdic.h"
/* /*
@@ -249,4 +249,4 @@ ascii2ebcdic(unsigned char *dest, const unsigned char *srce, size_t count)
*dest++ = os_toebcdic[*srce++]; *dest++ = os_toebcdic[*srce++];
} }
} }
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/

4
os/tpf/ebcdic.c
View File

@@ -56,7 +56,7 @@
* University of Illinois, Urbana-Champaign. * University of Illinois, Urbana-Champaign.
*/ */
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
#include "ap_config.h" #include "ap_config.h"
#include "ebcdic.h" #include "ebcdic.h"
/* /*
@@ -217,5 +217,5 @@ ascii2ebcdic(void *dest, const void *srce, size_t count)
*udest++ = os_toebcdic[*usrce++]; *udest++ = os_toebcdic[*usrce++];
} }
} }
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/

23
server/Makefile.in
View File

@@ -1,8 +1,9 @@
CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h CLEANFILES = gen_test_char gen_uri_delims test_char.h uri_delims.h apache.exports
SUBDIRS = mpm SUBDIRS = mpm
TARGET_EXPORTS = apache.exports
LTLIBRARY_NAME = libmain.la LTLIBRARY_NAME = libmain.la
LTLIBRARY_SOURCES = \ LTLIBRARY_SOURCES = \
uri_delims.h test_char.h \ uri_delims.h test_char.h \
@@ -31,7 +32,21 @@ test_char.h: gen_test_char
util_uri.lo: uri_delims.h util_uri.lo: uri_delims.h
util.lo: test_char.h util.lo: test_char.h
EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports EXPORT_FILES = ../srclib/apr/apr.exports ../srclib/apr-util/aprutil.exports apache.exports
exports.c: $(EXPORT_FILES) delete-exports:
(cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@ @if test -f $(TARGET_EXPORTS); then \
headers="`find include/*.h -newer $(TARGET_EXPORTS)`" ; \
if test -n "$$headers"; then \
echo Found newer headers. Will rebuild $(TARGET_EXPORTS). ; \
echo $(RM) -f $(TARGET_EXPORTS) ; \
$(RM) -f $(TARGET_EXPORTS) ; \
fi \
fi
$(TARGET_EXPORTS):
$(AWK) -f $(top_srcdir)/srclib/apr/helpers/make_export.awk $(top_srcdir)/include/*.h > $@ ; \
exports.c: delete-exports $(EXPORT_FILES)
(cat $(EXPORT_FILES) | ../build/buildexports.sh ..) > $@

6
server/main.c
View File

@@ -156,8 +156,8 @@ static void show_compile_settings(void)
printf(" -D PIPE_BUF=%ld\n",(long)PIPE_BUF); printf(" -D PIPE_BUF=%ld\n",(long)PIPE_BUF);
#endif #endif
#endif #endif
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
printf(" -D CHARSET_EBCDIC\n"); printf(" -D AP_CHARSET_EBCDIC\n");
#endif #endif
#ifdef APACHE_XLATE #ifdef APACHE_XLATE
printf(" -D APACHE_XLATE\n"); printf(" -D APACHE_XLATE\n");
@@ -308,7 +308,7 @@ int main(int argc, const char * const argv[])
pconf = process->pconf; pconf = process->pconf;
ap_server_argv0 = process->short_name; ap_server_argv0 = process->short_name;
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
if (ap_init_ebcdic(pglobal) != APR_SUCCESS) { if (ap_init_ebcdic(pglobal) != APR_SUCCESS) {
destroy_and_exit_process(process, 1); destroy_and_exit_process(process, 1);
} }

10
server/util.c
View File

@@ -1495,11 +1495,11 @@ static char x2c(const char *what)
{ {
register char digit; register char digit;
#ifndef CHARSET_EBCDIC #ifndef AP_CHARSET_EBCDIC
digit = ((what[0] >= 'A') ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0')); digit = ((what[0] >= 'A') ? ((what[0] & 0xdf) - 'A') + 10 : (what[0] - '0'));
digit *= 16; digit *= 16;
digit += (what[1] >= 'A' ? ((what[1] & 0xdf) - 'A') + 10 : (what[1] - '0')); digit += (what[1] >= 'A' ? ((what[1] & 0xdf) - 'A') + 10 : (what[1] - '0'));
#else /*CHARSET_EBCDIC*/ #else /*AP_CHARSET_EBCDIC*/
char xstr[5]; char xstr[5];
xstr[0]='0'; xstr[0]='0';
xstr[1]='x'; xstr[1]='x';
@@ -1507,7 +1507,7 @@ static char x2c(const char *what)
xstr[3]=what[1]; xstr[3]=what[1];
xstr[4]='\0'; xstr[4]='\0';
digit = apr_xlate_conv_byte(ap_hdrs_from_ascii, 0xFF & strtol(xstr, NULL, 16)); digit = apr_xlate_conv_byte(ap_hdrs_from_ascii, 0xFF & strtol(xstr, NULL, 16));
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
return (digit); return (digit);
} }
@@ -1583,9 +1583,9 @@ static const char c2x_table[] = "0123456789abcdef";
static apr_inline unsigned char *c2x(unsigned what, unsigned char *where) static apr_inline unsigned char *c2x(unsigned what, unsigned char *where)
{ {
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
what = apr_xlate_conv_byte(ap_hdrs_to_ascii, (unsigned char)what); what = apr_xlate_conv_byte(ap_hdrs_to_ascii, (unsigned char)what);
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
*where++ = '%'; *where++ = '%';
*where++ = c2x_table[what >> 4]; *where++ = c2x_table[what >> 4];
*where++ = c2x_table[what & 0xf]; *where++ = c2x_table[what & 0xf];

4
server/util_ebcdic.c
View File

@@ -58,7 +58,7 @@
#include "ap_config.h" #include "ap_config.h"
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
#include "apr_strings.h" #include "apr_strings.h"
#include "httpd.h" #include "httpd.h"
@@ -141,4 +141,4 @@ void ap_xlate_proto_from_ascii(char *buffer, apr_size_t len)
buffer, &outbytes_left); buffer, &outbytes_left);
} }
#endif /* CHARSET_EBCDIC */ #endif /* AP_CHARSET_EBCDIC */

2
server/util_md5.c
View File

@@ -105,7 +105,7 @@ AP_DECLARE(char *) ap_md5_binary(apr_pool_t *p, const unsigned char *buf, int le
*/ */
apr_MD5Init(&my_md5); apr_MD5Init(&my_md5);
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
apr_MD5SetXlate(&my_md5, ap_hdrs_to_ascii); apr_MD5SetXlate(&my_md5, ap_hdrs_to_ascii);
#endif #endif
apr_MD5Update(&my_md5, buf, (unsigned int)length); apr_MD5Update(&my_md5, buf, (unsigned int)length);

4
server/util_script.c
View File

@@ -462,7 +462,7 @@ AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
/* if we see a bogus header don't ignore it. Shout and scream */ /* if we see a bogus header don't ignore it. Shout and scream */
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
/* Chances are that we received an ASCII header text instead of /* Chances are that we received an ASCII header text instead of
* the expected EBCDIC header lines. Try to auto-detect: * the expected EBCDIC header lines. Try to auto-detect:
*/ */
@@ -487,7 +487,7 @@ AP_DECLARE(int) ap_scan_script_header_err_core(request_rec *r, char *buffer,
w, &inbytes_left, w, &outbytes_left); w, &inbytes_left, w, &outbytes_left);
} }
} }
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
if (!(l = strchr(w, ':'))) { if (!(l = strchr(w, ':'))) {
char malformed[(sizeof MALFORMED_MESSAGE) + 1 char malformed[(sizeof MALFORMED_MESSAGE) + 1
+ MALFORMED_HEADER_LENGTH_TO_SHOW]; + MALFORMED_HEADER_LENGTH_TO_SHOW];

12
support/htdigest.c
View File

@@ -93,22 +93,22 @@
#endif #endif
#if 'A' == 0xC1 #if 'A' == 0xC1
#define CHARSET_EBCDIC #define AP_CHARSET_EBCDIC
#endif #endif
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
#define LF '\n' #define LF '\n'
#define CR '\r' #define CR '\r'
#else #else
#define LF 10 #define LF 10
#define CR 13 #define CR 13
#endif /* CHARSET_EBCDIC */ #endif /* AP_CHARSET_EBCDIC */
#define MAX_STRING_LEN 256 #define MAX_STRING_LEN 256
char *tn; char *tn;
apr_pool_t *cntxt; apr_pool_t *cntxt;
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
apr_xlate_t *to_ascii; apr_xlate_t *to_ascii;
#endif #endif
@@ -192,7 +192,7 @@ static void add_password(char *user, char *realm, apr_file_t *f)
sprintf(string, "%s:%s:%s", user, realm, pw); sprintf(string, "%s:%s:%s", user, realm, pw);
apr_MD5Init(&context); apr_MD5Init(&context);
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
apr_MD5SetXlate(&context, to_ascii); apr_MD5SetXlate(&context, to_ascii);
#endif #endif
apr_MD5Update(&context, (unsigned char *) string, strlen(string)); apr_MD5Update(&context, (unsigned char *) string, strlen(string));
@@ -241,7 +241,7 @@ int main(int argc, char *argv[])
atexit(apr_terminate); atexit(apr_terminate);
apr_create_pool(&cntxt, NULL); apr_create_pool(&cntxt, NULL);
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt); rv = apr_xlate_open(&to_ascii, "ISO8859-1", APR_DEFAULT_CHARSET, cntxt);
if (rv) { if (rv) {
fprintf(stderr, "apr_xlate_open(): %s (%d)\n", fprintf(stderr, "apr_xlate_open(): %s (%d)\n",

10
support/htpasswd.c
View File

@@ -104,13 +104,13 @@
#define unlink _unlink #define unlink _unlink
#endif #endif
#ifndef CHARSET_EBCDIC #ifndef AP_CHARSET_EBCDIC
#define LF 10 #define LF 10
#define CR 13 #define CR 13
#else /*CHARSET_EBCDIC*/ #else /*AP_CHARSET_EBCDIC*/
#define LF '\n' #define LF '\n'
#define CR '\r' #define CR '\r'
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
#define MAX_STRING_LEN 256 #define MAX_STRING_LEN 256
#define ALG_PLAIN 0 #define ALG_PLAIN 0
@@ -384,7 +384,7 @@ int main(int argc, char *argv[])
int noninteractive = 0; int noninteractive = 0;
int i; int i;
int args_left = 2; int args_left = 2;
#ifdef CHARSET_EBCDIC #ifdef AP_CHARSET_EBCDIC
apr_pool_t *pool; apr_pool_t *pool;
apr_status_t rv; apr_status_t rv;
apr_xlate_t *to_ascii; apr_xlate_t *to_ascii;
@@ -408,7 +408,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "apr_MD5InitEBCDIC()->%d\n", rv); fprintf(stderr, "apr_MD5InitEBCDIC()->%d\n", rv);
exit(1); exit(1);
} }
#endif /*CHARSET_EBCDIC*/ #endif /*AP_CHARSET_EBCDIC*/
tempfilename = NULL; tempfilename = NULL;
signal(SIGINT, (void (*)(int)) interrupted); signal(SIGINT, (void (*)(int)) interrupted);