aboutsummaryrefslogtreecommitdiffstats
path: root/main/apache2/optionsbleed.patch
blob: be0afee60a794105c50237c2a06fcee48faae4f6 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
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));
         }