]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
svn merge -c 1855743,1855744 ^/httpd/httpd/trunk .
authorEric Covener <covener@apache.org>
Mon, 18 Mar 2019 12:04:26 +0000 (12:04 +0000)
committerEric Covener <covener@apache.org>
Mon, 18 Mar 2019 12:04:26 +0000 (12:04 +0000)
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

STATUS

diff --git a/STATUS b/STATUS
index ddecc95e1ebb9e4cd4da18ab5365d638c0eccc0d..77cdbff1633555618a474156a47dca72ad16a2c1 100644 (file)
--- 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 ]