From: Stefan Fritsch <sf@apache.org>
Date: Tue, 29 Mar 2011 21:38:03 +0000 (+0000)
Subject: Add CHANGES entry for r1086756 / ap_cfg_* change
X-Git-Tag: 2.3.12~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d49ccfd7449009453ddf9b3626f53451eb5a80a3;p=thirdparty%2Fapache%2Fhttpd.git

Add CHANGES entry for r1086756 / ap_cfg_* change
Update docs for ap_cfg_getc


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

diff --git a/CHANGES b/CHANGES
index 69603720637..17256797ebb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.3.12
 
+  *) core: Change the APIs of ap_cfg_getline() and ap_cfg_getc() to return an
+     error code. Abort with a nice error message if a config line is too long.
+     Partial fix for PR 50824. [Stefan Fritsch]
+
   *) mod_info: Dump config to stdout during startup if -DDUMP_CONFIG is
      specified. [Stefan Fritsch]
 
diff --git a/include/http_config.h b/include/http_config.h
index 52a407d5f3f..12797d5455d 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -786,8 +786,9 @@ AP_DECLARE(apr_status_t) ap_cfg_getline(char *buf, size_t bufsize, ap_configfile
 
 /**
  * Read one char from open configfile_t, increase line number upon LF 
+ * @param ch place to store the char read
  * @param cfp The file to read from
- * @return the character read
+ * @return error status
  */
 AP_DECLARE(apr_status_t) ap_cfg_getc(char *ch, ap_configfile_t *cfp);