aboutsummaryrefslogtreecommitdiffstats
path: root/main/apache2/optionsbleed.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/apache2/optionsbleed.patch')
-rw-r--r--main/apache2/optionsbleed.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/main/apache2/optionsbleed.patch b/main/apache2/optionsbleed.patch
new file mode 100644
index 0000000000..be0afee60a
--- /dev/null
+++ b/main/apache2/optionsbleed.patch
@@ -0,0 +1,15 @@
+--- httpd-2.4.2//server/core.c 2017/08/16 16:50:29 1805223
++++ httpd-2.4.2//server/core.c 2017/09/08 13:13:11 1807754
+@@ -2266,6 +2266,12 @@
+ /* method has not been registered yet, but resource 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,
+ apr_pstrdup(cmd->pool, method));
+ }