Skip to content
GitLab
  1. 16 Oct, 2017 2 commits
  3. 14 Oct, 2017 2 commits
    • Yann Ylavic's avatar
      Follow up to r1812193: really change MMN major. · 45fec95a
      Yann Ylavic authored 
      git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812197 13f79535-47bb-0310-9956-ffa450edef68
      45fec95a
    • Yann Ylavic's avatar
      Follow up to r1740928: including NOT_IN_PROXY in NOT_IN_DIR_LOC_FILE is both · 45529216
      Yann Ylavic authored 
      incomplete and not backportable, fix it by introducing NOT_IN_DIR_CONTEXT.

Per ap_check_cmd_context(), NOT_IN_DIR_LOC_FILE actually/really means "not in
any directory context", while the definition itself does not include all the
existing directory contexts (e.g. <Limit>, or <Proxy> before r1740928).

This is a bit of a misnomer, at least, so instead of (ab)using it by adding the
missing contexts (in an incompatible way), let's define NOT_IN_DIR_CONTEXT to
really exclude all directory context (i.e. NOT_IN_DIR_LOC_FILE + NOT_IN_LIMIT +
NOT_IN_PROXY) and use it wherever NOT_IN_DIR_LOC_FILE was used.

This is by itself a major MMN bump (modules not compiled with this commit and
having directives checked against NOT_IN_DIR_LOC_FILE won't be caught the same
way by NOT_IN_DIR_CONTEXT in the new ap_check_cmd_context() code), but with the
below change, 2.4.x should work as before:

-   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/trunk@1812193 13f79535-47bb-0310-9956-ffa450edef68
      45529216
  5. 13 Oct, 2017 1 commit
  7. 12 Oct, 2017 2 commits
  9. 11 Oct, 2017 3 commits
  11. 10 Oct, 2017 5 commits
  13. 09 Oct, 2017 4 commits
  15. 08 Oct, 2017 1 commit
  17. 06 Oct, 2017 1 commit
  19. 05 Oct, 2017 2 commits
  21. 04 Oct, 2017 6 commits
  23. 03 Oct, 2017 6 commits
  25. 02 Oct, 2017 5 commits