svn commit: r450120 - in branches/2017Q3/www/apache24: . files

[Ryan Steinmetz]

Author: zi
Date: Tue Sep 19 12:31:54 2017
New Revision: 450120
URL: https://svnweb.freebsd.org/changeset/ports/450120

Log:
  MFH: r450116
  
  - Add upstream commit for CVE-2017-9798
  - Bump PORTREVISION
  
  Security:	76b085e2-9d33-11e7-9260-000c292ee6b8
  
  Approved by:	ports-secteam (with hat)

Added:
  branches/2017Q3/www/apache24/files/patch-CVE-2017-9798
     - copied unchanged from r450116, head/www/apache24/files/patch-CVE-2017-9798
Modified:
  branches/2017Q3/www/apache24/Makefile
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/www/apache24/Makefile
==============================================================================
--- branches/2017Q3/www/apache24/Makefile	Tue Sep 19 12:30:39 2017	(r450119)
+++ branches/2017Q3/www/apache24/Makefile	Tue Sep 19 12:31:54 2017	(r450120)
@@ -2,6 +2,7 @@
 
 PORTNAME=	apache24
 PORTVERSION=	2.4.27
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	APACHE_HTTPD
 DISTNAME=	httpd-${PORTVERSION}

Copied: branches/2017Q3/www/apache24/files/patch-CVE-2017-9798 (from r450116, head/www/apache24/files/patch-CVE-2017-9798)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q3/www/apache24/files/patch-CVE-2017-9798	Tue Sep 19 12:31:54 2017	(r450120, copy of r450116, head/www/apache24/files/patch-CVE-2017-9798)
@@ -0,0 +1,15 @@
+--- server/core.c	2017/08/16 16:50:29	1805223
++++ 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));
+         }