sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add backport of patch for CVE-2017-9798

Browse source 
- Bump PORTREVISION

Approved by:	ports-secteam (with hat)
Security:	76b085e2-9d33-11e7-9260-000c292ee6b8
This commit is contained in:
Ryan Steinmetz 2017-09-19 12:29:33 +00:00
parent f9494a7971
commit 01496d0ac1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=450118
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www/apache22/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= apache22 PORTNAME= apache22
PORTVERSION= 2.2.34 PORTVERSION= 2.2.34
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES= www ipv6 CATEGORIES= www ipv6
MASTER_SITES= APACHE_HTTPD MASTER_SITES= APACHE_HTTPD
DISTNAME= httpd-${PORTVERSION} DISTNAME= httpd-${PORTVERSION}

21
www/apache22/files/patch-CVE-2017-9798 Normal file
View file

@ -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);
}