diff options
| author | Daniel Isaksen <d@duniel.no> | 2017-09-20 17:42:53 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-09-21 05:04:20 +0000 |
| commit | 3e84f75e8679e0d11861df13004f450b79bd45ca (patch) | |
| tree | 3e8d776103f634b2f7096e0a67f39836dfb88831 /main/apache2/optionsbleed.patch | |
| parent | ff31abdf4482b0dbea0d01f3b77dac21a2a0d8e3 (diff) | |
| download | aports-3e84f75e8679e0d11861df13004f450b79bd45ca.tar.bz2 aports-3e84f75e8679e0d11861df13004f450b79bd45ca.tar.xz | |
main/apache2: fix CVE-2017-9798 aka Optionsbleed
Diffstat (limited to 'main/apache2/optionsbleed.patch')
| -rw-r--r-- | main/apache2/optionsbleed.patch | 15 |
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)); + } |