Get rid of some outdated character set translation cruft.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86753 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/httpd.h b/include/httpd.h
index e65f59df3721a5435678758fc2e11b0d76759ec4..ce8a5858bf7cfda5ee07e8c742fad63b9ba1c45d 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -518,9 +518,6 @@ struct ap_method_list_t {
 #define INCLUDES_MAGIC_TYPE "text/x-server-parsed-html"
 #define INCLUDES_MAGIC_TYPE3 "text/x-server-parsed-html3"
 #define DIR_MAGIC_TYPE "httpd/unix-directory"
-#ifdef CHARSET_EBCDIC
-#define ASCIITEXT_MAGIC_TYPE_PREFIX "text/x-ascii-" /* Text files whose content-type starts with this are passed thru unconverted */
-#endif /*CHARSET_EBCDIC*/         
 
 /* Just in case your linefeed isn't the one the other end is expecting. */
 #ifndef CHARSET_EBCDIC
@@ -592,17 +589,6 @@ typedef struct request_rec request_rec;
 
 #include "util_uri.h"
 
-#ifdef APACHE_XLATE
-#include "apr_xlate.h"
-
-/** structure to aid charset translate between machine and network */
-struct ap_rr_xlate {
-    /* contents are experimental! expect it to change! */
-    /** translation handle to use when coming from the network */
-    apr_xlate_t *from_net;
-};
-#endif /*APACHE_XLATE*/
-
 /** A structure that represents one process */
 struct process_rec {
     /** Global pool. Please try to cleared on _all_ exits */

diff --git a/include/util_charset.h b/include/util_charset.h
index a604de035bbde1fc9e3f2635d99f14dedabe5592..a9f4c63a4814d37d8c22ac1911a92a8cbc0ef413 100644 (file)
--- a/include/util_charset.h
+++ b/include/util_charset.h
@@ -87,36 +87,6 @@ extern apr_xlate_t *ap_locale_to_ascii;
  *  On an ASCII machine this is NULL */
 extern apr_xlate_t *ap_locale_from_ascii;
 
-/* Save & Restore the current conversion settings
- *
- * On an EBCDIC machine:
- *
- * "input"  means: ASCII -> EBCDIC (when reading MIME Headers and
- *                                  PUT/POST data)
- * "output" means: EBCDIC -> ASCII (when sending MIME Headers and Chunks)
- *
- * On an ASCII machine:
- *
- *   no conversion of headers, so we need to set the translation handle
- *   to NULL
- */
-
-#define AP_PUSH_INPUTCONVERSION_STATE(_buff, _newx) \
-        apr_xlate_t *saved_input_xlate; \
-        ap_bgetopt(_buff, BO_RXLATE, &saved_input_xlate); \
-        ap_bsetopt(_buff, BO_RXLATE, &(_newx))
-
-#define AP_POP_INPUTCONVERSION_STATE(_buff) \
-        ap_bsetopt(_buff, BO_RXLATE, &saved_input_xlate)
-
-#define AP_PUSH_OUTPUTCONVERSION_STATE(_buff, _newx) \
-        apr_xlate_t *saved_output_xlate; \
-        ap_bgetopt(_buff, BO_WXLATE, &saved_output_xlate); \
-        ap_bsetopt(_buff, BO_WXLATE, &(_newx))
-
-#define AP_POP_OUTPUTCONVERSION_STATE(_buff) \
-        ap_bsetopt(_buff, BO_WXLATE, &saved_output_xlate)
-
 #ifdef __cplusplus
 }
 #endif