get rid of an ancient requirement that APACHE_XLATE be defined;

get rid of an ancient work-around for a problem with apr_heap_create

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

diff --git a/docs/manual/mod/mod_charset_lite.html b/docs/manual/mod/mod_charset_lite.html
index 6b8ccf963b1177844fcdd8081f3d88eb15cba110..8a6d22054a1578f4540c3eb0a61ef0fee9646832 100644 (file)
--- a/docs/manual/mod/mod_charset_lite.html
+++ b/docs/manual/mod/mod_charset_lite.html
@@ -49,9 +49,6 @@
     <code>mod_charset_lite</code> is needed in order for any
     translation to take place.</p>
 
-    <p>This module will only work if <code>APACHE_XLATE</code> is
-    defined at compile time.</p>
-
     <p>This module provides a small subset of configuration
     mechanisms implemented by Russian Apache and its associated
     <code>mod_charset</code>.</p>

diff --git a/modules/experimental/mod_charset_lite.c b/modules/experimental/mod_charset_lite.c
index fa3b46083300b074319c51a107d6616575fee2ba..0beccda76b38d4b72796b60d8489d088724d18c2 100644 (file)
--- a/modules/experimental/mod_charset_lite.c
+++ b/modules/experimental/mod_charset_lite.c
@@ -79,25 +79,15 @@
 #include "util_filter.h"
 #include "apr_strings.h"
 #include "apr_lib.h"
+#include "apr_xlate.h"
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
-#ifndef APACHE_XLATE
-#error mod_charset_lite cannot work without APACHE_XLATE enabled
-#endif
-
 #define OUTPUT_XLATE_BUF_SIZE (16*1024) /* size of translation buffer used on output */
 #define INPUT_XLATE_BUF_SIZE  (8*1024)  /* size of translation buffer used on input */
 
-/* XXX this works around an issue with the heap bucket: apr_bucket_heap_create will 
- *     copy only the first 4096 bytes
- * XXX: this comment is just plain wrong, or at least it is now. --jcw 11/01
- */
-#undef INPUT_XLATE_BUF_SIZE         /* XXX */
-#define INPUT_XLATE_BUF_SIZE (4096) /* XXX must match DEFAULT_BUCKET_SIZE */
-
 #define XLATE_MIN_BUFF_LEFT 128  /* flush once there is no more than this much
-                                  * space is left in the translation buffer 
+                                  * space left in the translation buffer 
                                   */
 
 #define FATTEST_CHAR  8          /* we don't handle chars wider than this that straddle 
@@ -144,7 +134,7 @@ typedef struct charset_filter_ctx_t {
     int ran;                /* has filter instance run before? */
     int noop;               /* should we pass brigades through unchanged? */
     char *tmp;              /* buffer for input filtering */
-    apr_bucket_brigade *bb;  /* input buckets we couldn't finish translating */
+    apr_bucket_brigade *bb; /* input buckets we couldn't finish translating */
 } charset_filter_ctx_t;
 
 /* charset_req_t is available via r->request_config if any translation is