From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 11 May 2015 09:01:45 +0000 (+0000)
Subject: Backport r819480 from trunk.
X-Git-Tag: 2.2.30~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7af5ba849fd0e45a2253e64f976c0e4b73eecd14;p=thirdparty%2Fapache%2Fhttpd.git

Backport r819480 from trunk.

* include/httpd.h: Fix comment implying that LimitRequestLine
  and LimitRequestFieldsize cannot raise limits -- no longer the
  case.

Committed By: jorton
Reviewed By: covener, ylavic, trawick


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

diff --git a/STATUS b/STATUS
index 9c853f76c33..2f5c4981cc6 100644
--- a/STATUS
+++ b/STATUS
@@ -101,12 +101,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * core: remove misleading/outdated httpd.h comment about LimitRequestLine
-     compile-time limits.
-     trunk patch: http://svn.apache.org/r819480
-     2.2.x patch: trunk works
-     +1 covener, ylavic, trawick
-
    * mod_reqtimeout: PR56729: mod_reqtimeout gets confused when it sees a read 
      via check_pipeline() just before a slow HTTP response completes.
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=r1621453
diff --git a/include/httpd.h b/include/httpd.h
index 5264184b820..963d4acda49 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -186,7 +186,7 @@ extern "C" {
  *
  * Internal buffer sizes are two bytes more than the DEFAULT_LIMIT_REQUEST_LINE
  * and DEFAULT_LIMIT_REQUEST_FIELDSIZE below, which explains the 8190.
- * These two limits can be lowered (but not raised) by the server config
+ * These two limits can be lowered or raised by the server config
  * directives LimitRequestLine and LimitRequestFieldsize, respectively.
  *
  * DEFAULT_LIMIT_REQUEST_FIELDS can be modified or disabled (set = 0) by