merge this from 2.1-dev:

     logresolve: Allow size of log line buffer to be overridden at
     build time (MAXLINE).

PR:          27793
Reviewed by: stoddard, nd

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

diff --git a/CHANGES b/CHANGES
index f092c70d3cbe9103bef20c9901955813ba3d48ad..a62bf11594d95b8fed9d43c5bcd5f6ef6a848620 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.50
 
+  *) logresolve: Allow size of log line buffer to be overridden at
+     build time (MAXLINE).  PR 27793.  [Jeff Trawick]
+
   *) Fix the comment delimiter in htdbm so that it correctly parses the 
      username comment.  Also add a terminate function to allow NetWare 
      to pause the output before the screen is destroyed.

diff --git a/STATUS b/STATUS
index 2356a30705c0dfc856666a319effc4892f676fd7..aef2fff53f5731f56b73a60e619c5c2f5324af83 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/30 20:53:05 $]
+Last modified at [$Date: 2004/03/30 21:07:10 $]
 
 Release:
 
@@ -290,11 +290,6 @@ PATCHES TO BACKPORT FROM 2.1
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/arch/win32/mod_isapi.c?r1=1.98&r2=1.99
       +1: trawick, stoddard
 
-    * logresolve: Allow size of log line buffer to be overridden at
-      build time (MAXLINE).  PR 27793.
-      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/support/logresolve.c?r1=1.22&r2=1.23
-      +1: trawick, stoddard, nd
-
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,

diff --git a/support/logresolve.c b/support/logresolve.c
index b1e79dfa8d34d8550cebc0ea718c3e820bdab892..dd77dd1358e314a4f50864a6f2e4c04eb466c76a 100644 (file)
--- a/support/logresolve.c
+++ b/support/logresolve.c
@@ -90,7 +90,9 @@ static void stats(FILE *output);
 
 
 /* maximum line length */
+#ifndef MAXLINE
 #define MAXLINE 1024
+#endif
 
 /* maximum length of a domain name */
 #ifndef MAXDNAME