diff options
author | Olli Hauer <ohauer@FreeBSD.org> | 2013-07-10 19:01:44 +0000 |
---|---|---|
committer | Olli Hauer <ohauer@FreeBSD.org> | 2013-07-10 19:01:44 +0000 |
commit | 5183b406511b98ffef72263a3609234aaaa0d4fb (patch) | |
tree | 9ee2e8ef59faea9a7ba11b10c71836a5c9a5b07c /www/apache22 | |
parent | 38c98059bced2843c17709ff593579870404f7ed (diff) | |
download | ports-5183b406511b98ffef72263a3609234aaaa0d4fb.tar.gz ports-5183b406511b98ffef72263a3609234aaaa0d4fb.zip |
Notes
Diffstat (limited to 'www/apache22')
-rw-r--r-- | www/apache22/Makefile | 6 | ||||
-rw-r--r-- | www/apache22/Makefile.modules | 2 | ||||
-rw-r--r-- | www/apache22/distinfo | 4 | ||||
-rw-r--r-- | www/apache22/files/patch-modules__mappers__mod_rewrite.c | 27 |
4 files changed, 6 insertions, 33 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index b6997f0eded0..d62b9df334aa 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= apache22 -PORTVERSION= 2.2.24 -PORTREVISION?= 1 +PORTVERSION= 2.2.25 +#PORTREVISION?= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -98,7 +98,7 @@ IGNORE= suEXEC resource limit patch requires mod_suexec.\ .endif .if ${PORT_OPTIONS:MSUEXEC_USERDIR} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_userdir +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-suexec_userdir . if empty(PORT_OPTIONS:MSUEXEC) IGNORE= suEXEC UserDir patch requires mod_suexec.\ Please (re)run 'make config' and choose SUEXEC option also diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules index 69e04a7ad3a9..227cc482327a 100644 --- a/www/apache22/Makefile.modules +++ b/www/apache22/Makefile.modules @@ -72,7 +72,7 @@ LATEST_LINK= apache22-${WITH_MPM}-mpm .if ${WITH_MPM} == "worker" || ${WITH_MPM} == "event" PORT_OPTIONS+= CGID .if ${PORT_OPTIONS:MCGI} -IGNORE= When using a multi-threaded MPM, the module CGID should be used in place CGI. \ +IGNORE= When using a multi-threaded MPM, the module CGID should be used in place CGI. \ Please de-select CGI and select CGID instead. \ See http://httpd.apache.org/docs/2.2/mod/mod_cgi.html .endif diff --git a/www/apache22/distinfo b/www/apache22/distinfo index d9122d8a3189..a9c6d4ffbbc4 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,2 +1,2 @@ -SHA256 (apache22/httpd-2.2.24.tar.bz2) = 0453f5d2d7e3b1975a1c6a8a22b6d6ff768715a3b0a89b51e5f7b5851628fad7 -SIZE (apache22/httpd-2.2.24.tar.bz2) = 5490439 +SHA256 (apache22/httpd-2.2.25.tar.bz2) = 4bcaf3524796a514b31aa5c64ce80b0cdb484bab5735416de29d00f6d50fa65a +SIZE (apache22/httpd-2.2.25.tar.bz2) = 5524905 diff --git a/www/apache22/files/patch-modules__mappers__mod_rewrite.c b/www/apache22/files/patch-modules__mappers__mod_rewrite.c deleted file mode 100644 index 1c1790b36c55..000000000000 --- a/www/apache22/files/patch-modules__mappers__mod_rewrite.c +++ /dev/null @@ -1,27 +0,0 @@ ---- ./modules/mappers/mod_rewrite.c.orig 2013-02-18 22:31:42.000000000 +0100 -+++ ./modules/mappers/mod_rewrite.c 2013-05-14 16:41:30.000000000 +0200 -@@ -500,11 +500,11 @@ - - logline = apr_psprintf(r->pool, "%s %s %s %s [%s/sid#%pp][rid#%pp/%s%s%s] " - "(%d) %s%s%s%s" APR_EOL_STR, -- rhost ? rhost : "UNKNOWN-HOST", -- rname ? rname : "-", -- r->user ? (*r->user ? r->user : "\"\"") : "-", -+ rhost ? ap_escape_logitem(r->pool, rhost) : "UNKNOWN-HOST", -+ rname ? ap_escape_logitem(r->pool, rname) : "-", -+ r->user ? (*r->user ? ap_escape_logitem(r->pool, r->user) : "\"\"") : "-", - current_logtime(r), -- ap_get_server_name(r), -+ ap_escape_logitem(r->pool, ap_get_server_name(r)), - (void *)(r->server), - (void *)r, - r->main ? "subreq" : "initial", -@@ -514,7 +514,7 @@ - perdir ? "[perdir " : "", - perdir ? perdir : "", - perdir ? "] ": "", -- text); -+ ap_escape_logitem(r->pool, text)); - - nbytes = strlen(logline); - apr_file_write(conf->rewritelogfp, logline, &nbytes); |