MFH: r450118

- Add backport of patch for CVE-2017-9798
- Bump PORTREVISION

Approved by:	ports-secteam (with hat)
Security:	76b085e2-9d33-11e7-9260-000c292ee6b8

1 files changed, 21 insertions, 0 deletions

diff --git a/www/apache22/files/patch-CVE-2017-9798 b/www/apache22/files/patch-CVE-2017-9798
new file mode 100644
index 000000000000..c2f9198e8acf
--- /dev/null
+++ b/www/apache22/files/patch-CVE-2017-9798
@@ -0,0 +1,21 @@
+CVE-2017-9798
+
+Backport from https://svn.apache.org/viewvc?view=revision&revision=1807655
+
+diff --git a/server/core.c b/server/core.c
+index f61699e..d24542e 100644
+--- server/core.c
++++ server/core.c
+@@ -1809,6 +1809,12 @@ AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd,
+             /* method has not been registered yet, but resorce restriction
+              * is always checked before method handling, so register it.
+              */
++            if (cmd->pool == cmd->temp_pool) {
++                /* In .htaccess, we can't globally register new methods. */
++                return apr_psprintf(cmd->pool, "Could not register method '%s' "
++                                   "for %s from .htaccess configuration",
++                                    method, cmd->cmd->name);
++            }
+             methnum = ap_method_register(cmd->pool, method);
+         }
+