httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server main.c util_charset.c util_ebcdic.c
Date Wed, 26 Nov 2003 02:09:26 GMT
trawick     2003/11/25 18:09:25

  Modified:    include  ap_config.h util_charset.h
               server   main.c util_charset.c util_ebcdic.c
  Log:
  tidy up some charset recoding issues
  
  the "need" for APACHE_XLATE went away some years ago when BUFF went
  POOF and charset recoding (translation) of non-protocol data
  could no longer be performed by the core...
  
  Revision  Changes    Path
  1.71      +0 -4      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.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- ap_config.h	3 Feb 2003 17:52:52 -0000	1.70
  +++ ap_config.h	26 Nov 2003 02:09:25 -0000	1.71
  @@ -284,8 +284,4 @@
   #define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
   #endif
   
  -#if APR_CHARSET_EBCDIC && !defined(APACHE_XLATE)
  -#define APACHE_XLATE
  -#endif
  -
   #endif /* AP_CONFIG_H */
  
  
  
  1.11      +6 -12     httpd-2.0/include/util_charset.h
  
  Index: util_charset.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/util_charset.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- util_charset.h	3 Feb 2003 17:52:54 -0000	1.10
  +++ util_charset.h	26 Nov 2003 02:09:25 -0000	1.11
  @@ -59,8 +59,6 @@
   #ifndef APACHE_UTIL_CHARSET_H
   #define APACHE_UTIL_CHARSET_H
   
  -#ifdef APACHE_XLATE
  -
   #ifdef __cplusplus
   extern "C" {
   #endif
  @@ -68,6 +66,10 @@
   /**
    * @package charset conversion
    */
  +#include "apr.h"
  +
  +#if APR_CHARSET_EBCDIC
  +
   #include "apr_xlate.h"
   
   /** On EBCDIC machine this is a translation handle used to translate the 
  @@ -78,19 +80,11 @@
    *  headers from ASCII to the local machine format after network transmission.
    *  On an ASCII machine this is NULL */
   extern apr_xlate_t *ap_hdrs_from_ascii;
  -/** On EBCDIC machine this is a translation handle used to translate the 
  - *  content from the local machine format to ASCII for network transmission.
  - *  On an ASCII machine this is NULL */
  -extern apr_xlate_t *ap_locale_to_ascii;
  -/** On EBCDIC machine this is a translation handle used to translate the
  - *  content from ASCII to the local machine format after network transmission.
  - *  On an ASCII machine this is NULL */
  -extern apr_xlate_t *ap_locale_from_ascii;
   
  +#endif  /* APR_CHARSET_EBCDIC */
  +    
   #ifdef __cplusplus
   }
   #endif
   
  -#endif  /* APACHE_XLATE */
  -    
   #endif  /* !APACHE_UTIL_CHARSET_H */
  
  
  
  1.147     +0 -4      httpd-2.0/server/main.c
  
  Index: main.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/main.c,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- main.c	8 Sep 2003 16:39:04 -0000	1.146
  +++ main.c	26 Nov 2003 02:09:25 -0000	1.147
  @@ -195,10 +195,6 @@
       printf(" -D APR_CHARSET_EBCDIC\n");
   #endif
   
  -#ifdef APACHE_XLATE
  -    printf(" -D APACHE_XLATE\n");
  -#endif
  -
   #ifdef NEED_HASHBANG_EMUL
       printf(" -D NEED_HASHBANG_EMUL\n");
   #endif
  
  
  
  1.11      +2 -17     httpd-2.0/server/util_charset.c
  
  Index: util_charset.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_charset.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- util_charset.c	3 Feb 2003 17:53:20 -0000	1.10
  +++ util_charset.c	26 Nov 2003 02:09:25 -0000	1.11
  @@ -58,7 +58,7 @@
   
   #include "ap_config.h"
   
  -#ifdef APACHE_XLATE
  +#if APR_CHARSET_EBCDIC
   
   #include "httpd.h"
   #include "http_log.h"
  @@ -81,19 +81,4 @@
    
   apr_xlate_t *ap_hdrs_to_ascii, *ap_hdrs_from_ascii;
   
  -/* ap_locale_to_ascii, ap_locale_from_ascii
  - *
  - * These handles are used for the translation of content, unless a
  - * configuration module overrides them.
  - *
  - * For an EBCDIC machine, these are valid handles which are set up at
  - * initialization to translate between ISO-8859-1 and the code page of
  - * the httpd process's locale.
  - *
  - * For an ASCII machine, these remain NULL so that no translation is
  - * performed (unless a configuration module does something, of course).
  - */
  -
  -apr_xlate_t *ap_locale_to_ascii, *ap_locale_from_ascii;
  -
  -#endif /*APACHE_XLATE*/
  +#endif /*APR_CHARSET_EBCDIC */
  
  
  
  1.22      +0 -14     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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- util_ebcdic.c	3 Feb 2003 17:53:20 -0000	1.21
  +++ util_ebcdic.c	26 Nov 2003 02:09:25 -0000	1.22
  @@ -85,20 +85,6 @@
           return rv;
       }
   
  -    rv = apr_xlate_open(&ap_locale_to_ascii, "ISO8859-1", APR_LOCALE_CHARSET, pool);
  -    if (rv) {
  -        ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
  -                     "apr_xlate_open() failed");
  -        return rv;
  -    }
  -
  -    rv = apr_xlate_open(&ap_locale_from_ascii, APR_LOCALE_CHARSET, "ISO8859-1", pool);
  -    if (rv) {
  -        ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
  -                     "apr_xlate_open() failed");
  -        return rv;
  -    }
  -
       rv = apr_MD5InitEBCDIC(ap_hdrs_to_ascii);
       if (rv) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
  
  
  

Mime
View raw message