summaryrefslogtreecommitdiff
path: root/www/apache22
diff options
context:
space:
mode:
authordarcy <darcy>2009-01-24 21:55:31 +0000
committerdarcy <darcy>2009-01-24 21:55:31 +0000
commitfc1e69ac364c9c198275ef6d4fc1bdc65165828a (patch)
tree9b45cd81b83f8747c78a4f992ec0337870aa570c /www/apache22
parent1163c0c9b8978e6192a1f77a90f22feef4b5af1a (diff)
downloadpkgsrc-fc1e69ac364c9c198275ef6d4fc1bdc65165828a.tar.gz
Patch mod_cgid to fix a known bug. Without this patch a CGI script will be
populated with an extra, empty argument. Full details can be found at https://issues.apache.org/bugzilla/show_bug.cgi?id=46380 Note, this fix has already been committed to the Apache trunk and will be in the next version so this patch can be removed then.
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/Makefile3
-rw-r--r--www/apache22/distinfo3
-rw-r--r--www/apache22/patches/patch-av13
3 files changed, 17 insertions, 2 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 607916cd001..593ff24d6fe 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2008/12/28 14:00:59 tron Exp $
+# $NetBSD: Makefile,v 1.37 2009/01/24 21:55:31 darcy Exp $
DISTNAME= httpd-2.2.11
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/httpd/apache/}
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
diff --git a/www/apache22/distinfo b/www/apache22/distinfo
index 4e71f3a0a96..2286fd0375e 100644
--- a/www/apache22/distinfo
+++ b/www/apache22/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2008/12/28 14:00:59 tron Exp $
+$NetBSD: distinfo,v 1.15 2009/01/24 21:55:31 darcy Exp $
SHA1 (httpd-2.2.11.tar.bz2) = 7af256d53b79342f82222bd7b86eedbd9ac21d9a
RMD160 (httpd-2.2.11.tar.bz2) = b2012af716a459f666e0e41eb04808bd0f7fc28d
@@ -14,3 +14,4 @@ SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08
SHA1 (patch-aq) = 27a0093fc75dcafc673abc25e9ebe80167f52ac1
SHA1 (patch-as) = 7880eae75b702563bff8bca833ca81fb3dc4444c
SHA1 (patch-au) = d4c623bb953ac45cb4c8d95fc1d3c2788452d9a1
+SHA1 (patch-av) = 812d3f84638e2e87d030407f64ee17ae1abe7193
diff --git a/www/apache22/patches/patch-av b/www/apache22/patches/patch-av
new file mode 100644
index 00000000000..ed74b8d6e15
--- /dev/null
+++ b/www/apache22/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2009/01/24 21:55:31 darcy Exp $
+
+--- modules/generators/mod_cgid.c.orig 2008-08-15 18:08:05.000000000 -0400
++++ /modules/generators/mod_cgid.c
+@@ -203,7 +203,7 @@ static char **create_argv(apr_pool_t *p,
+ char *w;
+ int idx = 0;
+
+- if (ap_strchr_c(args, '=')) {
++ if (!(*args) || ap_strchr_c(args, '=')) {
+ numwords = 0;
+ }
+ else {