Namespace protect IOBUFSIZ since it is a public symbol.

Submitted by:	Jon Travis <jtravis@covalent.net>

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

diff --git a/CHANGES b/CHANGES
index 8a1ef98d43a0f2c079b3bf59783ec02b2103647b..003d6547a4c03689217d4793d75b6406fca67393 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.12-dev
 
+  *) Namespace protect IOBUFSIZ since it is exposed in the API.
+     [Jon Travis <jtravis@covalent.net>]
+
   *) Use "Basic" authentication instead of "basic" in ab, as the spec
      says we should.  [Andre Breiler <andre.breiler@rd.bbc.co.uk>]
 

diff --git a/include/httpd.h b/include/httpd.h
index 5de2b1ed9a0e8452b8550b9e6d0486bfea7c0133..0a1f8f6b869475d640b3cf715693139ea7af3d1f 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -288,7 +288,7 @@ extern "C" {
 #define HUGE_STRING_LEN 8192
 
 /* The size of the server's internal read-write buffers */
-#define IOBUFSIZE 8192
+#define AP_IOBUFSIZE 8192
 
 /*
  * Special Apache error codes. These are basically used

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 600ade804aeb5b4da2e395785198e0c604209b08..8491a3762689e531f39b1a058de5f46f6452bdd9 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -911,7 +911,7 @@ static int ignore_entry(autoindex_config_rec *d, char *path)
  */
 static void do_emit_plain(request_rec *r, apr_file_t *f)
 {
-    char buf[IOBUFSIZE + 1];
+    char buf[AP_IOBUFSIZE + 1];
     int i, c, ch;
     apr_size_t n;
     apr_status_t stat;
@@ -919,7 +919,7 @@ static void do_emit_plain(request_rec *r, apr_file_t *f)
     ap_rputs("<PRE>\n", r);
     while (!apr_file_eof(f)) {
        do {
-            n = sizeof(char) * IOBUFSIZE;
+            n = sizeof(char) * AP_IOBUFSIZE;
            stat = apr_file_read(f, buf, &n);
        }
        while (stat != APR_SUCCESS && APR_STATUS_IS_EINTR(stat));

diff --git a/modules/test/mod_autoindex.c b/modules/test/mod_autoindex.c
index bc0be1ea140f742867acb3bb436e22437494eceb..fe601e814d92daf643120012c4f5b45d3f70c32c 100644 (file)
--- a/modules/test/mod_autoindex.c
+++ b/modules/test/mod_autoindex.c
@@ -910,7 +910,7 @@ static int ignore_entry(autoindex_config_rec *d, char *path)
  */
 static void do_emit_plain(request_rec *r, apr_file_t *f)
 {
-    char buf[IOBUFSIZE + 1];
+    char buf[AP_IOBUFSIZE + 1];
     int i, c, ch;
     apr_size_t n;
     apr_status_t stat;
@@ -918,7 +918,7 @@ static void do_emit_plain(request_rec *r, apr_file_t *f)
     ap_rputs("<PRE>\n", r);
     while (!apr_file_eof(f)) {
        do {
-            n = sizeof(char) * IOBUFSIZE;
+            n = sizeof(char) * AP_IOBUFSIZE;
            stat = apr_file_read(f, buf, &n);
        }
        while (stat != APR_SUCCESS && APR_STATUS_IS_EINTR(stat));