Commit 8fef8a0b authored by Ryan Bloom's avatar Ryan Bloom
Browse files

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
parent 71e040e8

CHANGES

+3 −0
Original line number Diff line number Diff line 
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>]

include/httpd.h

+1 −1
Original line number Diff line number Diff line
@@ -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

modules/generators/mod_autoindex.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

modules/test/mod_autoindex.c

+2 −2
Original line number Diff line number Diff line
@@ -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));