Return-Path: <trawick@apache.org>
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 18155 invoked by uid 500); 24 Aug 2001 13:20:21 -0000
Delivered-To: apmail-httpd-2.0-cvs@apache.org
Received: (qmail 18152 invoked from network); 24 Aug 2001 13:20:21 -0000
Received: from h32.sny.collab.net (HELO icarus.apache.org) (64.208.42.42)
  by h31.sny.collab.net with SMTP; 24 Aug 2001 13:20:21 -0000
Received: (qmail 39085 invoked by uid 1121); 24 Aug 2001 13:14:20 -0000
Date: 24 Aug 2001 13:14:20 -0000
Message-ID: <20010824131420.39084.qmail@icarus.apache.org>
From: trawick@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/mappers mod_negotiation.c
X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N
Status: O
X-Status: 
X-Keywords: 
X-UID: 491

trawick     01/08/24 06:14:20

  Modified:    modules/mappers mod_negotiation.c
  Log:
  APR returns APR_EOF, not EOF...
  
  Revision  Changes    Path
  1.78      +2 -3      httpd-2.0/modules/mappers/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_negotiation.c,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- mod_negotiation.c	2001/08/24 11:35:58	1.77
  +++ mod_negotiation.c	2001/08/24 13:14:19	1.78
  @@ -68,7 +68,6 @@
   #include "apr_file_io.h"
   #include "apr_lib.h"
   
  -#define APR_WANT_STDIO          /* for EOF */
   #define APR_WANT_STRFUNC
   #include "apr_want.h"
   
  @@ -729,7 +728,7 @@
       while (apr_file_getc(&c, map) != APR_EOF) {
           if (c == '#') {
               /* Comment line */
  -            while (apr_file_getc(&c, map) != EOF && c != '\n') {
  +            while (apr_file_getc(&c, map) != APR_EOF && c != '\n') {
                   continue;
               }
           }
  @@ -752,7 +751,7 @@
   
               /* Continuation */
   
  -            while (cp < buf_end - 2 && (apr_file_getc(&c, map)) != EOF && c != '\n') {
  +            while (cp < buf_end - 2 && (apr_file_getc(&c, map)) != APR_EOF && c != '\n') {
                   *cp++ = c;
               }