From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 5 Jul 2018 19:27:26 +0000 (+0000)
Subject: Backported in r1835175.
X-Git-Tag: 2.4.34~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=815874b971c52d00fe6608f92847014492f0f7c9;p=thirdparty%2Fapache%2Fhttpd.git

Backported in r1835175.

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

diff --git a/STATUS b/STATUS
index 013f99bed3d..276855f4184 100644
--- a/STATUS
+++ b/STATUS
@@ -124,12 +124,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) reset global ap_server_conf when pconf is cleared (it may be seen by 
-     EXEC_ON_READ directives)
-     trunk patch: http://svn.apache.org/r1835094
-     2.4.x patch: svn merge -c 1835094 ^/httpd/httpd/trunk .
-     +1: covener, rpluem, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]