Backported in r1834093.

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

diff --git a/CHANGES b/CHANGES
index 948bb81ef1a1fcd8a4f44474dba4e61b0a7b43b2..a1dc7c18f21a3bdaa447d6c2984b5b7557d43935 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,7 @@ Changes with Apache 2.4.34
 
   *) mod_proxy_http: Add new worker parameter 'responsefieldsize' to
      allow maximum HTTP response header size to be increased past 8192 
-     bytes.  PR62199.  [Hank Ibell <hwibell gmail.com>]
+     bytes.  PR 62199.  [Hank Ibell <hwibell gmail.com>]
 
   *) mod_ssl: Extend SSLOCSPEnable with mode 'leaf' that only checks the leaf
      of a certificate chain.  PR62112.

diff --git a/STATUS b/STATUS
index 2a1a71c16fcdc73726829208b068016dc6473682..619193fd3de63c2907dd749acec651a560b91c93 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -148,20 +148,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                   svn merge -c 1833827 ^/httpd/httpd/trunk . 
      +1: covener, jim, rjung
 
-  *) ap_rgetline()+mod_proxy_http: Add and handle AP_GETLINE_NOSPC_EOL flag,
-     fixes responses header thrown away on APR_ENOSPC, and allow their size to
-     be configured (ResponseFieldSize). PRs 62196, 62198 and 62199.
-     trunk patch: http://svn.apache.org/r1827362
-                  http://svn.apache.org/r1828926
-                  http://svn.apache.org/r1828927
-                  http://svn.apache.org/r1829557
-                  http://svn.apache.org/r1829573
-                  http://svn.apache.org/r1829645
-                  http://svn.apache.org/r1829657
-     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-PR62196+62198+62199-v3.patch
-                  (convenient patch, otherwise trunk works modulo CHANGES/MMN)
-     +1: ylavic, covener (needs responsefieldsize compat after), rpluem
-
   *) mod_xml2enc: Fix forwarding of error metadata/responses. PR 62180.
      trunk patch: http://svn.apache.org/r1829038
                   http://svn.apache.org/r1829039