From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 19 Aug 2017 07:17:10 +0000 (+0000)
Subject: Propose
X-Git-Tag: 2.4.28~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8283ecd7d80a5ef2ced84d16d0e4885392779432;p=thirdparty%2Fapache%2Fhttpd.git

Propose

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

diff --git a/STATUS b/STATUS
index ab805d2913d..c9578b435cc 100644
--- a/STATUS
+++ b/STATUS
@@ -235,7 +235,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1805206 (partial)
      2.4.x patch: http://home.apache.org/~jim/patches/httpd-2.4-loadfactor.patch
      +1: jim
-   
+
+  *) core: Follow up to r1739201.
+           These APR_TIMEUP special cases are now handled by ap_map_http_request_error().
+           (r1739201 has been backported in the 2.4 branch in r1768079)
+     trunk patch: http://svn.apache.org/r1766998
+     2.4.x patch: svn merge -c 1766998 ^/httpd/httpd/trunk .
+     +1: jailletc36
+
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]