From: Eric Covener <covener@apache.org>
Date: Mon, 18 Mar 2019 12:04:26 +0000 (+0000)
Subject: svn merge -c 1855743,1855744 ^/httpd/httpd/trunk .
X-Git-Tag: 2.4.39~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf1f155c4887c55c0c1a8be913547c416dd0bbea;p=thirdparty%2Fapache%2Fhttpd.git

svn merge -c 1855743,1855744 ^/httpd/httpd/trunk .

r->parsed_uri.path safety in recent backport



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

diff --git a/STATUS b/STATUS
index ddecc95e1eb..77cdbff1633 100644
--- a/STATUS
+++ b/STATUS
@@ -146,11 +146,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jim, ylavic, covener
      jailletc36: require r1818321 and part of r1818341 to update doc accordingly
 
-  *) core: fix SEGFAULT in CONNECT with recent change
-     2.4.x: svn merge -c 1855743,1855744 ^/httpd/httpd/trunk .
-     +1: rpluem, icing, covener
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]