trawick 00/10/26 04:34:05
Modified: src/include httpd.h util_charset.h
Log:
Get rid of some outdated character set translation cruft.
Revision Changes Path
1.109 +0 -14 apache-2.0/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- httpd.h 2000/10/23 15:30:49 1.108
+++ httpd.h 2000/10/26 11:34:03 1.109
@@ -518,9 +518,6 @@
#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
@@ -591,17 +588,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 {
1.7 +0 -30 apache-2.0/src/include/util_charset.h
Index: util_charset.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/util_charset.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- util_charset.h 2000/10/16 18:00:44 1.6
+++ util_charset.h 2000/10/26 11:34:04 1.7
@@ -87,36 +87,6 @@
* 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
