From: Ryan Bloom <rbb@apache.org>
Date: Fri, 23 Feb 2001 00:50:24 +0000 (+0000)
Subject: Namespace protect IOBUFSIZ since it is a public symbol.
X-Git-Tag: 2.0.12~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=192cc6b8a5c87161c14112496e49d1a19b057584;p=thirdparty%2Fapache%2Fhttpd.git

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 8a1ef98d43a..003d6547a4c 100644
--- 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 5de2b1ed9a0..0a1f8f6b869 100644
--- 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 600ade804ae..8491a376268 100644
--- 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 bc0be1ea140..fe601e814d9 100644
--- 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));