From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 23 Oct 2017 14:58:44 +0000 (+0000)
Subject: Update to v5, v4 missed this backport change needed for 2.4.x only (see commit messag... 
X-Git-Tag: 2.4.30~293
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34c088394c53eed851ed508e71cbc36b676c56f3;p=apache

Update to v5, v4 missed this backport change needed for 2.4.x only (see commit message of r1812193)

+-   if ((forbidden & NOT_IN_DIR_CONTEXT) == NOT_IN_DIR_CONTEXT) {
++   if ((forbidden & NOT_IN_DIR_LOC_FILE) == NOT_IN_DIR_LOC_FILE) {
+        if (cmd->path != NULL) {
+            return apr_pstrcat(cmd->pool, cmd->cmd->name, gt,
+-                           " cannot occur within directory context", NULL);
++                           " cannot occur within <Directory/Location/Files/Proxy> "
++                           "section", NULL);
+        }
+        ...
+    }



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

diff --git a/STATUS b/STATUS
index b184040460..05cc873485 100644
--- a/STATUS
+++ b/STATUS
@@ -134,7 +134,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1756976
                   http://svn.apache.org/r1781313
                   http://svn.apache.org/r1812193
-     2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-r1740928_and_co-v4.patch
+     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4.x-r1740928_and_co-v5.patch
      +1: ylavic,
       wrowe: Suspect that this is an MMN Major bump, not minor, without some
              additional detection/workaround of legacy 2.4 compiled modules.