httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: httpd-2.0/support htdigest.c htpasswd.c
Date Tue, 19 Dec 2000 17:05:53 GMT
rbb         00/12/19 09:05:50

  Modified:    .        CHANGES Makefile.in acinclude.m4
               build    buildexports.awk buildexports.sh
               include  ap_config.h ap_listen.h http_config.h httpd.h
                        util_ebcdic.h
               modules/experimental mod_charset_lite.c
               modules/filters mod_include.h
               modules/proxy mod_proxy.h proxy_ftp.c proxy_util.c
               os/bs2000 ebcdic.c
               os/tpf   ebcdic.c
               server   Makefile.in main.c util.c util_ebcdic.c util_md5.c
                        util_script.c
               .        aclocal.m4 hints.m4
               helpers  make_export.awk
               passwd   apr_getpass.c apr_md5.c
               src/crypto ap_sha1.c
               src/encoding ap_base64.c
               support  htdigest.c htpasswd.c
  Log:
  Force all Apache functions to be linked into the executable, whether they
  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.
  
  Revision  Changes    Path
  1.14      +7 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CHANGES	2000/12/19 16:08:00	1.13
  +++ CHANGES	2000/12/19 17:05:06	1.14
  @@ -1,4 +1,11 @@
   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
        on the query, and remove IPv4 dependencies.  [Jeff Trawick]
  
  
  
  1.44      +1 -1      httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- Makefile.in	2000/12/07 16:14:19	1.43
  +++ Makefile.in	2000/12/19 17:05:07	1.44
  @@ -12,7 +12,7 @@
     $(AP_LIBS)
   
   PROGRAMS        = $(PROGRAM_NAME)
  -targets         = $(PROGRAMS)
  +targets         = $(PROGRAMS) 
   phony_targets   = $(srcdir)/buildmark.c
   install_targets = install-conf install-htdocs install-icons install-other \
   	install-cgi install-include install-support
  
  
  
  1.55      +2 -1      httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- acinclude.m4	2000/12/06 08:06:32	1.54
  +++ acinclude.m4	2000/12/19 17:05:07	1.55
  @@ -66,6 +66,7 @@
     APACHE_SUBST(sysconfdir)
     APACHE_SUBST(progname)
     APACHE_SUBST(prefix)
  +  APACHE_SUBST(AWK)
     APACHE_SUBST(CC)
     APACHE_SUBST(CFLAGS)
     APACHE_SUBST(CPPFLAGS)
  @@ -216,7 +217,7 @@
     ac_cv_ebcdic="no"
   ])])
     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
   ])
   
  
  
  
  1.5       +2 -2      httpd-2.0/build/buildexports.awk
  
  Index: buildexports.awk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/buildexports.awk,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildexports.awk	2000/12/12 15:00:33	1.4
  +++ buildexports.awk	2000/12/19 17:05:11	1.5
  @@ -1,3 +1,3 @@
  -/^APR_/     { print "#if", $1 }
  +/^(APR?_|defined)/     { print "#if", $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), "*/" }
  
  
  
  1.10      +4 -3      httpd-2.0/build/buildexports.sh
  
  Index: buildexports.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/buildexports.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- buildexports.sh	2000/12/07 11:37:08	1.9
  +++ buildexports.sh	2000/12/19 17:05:11	1.10
  @@ -1,9 +1,9 @@
   #! /bin/sh
   
   if test -z "$1"; then
  -    echo "USAGE: $0 SRCLIB-DIRECTORY"
  +    echo "USAGE: $0 HTTPD-DIRECTORY"
       echo ""
  -    echo "for example: $0 ../srclib"
  +    echo "for example: $0 .."
       exit 1
   fi
   
  @@ -12,9 +12,10 @@
   echo " * the base server uses them."
   echo " */"
   echo ""
  +echo "#define CORE_PRIVATE"
   
   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
       cd $dir
       for file in *.h; do
  
  
  
  1.49      +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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- ap_config.h	2000/12/06 05:59:50	1.48
  +++ ap_config.h	2000/12/19 17:05:11	1.49
  @@ -243,7 +243,7 @@
   #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
   #endif
   
  -#if defined(CHARSET_EBCDIC) && !defined(APACHE_XLATE)
  +#if defined(AP_CHARSET_EBCDIC) && !defined(APACHE_XLATE)
   #define APACHE_XLATE
   #endif
   
  
  
  
  1.23      +5 -1      httpd-2.0/include/ap_listen.h
  
  Index: ap_listen.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_listen.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ap_listen.h	2000/12/16 14:49:18	1.22
  +++ ap_listen.h	2000/12/19 17:05:11	1.23
  @@ -56,6 +56,7 @@
   #define AP_LISTEN_H
   
   #include "apr_network_io.h"
  +#include "httpd.h"
   #include "http_config.h"
   
   /**
  @@ -114,7 +115,10 @@
    * Prefork or SPMT_OS2 MPMs.
    */ 
   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
    * and binding the socket.
  
  
  
  1.52      +4 -0      httpd-2.0/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- http_config.h	2000/10/30 20:13:00	1.51
  +++ http_config.h	2000/12/19 17:05:12	1.52
  @@ -447,6 +447,7 @@
   				NULL, \
   				MODULE_MAGIC_COOKIE
   
  +#if AP_RBB_HACK
   /**
    * Generic accessors for other modules to get at their own module-specific
    * data
  @@ -457,6 +458,8 @@
    * @deffunc 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
    * data
  @@ -467,6 +470,7 @@
    * @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);
  +#endif
   
   #define ap_get_module_config(v,m)	\
       (((void **)(v))[(m)->module_index])
  
  
  
  1.127     +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.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- httpd.h	2000/12/15 19:20:09	1.126
  +++ httpd.h	2000/12/19 17:05:12	1.127
  @@ -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 CHARSET_EBCDIC
  +#ifndef AP_CHARSET_EBCDIC
   #define LF 10
   #define CR 13
   #define CRLF "\015\012"
  -#else /* CHARSET_EBCDIC */
  +#else /* AP_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 /* CHARSET_EBCDIC */                                   
  +#endif /* AP_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.9       +4 -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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- util_ebcdic.h	2000/10/26 10:48:27	1.8
  +++ util_ebcdic.h	2000/12/19 17:05:12	1.9
  @@ -59,7 +59,6 @@
   #ifndef APACHE_UTIL_EBCDIC_H
   #define APACHE_UTIL_EBCDIC_H
   
  -#ifdef CHARSET_EBCDIC
   
   #ifdef __cplusplus
   extern "C" {
  @@ -73,6 +72,8 @@
    * @package Utilities for EBCDIC conversion
    */
   
  +#ifdef AP_CHARSET_EBCDIC
  +
   /**
    * Setup all of the global translation handlers
    * @param pool pool to allocate out of
  @@ -99,11 +100,11 @@
   }
   #endif
   
  -#else   /* CHARSET_EBCDIC */
  +#else   /* AP_CHARSET_EBCDIC */
   
   #define ap_xlate_proto_to_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 */
  
  
  
  1.33      +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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_charset_lite.c	2000/11/13 03:50:15	1.32
  +++ mod_charset_lite.c	2000/12/19 17:05:12	1.33
  @@ -291,7 +291,7 @@
    */
                
       if (strncasecmp(mime_type, "text/", 5) &&
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
           /* On an EBCDIC machine, be willing to translate mod_autoindex-
            * generated output.  Otherwise, it doesn't look too cool.
            *
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_include.h	2000/12/07 03:32:54	1.4
  +++ mod_include.h	2000/12/19 17:05:13	1.5
  @@ -69,11 +69,11 @@
   #define SIZEFMT_BYTES 0
   #define SIZEFMT_KMG 1
   #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)
  -#else /*CHARSET_EBCDIC*/
  +#else /*AP_CHARSET_EBCDIC*/
   #define RAW_ASCII_CHAR(ch)  (ch)
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
   
   module AP_MODULE_DECLARE_DATA includes_module;
   
  
  
  
  1.22      +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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_proxy.h	2000/11/18 17:13:29	1.21
  +++ mod_proxy.h	2000/12/19 17:05:13	1.22
  @@ -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 CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   #define CRLF   "\r\n"
  -#else /*CHARSET_EBCDIC*/
  +#else /*AP_CHARSET_EBCDIC*/
   #define CRLF   "\015\012"
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
   
   #define	DEFAULT_FTP_DATA_PORT	20
   #define	DEFAULT_FTP_PORT	21
  
  
  
  1.26      +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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- proxy_ftp.c	2000/11/21 19:10:25	1.25
  +++ proxy_ftp.c	2000/12/19 17:05:14	1.26
  @@ -110,11 +110,11 @@
   	    ch = ap_proxy_hex2c(&x[i + 1]);
   	    i += 2;
   	}
  -#ifndef CHARSET_EBCDIC
  +#ifndef AP_CHARSET_EBCDIC
           if (ch == '\015' || ch == '\012' || (ch & 0x80))
  -#else /*CHARSET_EBCDIC*/
  +#else /*AP_CHARSET_EBCDIC*/
           if (ch == '\r' || ch == '\n' || (os_toascii[ch] & 0x80))
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
           return 0;
       }
       return 1;
  @@ -602,9 +602,9 @@
       ap_bpush_socket(f, sock);
   /* shouldn't we implement telnet control options here? */
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
       ap_bsetflag(f, B_ASCII2EBCDIC|B_EBCDIC2ASCII, 1);
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
   
   /* possible results: */
       /* 120 Service ready in nnn minutes. */
  
  
  
  1.33      +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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- proxy_util.c	2000/12/18 17:51:46	1.32
  +++ proxy_util.c	2000/12/19 17:05:14	1.33
  @@ -78,7 +78,7 @@
   {
       int i, ch;
   
  -#ifndef CHARSET_EBCDIC
  +#ifndef AP_CHARSET_EBCDIC
       ch = x[0];
       if (apr_isdigit(ch))
   	i = ch - '0';
  @@ -96,14 +96,14 @@
       else
   	i += ch - ('a' - 10);
       return i;
  -#else /*CHARSET_EBCDIC*/
  +#else /*AP_CHARSET_EBCDIC*/
       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)
   {
  -#ifndef CHARSET_EBCDIC
  +#ifndef AP_CHARSET_EBCDIC
       int i;
   
       x[0] = '%';
  @@ -118,14 +118,14 @@
   	x[2] = ('A' - 10) + i;
       else
   	x[2] = '0' + i;
  -#else /*CHARSET_EBCDIC*/
  +#else /*AP_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 /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
   }
   
   /*
  @@ -480,7 +480,7 @@
       if (c) ap_cache_el_data(c, &cachefp);
   
   #if 0
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_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)
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ebcdic.c	2000/08/02 05:27:26	1.5
  +++ ebcdic.c	2000/12/19 17:05:14	1.6
  @@ -56,7 +56,7 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   #include "ap_config.h"
   #include "ebcdic.h"
   /*
  @@ -249,4 +249,4 @@
   		*dest++ = os_toebcdic[*srce++];
   	}
   }
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
  
  
  
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ebcdic.c	2000/08/02 05:27:28	1.5
  +++ ebcdic.c	2000/12/19 17:05:14	1.6
  @@ -56,7 +56,7 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   #include "ap_config.h"
   #include "ebcdic.h"
   /*
  @@ -217,5 +217,5 @@
                   *udest++ = os_toebcdic[*usrce++];
       }
   }
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
    
  
  
  
  1.27      +19 -4     httpd-2.0/server/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Makefile.in	2000/12/07 11:37:04	1.26
  +++ Makefile.in	2000/12/19 17:05:15	1.27
  @@ -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
   
  +TARGET_EXPORTS    = apache.exports
   LTLIBRARY_NAME    = libmain.la
   LTLIBRARY_SOURCES = \
       uri_delims.h test_char.h \
  @@ -31,7 +32,21 @@
   util_uri.lo: uri_delims.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)
  -	(cat $(EXPORT_FILES) | ../build/buildexports.sh ../srclib) > $@
  +delete-exports:
  +	@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 ..) > $@
  
  
  
  1.79      +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.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- main.c	2000/12/17 22:47:32	1.78
  +++ main.c	2000/12/19 17:05:15	1.79
  @@ -156,8 +156,8 @@
   	printf(" -D PIPE_BUF=%ld\n",(long)PIPE_BUF);
   #endif
   #endif
  -#ifdef CHARSET_EBCDIC
  -    printf(" -D CHARSET_EBCDIC\n");
  +#ifdef AP_CHARSET_EBCDIC
  +    printf(" -D AP_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 CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
       if (ap_init_ebcdic(pglobal) != APR_SUCCESS) {
           destroy_and_exit_process(process, 1);
       }
  
  
  
  1.85      +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.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- util.c	2000/12/15 13:28:57	1.84
  +++ util.c	2000/12/19 17:05:15	1.85
  @@ -1495,11 +1495,11 @@
   {
       register char digit;
   
  -#ifndef CHARSET_EBCDIC
  +#ifndef AP_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 /*CHARSET_EBCDIC*/
  +#else /*AP_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 /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
       return (digit);
   }
   
  @@ -1583,9 +1583,9 @@
   
   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);
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
       *where++ = '%';
       *where++ = c2x_table[what >> 4];
       *where++ = c2x_table[what & 0xf];
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- util_ebcdic.c	2000/10/26 10:48:28	1.14
  +++ util_ebcdic.c	2000/12/19 17:05:15	1.15
  @@ -58,7 +58,7 @@
   
   #include "ap_config.h"
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   
   #include "apr_strings.h"
   #include "httpd.h"
  @@ -141,4 +141,4 @@
                             buffer, &outbytes_left);
   }
   
  -#endif /* CHARSET_EBCDIC */
  +#endif /* AP_CHARSET_EBCDIC */
  
  
  
  1.23      +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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- util_md5.c	2000/11/07 20:21:55	1.22
  +++ util_md5.c	2000/12/19 17:05:15	1.23
  @@ -105,7 +105,7 @@
        */
   
       apr_MD5Init(&my_md5);
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
       apr_MD5SetXlate(&my_md5, ap_hdrs_to_ascii);
   #endif
       apr_MD5Update(&my_md5, buf, (unsigned int)length);
  
  
  
  1.51      +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.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- util_script.c	2000/11/22 19:38:03	1.50
  +++ util_script.c	2000/12/19 17:05:15	1.51
  @@ -462,7 +462,7 @@
   
   	/* 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
   	     * the expected EBCDIC header lines. Try to auto-detect:
   	     */
  @@ -487,7 +487,7 @@
                                         w, &inbytes_left, w, &outbytes_left);
   	    }
   	}
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
   	if (!(l = strchr(w, ':'))) {
   	    char malformed[(sizeof MALFORMED_MESSAGE) + 1
   			   + MALFORMED_HEADER_LENGTH_TO_SHOW];
  
  
  
  1.37      +1 -1      apr/aclocal.m4
  
  Index: aclocal.m4
  ===================================================================
  RCS file: /home/cvs/apr/aclocal.m4,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- aclocal.m4	2000/12/17 13:12:11	1.36
  +++ aclocal.m4	2000/12/19 17:05:21	1.37
  @@ -321,7 +321,7 @@
     ac_cv_ebcdic="no"
   ])])
     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
   ])
   
  
  
  
  1.31      +2 -2      apr/hints.m4
  
  Index: hints.m4
  ===================================================================
  RCS file: /home/cvs/apr/hints.m4,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- hints.m4	2000/12/12 12:25:50	1.30
  +++ hints.m4	2000/12/19 17:05:21	1.31
  @@ -221,11 +221,11 @@
   	;;
       TPF)
          APR_SETIFNULL(CC, [c89])
  -       APR_SETIFNULL(CFLAGS, [-DTPF -DCHARSET_EBCDIC -D_POSIX_SOURCE])
  +       APR_SETIFNULL(CFLAGS, [-DTPF -DAP_CHARSET_EBCDIC -D_POSIX_SOURCE])
          ;;
       BS2000*-siemens-sysv4*)
   	APR_SETIFNULL(CC, [c89 -XLLML -XLLMK -XL -Kno_integer_overflow])
  -	APR_SETIFNULL(CFLAGS, [-DCHARSET_EBCDIC -DSVR4 -D_XPG_IV])
  +	APR_SETIFNULL(CFLAGS, [-DAP_CHARSET_EBCDIC -DSVR4 -D_XPG_IV])
   	;;
       *-siemens-sysv4*)
   	APR_SETIFNULL(CFLAGS, [-DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT
-DNEED_UNION_SEMUN])
  
  
  
  1.2       +3 -3      apr/helpers/make_export.awk
  
  Index: make_export.awk
  ===================================================================
  RCS file: /home/cvs/apr/helpers/make_export.awk,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- make_export.awk	2000/12/18 00:17:18	1.1
  +++ make_export.awk	2000/12/19 17:05:28	1.2
  @@ -1,6 +1,6 @@
   # Based on Ryan Bloom's make_export.pl
   
  -/^#[ \t]*if(def)? APR_.*/ {
  +/^#[ \t]*if(def)? (APR?_|defined).*/ {
   	if (old_filename != FILENAME) {
   		if (old_filename != "") printf("%s", line)
   		macro_no = 0
  @@ -32,14 +32,14 @@
   	next
   }
   
  -/^[ \t]*(APR_DECLARE[^(]*[(])?(const[ \t])?[a-z_]+[)]?[ \t]+[*]?([A-Za-z0-9_]+)\(/ {
  +/^[ \t]*(APR?_DECLARE[^(]*[(])?(const[ \t])?[a-z_]+[ \t\*]*[)]?[ \t]+[*]?([A-Za-z0-9_]+)\(/
{
   	if (found) {
   		found++
   	}
   	for (i = 0; i < count; i++) {
   		line = line "\t"
   	}
  -	sub("^[ \t]*(APR_DECLARE[^(]*[(])?(const[ \t])?[a-z_]+[)]?[ \t]+[*]?", "");
  +	sub("^[ \t]*(APR?_DECLARE[^(]*[(])?(const[ \t])?[a-z_]+[ \t\*]*[)]?[ \t]+[*]?", "");
   	sub("[(].*", "");
   	line = line $0 "\n"
   	next
  
  
  
  1.5       +3 -3      apr/passwd/apr_getpass.c
  
  Index: apr_getpass.c
  ===================================================================
  RCS file: /home/cvs/apr/passwd/apr_getpass.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_getpass.c	2000/12/02 12:06:03	1.4
  +++ apr_getpass.c	2000/12/19 17:05:35	1.5
  @@ -78,13 +78,13 @@
   #include <termios.h>
   #endif
   
  -#ifndef CHARSET_EBCDIC
  +#ifndef AP_CHARSET_EBCDIC
   #define LF 10
   #define CR 13
  -#else /* CHARSET_EBCDIC */
  +#else /* AP_CHARSET_EBCDIC */
   #define LF '\n'
   #define CR '\r'
  -#endif /* CHARSET_EBCDIC */
  +#endif /* AP_CHARSET_EBCDIC */
   
   #define MAX_STRING_LEN 256
   
  
  
  
  1.5       +3 -3      apr/passwd/apr_md5.c
  
  Index: apr_md5.c
  ===================================================================
  RCS file: /home/cvs/apr/passwd/apr_md5.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_md5.c	2000/10/16 06:04:48	1.4
  +++ apr_md5.c	2000/12/19 17:05:36	1.5
  @@ -145,7 +145,7 @@
       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
   };
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   static apr_xlate_t *xlate_ebcdic_to_ascii; /* used in apr_MD5Encode() */
   #endif
   
  @@ -460,7 +460,7 @@
   	    (((UINT4) input[j + 2]) << 16) | (((UINT4) input[j + 3]) << 24);
   }
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   APR_DECLARE(apr_status_t) apr_MD5InitEBCDIC(apr_xlate_t *xlate)
   {
       xlate_ebcdic_to_ascii = xlate;
  @@ -537,7 +537,7 @@
        * 'Time to make the doughnuts..'
        */
       apr_MD5Init(&ctx);
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
       apr_MD5SetXlate(&ctx, xlate_ebcdic_to_ascii);
   #endif
       
  
  
  
  1.18      +4 -4      apr-util/src/crypto/ap_sha1.c
  
  Index: ap_sha1.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/crypto/ap_sha1.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ap_sha1.c	2000/12/05 04:46:24	1.17
  +++ ap_sha1.c	2000/12/19 17:05:41	1.18
  @@ -86,9 +86,9 @@
   #include "ap_base64.h"
   #include "apr_strings.h"
   #include "apr_lib.h"
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   #include "apr_xlate.h"
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
   #include <string.h>
   
   /* a bit faster & bigger, if defined */
  @@ -119,7 +119,7 @@
   
   #define SHA_BLOCKSIZE           64
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   static apr_xlate_t *ebcdic2ascii_xlate;
   
   APR_DECLARE(apr_status_t) ap_SHA1InitEBCDIC(apr_xlate_t *x)
  @@ -299,7 +299,7 @@
   APR_DECLARE(void) ap_SHA1Update(AP_SHA1_CTX *sha_info, const char *buf,
                                 unsigned int count)
   {
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
       int i;
       const AP_BYTE *buffer = (const AP_BYTE *) buf;
       apr_size_t inbytes_left, outbytes_left;
  
  
  
  1.16      +14 -14    apr-util/src/encoding/ap_base64.c
  
  Index: ap_base64.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/encoding/ap_base64.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ap_base64.c	2000/12/05 01:12:28	1.15
  +++ ap_base64.c	2000/12/19 17:05:45	1.16
  @@ -63,14 +63,14 @@
    */
   
   #include "ap_base64.h"
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   #include "apr_xlate.h"
  -#endif				/* CHARSET_EBCDIC */
  +#endif				/* AP_CHARSET_EBCDIC */
   
   /* aaaack but it's fast and const should make it shared text page. */
   static const unsigned char pr2six[256] =
   {
  -#ifndef CHARSET_EBCDIC
  +#ifndef AP_CHARSET_EBCDIC
       /* ASCII table */
       64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
       64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
  @@ -88,7 +88,7 @@
       64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
       64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
       64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
  -#else /*CHARSET_EBCDIC*/
  +#else /*AP_CHARSET_EBCDIC*/
       /* EBCDIC table */
       64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
       64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
  @@ -106,10 +106,10 @@
       64,  9, 10, 11, 12, 13, 14, 15, 16, 17, 64, 64, 64, 64, 64, 64,
       64, 64, 18, 19, 20, 21, 22, 23, 24, 25, 64, 64, 64, 64, 64, 64,
       52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, 64, 64, 64, 64, 64
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
   };
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   static apr_xlate_t *xlate_to_ebcdic;
   static unsigned char os_toascii[256];
   
  @@ -147,7 +147,7 @@
   
       return APR_SUCCESS;
   }
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
   
   APR_DECLARE(int) ap_base64decode_len(const char *bufcoded)
   {
  @@ -166,17 +166,17 @@
   
   APR_DECLARE(int) ap_base64decode(char *bufplain, const char *bufcoded)
   {
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
       apr_size_t inbytes_left, outbytes_left;
  -#endif				/* CHARSET_EBCDIC */
  +#endif				/* AP_CHARSET_EBCDIC */
       int len;
       
       len = ap_base64decode_binary((unsigned char *) bufplain, bufcoded);
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
       inbytes_left = outbytes_left = len;
       apr_xlate_conv_buffer(xlate_to_ebcdic, bufplain, &inbytes_left,
                             bufplain, &outbytes_left);
  -#endif				/* CHARSET_EBCDIC */
  +#endif				/* AP_CHARSET_EBCDIC */
       bufplain[len] = '\0';
       return len;
   }
  @@ -239,9 +239,9 @@
   
   APR_DECLARE(int) ap_base64encode(char *encoded, const char *string, int len)
   {
  -#ifndef CHARSET_EBCDIC
  +#ifndef AP_CHARSET_EBCDIC
       return ap_base64encode_binary(encoded, (const unsigned char *) string, len);
  -#else				/* CHARSET_EBCDIC */
  +#else				/* AP_CHARSET_EBCDIC */
       int i;
       char *p;
   
  @@ -270,7 +270,7 @@
   
       *p++ = '\0';
       return p - encoded;
  -#endif				/* CHARSET_EBCDIC */
  +#endif				/* AP_CHARSET_EBCDIC */
   }
   
   /* This is the same as ap_base64encode() except on EBCDIC machines, where
  
  
  
  1.16      +6 -6      httpd-2.0/support/htdigest.c
  
  Index: htdigest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htdigest.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- htdigest.c	2000/11/26 04:47:42	1.15
  +++ htdigest.c	2000/12/19 17:05:47	1.16
  @@ -93,22 +93,22 @@
   #endif
   
   #if 'A' == 0xC1
  -#define CHARSET_EBCDIC
  +#define AP_CHARSET_EBCDIC
   #endif
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   #define LF '\n'
   #define CR '\r'
   #else
   #define LF 10
   #define CR 13
  -#endif /* CHARSET_EBCDIC */
  +#endif /* AP_CHARSET_EBCDIC */
   
   #define MAX_STRING_LEN 256
   
   char *tn;
   apr_pool_t *cntxt;
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
   apr_xlate_t *to_ascii;
   #endif
   
  @@ -192,7 +192,7 @@
       sprintf(string, "%s:%s:%s", user, realm, pw);
   
       apr_MD5Init(&context);
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_CHARSET_EBCDIC
       apr_MD5SetXlate(&context, to_ascii);
   #endif
       apr_MD5Update(&context, (unsigned char *) string, strlen(string));
  @@ -241,7 +241,7 @@
       atexit(apr_terminate); 
       apr_create_pool(&cntxt, NULL);
   
  -#ifdef CHARSET_EBCDIC
  +#ifdef AP_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.26      +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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- htpasswd.c	2000/11/30 19:12:36	1.25
  +++ htpasswd.c	2000/12/19 17:05:48	1.26
  @@ -104,13 +104,13 @@
   #define unlink _unlink
   #endif
   
  -#ifndef CHARSET_EBCDIC
  +#ifndef AP_CHARSET_EBCDIC
   #define LF 10
   #define CR 13
  -#else /*CHARSET_EBCDIC*/
  +#else /*AP_CHARSET_EBCDIC*/
   #define LF '\n'
   #define CR '\r'
  -#endif /*CHARSET_EBCDIC*/
  +#endif /*AP_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 CHARSET_EBCDIC
  +#ifdef AP_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 /*CHARSET_EBCDIC*/
  +#endif /*AP_CHARSET_EBCDIC*/
   
       tempfilename = NULL;
       signal(SIGINT, (void (*)(int)) interrupted);
  
  
  

Mime
View raw message