aboutsummaryrefslogtreecommitdiff
path: root/www/apache22
diff options
context:
space:
mode:
authorPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-05-20 21:43:47 +0000
committerPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-05-20 21:43:47 +0000
commit99d3f4c2b05037965fe35e67206415e7b3475e02 (patch)
treeb4da5158fcb1dc7f1c295df091f762c890e92b59 /www/apache22
parent8d0e7873c77bf3dfee03aa518cb5791308b358a6 (diff)
downloadports-99d3f4c2b05037965fe35e67206415e7b3475e02.tar.gz
ports-99d3f4c2b05037965fe35e67206415e7b3475e02.zip
- Enable,build, and install mod_reqtimeout.so which mitigates solaris attacks.
- Default on, so bump PORTREVISION Reuested by: Jonas Eckerman <jonas@fsdb.org> (via apache@) With Hat: apache@
Notes
Notes: svn path=/head/; revision=254676
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/Makefile2
-rw-r--r--www/apache22/Makefile.modules2
-rw-r--r--www/apache22/Makefile.options1
-rw-r--r--www/apache22/pkg-plist1
4 files changed, 4 insertions, 2 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 68684ae4bf14..61dde1246cc0 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -9,7 +9,7 @@
PORTNAME= apache
PORTVERSION= 2.2.15
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= httpd-${PORTVERSION}
diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index 91aa6ff92ab0..52b9d857d331 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -30,7 +30,7 @@ MISC_MODULES+= actions alias asis autoindex cern_meta \
cgi charset_lite dbd deflate dir dumpio env expires \
headers imagemap include info log_config logio mime \
mime_magic negotiation rewrite setenvif speling status \
- unique_id userdir usertrack vhost_alias filter version
+ unique_id userdir usertrack vhost_alias filter version reqtimeout
PROXY_MODULES= proxy proxy_connect proxy_ftp proxy_http proxy_ajp proxy_balancer proxy_scgi
SSL_MODULES= ssl
SUEXEC_MODULES= suexec
diff --git a/www/apache22/Makefile.options b/www/apache22/Makefile.options
index 126639370908..779a34bcc501 100644
--- a/www/apache22/Makefile.options
+++ b/www/apache22/Makefile.options
@@ -73,5 +73,6 @@ OPTIONS+= \
SSL "Enable mod_ssl" ON \
SUEXEC "Enable mod_suexec" OFF \
SUEXEC_RSRCLIMIT "SuEXEC rlimits based on login class" OFF \
+ REQTIMEOUT "Enable mod_reqtimeout" ON \
CGID "Enable mod_cgid" OFF \
diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist
index eb888a431fd9..54b329c452ee 100644
--- a/www/apache22/pkg-plist
+++ b/www/apache22/pkg-plist
@@ -159,6 +159,7 @@ libexec/apache22/httpd.exp
%%MOD_PROXY_HTTP%%libexec/apache22/mod_proxy_http.so
%%MOD_PROXY_SCGI%%libexec/apache22/mod_proxy_scgi.so
%%MOD_REWRITE%%libexec/apache22/mod_rewrite.so
+%%MOD_REQTIMEOUT%%libexec/apache22/mod_reqtimeout.so
%%MOD_SETENVIF%%libexec/apache22/mod_setenvif.so
%%MOD_SPELING%%libexec/apache22/mod_speling.so
%%MOD_SSL%%libexec/apache22/mod_ssl.so