Changes 2.2.17:

* prefork MPM: Run cleanups for final request when process exits gracefully
  to work around a flaw in apr-util.
* mod_reqtimeout: Do not wrongly enforce timeouts for mod_proxy's backend
  connections and other protocol handlers (like mod_ftp). Enforce the
  timeout for AP_MODE_GETLINE. If there is a timeout, shorten the lingering
  close time from 30 to 2 seconds.
* Proxy balancer: support setting error status according to HTTP response
  code from a backend.
* mod_authnz_ldap: If AuthLDAPCharsetConfig is set, also convert the
  password to UTF-8.
* core: check symlink ownership if both FollowSymlinks and
  SymlinksIfOwnerMatch are set
* core: fix origin checking in SymlinksIfOwnerMatch
* mod_headers: Enable multi-match-and-replace edit option
* mod_log_config: Make ${cookie}C correctly match whole cookie names
  instead of substrings.
* mod_dir, mod_negotiation: Pass the output filter information
  to newly created sub requests; as these are later on used
  as true requests with an internal redirect. This allows for
  mod_cache et.al. to trap the results of the redirect.
* rotatelogs: Fix possible buffer overflow if admin configures a
  mongo log file path.
* mod_ssl: Do not do overlapping memcpy.
* vhost: A purely-numeric Host: header should not be treated as a port.
* core: (re)-introduce -T commandline option to suppress documentroot
  check at startup.

4 files changed, 37 insertions, 37 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 28314a391eb..134b8ec3093 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2010/07/26 21:38:51 tron Exp $
+# $NetBSD: Makefile,v 1.62 2010/11/01 17:28:49 adam Exp $
 
-DISTNAME=	httpd-2.2.16
+DISTNAME=	httpd-2.2.17
 PKGNAME=	${DISTNAME:S/httpd/apache/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
@@ -26,9 +26,9 @@ CONFIGURE_ARGS+=	--with-port=80
 CONFIGURE_ARGS+=	--enable-so
 CONFIGURE_ENV+=		perlbin=${PERL5:Q}
 CONFIGURE_ENV+=		ac_cv_path_RSYNC=/nonexistent
-CONFIGURE_ARGS+=       CFLAGS=${APACHE_CUSTOM_CFLAGS:Q}
+CONFIGURE_ARGS+=	CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
 
-BUILD_DEFS+=           APACHE_CUSTOM_CFLAGS
+BUILD_DEFS+=		APACHE_CUSTOM_CFLAGS
 
 # Apache Portable Runtime library configure options
 CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
@@ -114,7 +114,7 @@ RCD_SCRIPTS=		apache
 
 REQD_DIRS=		${PREFIX}/share/httpd
 REQD_DIRS+=		${PREFIX}/share/httpd/htdocs
-OWN_DIRS= 		${VARBASE}/log/httpd
+OWN_DIRS=		${VARBASE}/log/httpd
 OWN_DIRS+=		${VARBASE}/db/httpd
 OWN_DIRS_PERMS+=	${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
 FIX_PERMS=		apachectl apxs dbmmanage envvars-std mkcert
@@ -186,24 +186,24 @@ AP_CFG_ARGS.deflate=	--with-z=${BUILDLINK_PREFIX.zlib}
 
 #.if ${APACHE_MODULES} == "all-shared"
 .if !empty(PKG_OPTIONS:Mapache-shared-modules)
-.include "${AP_DEPENDS.ssl}"
-.include "${AP_DEPENDS.deflate}"
+.  include "${AP_DEPENDS.ssl}"
+.  include "${AP_DEPENDS.deflate}"
 CONFIGURE_ARGS+=	${AP_CFG_ARGS.ssl} ${AP_CFG_ARGS.deflate}
 .else
-.for ap_mod in ${APACHE_MODULES}
-.  if defined(AP_DEPENDS.${ap_mod}) && !empty(AP_DEPENDS.${ap_mod})
-.    for ap_depend in ${AP_DEPENDS.${ap_mod}}
-.      if exists(${ap_depend})
-.        include "${ap_depend}"
-.      else
+.  for ap_mod in ${APACHE_MODULES}
+.    if defined(AP_DEPENDS.${ap_mod}) && !empty(AP_DEPENDS.${ap_mod})
+.      for ap_depend in ${AP_DEPENDS.${ap_mod}}
+.        if exists(${ap_depend})
+.          include "${ap_depend}"
+.        else
 DEPENDS+=		${ap_depend}
-.      endif
-.    endfor
-.  endif
-.  if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod})
+.        endif
+.      endfor
+.    endif
+.    if defined(AP_CFG_ARGS.${ap_mod}) && !empty(AP_CFG_ARGS.${ap_mod})
 CONFIGURE_ARGS+=	${AP_CFG_ARGS.${ap_mod}}
-.  endif
-.endfor
+.    endif
+.  endfor
 .endif
 
 post-extract:
diff --git a/www/apache22/buildlink3.mk b/www/apache22/buildlink3.mk
index 1e30f575087..e1df2aecbe2 100644
--- a/www/apache22/buildlink3.mk
+++ b/www/apache22/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/01/17 12:02:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/11/01 17:28:49 adam Exp $
 
 BUILDLINK_TREE+=	apache
 
@@ -9,16 +9,16 @@ BUILDLINK_API_DEPENDS.apache+=	apache>=2.2.3
 BUILDLINK_ABI_DEPENDS.apache?=	apache>=2.2.14nb1
 BUILDLINK_PKGSRCDIR.apache?=	../../www/apache22
 BUILDLINK_DEPMETHOD.apache?=	build
-.  if defined(APACHE_MODULE)
+.if defined(APACHE_MODULE)
 BUILDLINK_DEPMETHOD.apache+=	full
-.  endif
+.endif
 USE_TOOLS+=	perl			# for "apxs"
 CONFIGURE_ENV+=	APR_LIBTOOL=${LIBTOOL:Q}	# make apxs use the libtool we specify
 MAKE_ENV+=	APR_LIBTOOL=${LIBTOOL:Q}
 APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
-.  if defined(GNU_CONFIGURE)
+.if defined(GNU_CONFIGURE)
 CONFIGURE_ARGS+=	--with-apxs2=${APXS:Q}
-.  endif
+.endif
 
 .include "../../devel/apr/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index e7cac1c6dd3..62c7b974279 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2010/07/26 21:38:51 tron Exp $
+$NetBSD: distinfo,v 1.35 2010/11/01 17:28:49 adam Exp $
 
-SHA1 (httpd-2.2.16.tar.bz2) = ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9
-RMD160 (httpd-2.2.16.tar.bz2) = 2e6d7d1dae40905be7fdd793140f62cf58112095
-Size (httpd-2.2.16.tar.bz2) = 4775545 bytes
+SHA1 (httpd-2.2.17.tar.bz2) = 5c9b44620dee449a86ba1bcba1715033c2c26b08
+RMD160 (httpd-2.2.17.tar.bz2) = 4a2f16f2891094d4176565fadf0e8fcadf7dbaff
+Size (httpd-2.2.17.tar.bz2) = 4951247 bytes
 SHA1 (patch-aa) = e0bfdf6bc9cb034bea46a390a12a5508e363c9a7
 SHA1 (patch-ab) = 365cc3b0ac2d9d68ccb94f5699fe168a1c9b0150
 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad
diff --git a/www/apache22/options.mk b/www/apache22/options.mk
index b2255c600fe..0a6a85af68c 100644
--- a/www/apache22/options.mk
+++ b/www/apache22/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2010/05/03 20:10:33 tron Exp $
+# $NetBSD: options.mk,v 1.9 2010/11/01 17:28:49 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.apache
 PKG_OPTIONS_REQUIRED_GROUPS=	mpm
@@ -34,12 +34,12 @@ CONFIGURE_ARGS+=	--with-mpm=prefork
 #
 PLIST_VARS+=		all-shared
 .if !empty(PKG_OPTIONS:Mapache-shared-modules)
-CONFIGURE_ARGS+=        --enable-mods-shared=${DFLT_APACHE_MODULES:Q}
+CONFIGURE_ARGS+=	--enable-mods-shared=${DFLT_APACHE_MODULES:Q}
 PLIST.all-shared=	yes
 .else
-CONFIGURE_ARGS+=        --enable-modules=${APACHE_MODULES:Q}
+CONFIGURE_ARGS+=	--enable-modules=${APACHE_MODULES:Q}
 .endif
-BUILD_DEFS+=            APACHE_MODULES
+BUILD_DEFS+=		APACHE_MODULES
 
 PLIST_VARS+=		suexec
 .if !empty(PKG_OPTIONS:Msuexec)
@@ -54,15 +54,15 @@ APACHE_SUEXEC_CONFIGURE_ARGS+=						\
 	--with-suexec-caller=${APACHE_USER}				\
 	--with-suexec-safepath='${APACHE_SUEXEC_PATH:Q}'		\
 	--with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q}		\
-	--with-suexec-logfile=${APACHE_SUEXEC_LOGFILE:Q}
+	--with-suexec-logfile=${APACHE_SUEXEC_LOGFILE}
 
 .  if !empty(PKG_OPTIONS:Mapache-shared-modules)
-CONFIGURE_ARGS+=        --enable-modules="all suexec"
+CONFIGURE_ARGS+=	--enable-modules="all suexec"
 .  else
-APACHE_MODULES+=        suexec
+APACHE_MODULES+=	suexec
 .  endif
-CONFIGURE_ARGS+=        ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
-BUILD_DEFS+=            APACHE_SUEXEC_CONFIGURE_ARGS
+CONFIGURE_ARGS+=	${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
+BUILD_DEFS+=		APACHE_SUEXEC_CONFIGURE_ARGS
 BUILD_TARGET=		all suexec
 PLIST.suexec=		yes
 SPECIAL_PERMS+=		sbin/suexec ${REAL_ROOT_USER} ${APACHE_GROUP} 4510