]> granicus.if.org Git - apache/commitdiff
lost backport of log entry improvement
authorEric Covener <covener@apache.org>
Fri, 4 Aug 2017 01:23:59 +0000 (01:23 +0000)
committerEric Covener <covener@apache.org>
Fri, 4 Aug 2017 01:23:59 +0000 (01:23 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1804066 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index b5d64cb589945e663d9b12d7d0b2caae35d85b47..c80119c33f52d9d9533c605e9a107d96e032351d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -210,7 +210,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: https://svn.apache.org/r1729235
                   https://svn.apache.org/r1730079
                   https://svn.apache.org/r1801665
-     2.4.x patch: svn merge -c1729235 -c1730079 -c1801665 ^/httpd/httpd/trunk
+     2.4.x patch: svn merge -c1729235 -c1730079 -c1801665 ^/httpd/httpd/trunk .
      +1: jchampion
 
   *) core: ap_server_config_defines and ap_server_{pre,post}_read_config
@@ -236,6 +236,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-libressl.patch
      +1: ylavic
 
+  *) mod_proxy: Name the scheme in the error message when the 
+     mod_proxy_foo submodule is missing.
+     trunk patch: http://svn.apache.org/r1745039 
+     2.4.x patch svn merge -c 1745039 ^/httpd/httpd/trunk .
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]