httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1813026 [1/2] - in /httpd/httpd: branches/2.4.x/STATUS patches/2.4.x/httpd-2.4.x-r1740928_and_co-v5.patch
Date Mon, 23 Oct 2017 14:58:44 GMT
Author: ylavic
Date: Mon Oct 23 14:58:44 2017
New Revision: 1813026

URL: http://svn.apache.org/viewvc?rev=1813026&view=rev
Log:
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);
+        }
+        ...
+    }


Added:
    httpd/httpd/patches/2.4.x/httpd-2.4.x-r1740928_and_co-v5.patch
Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1813026&r1=1813025&r2=1813026&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct 23 14:58:44 2017
@@ -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.



Mime
View raw message