aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2005-12-15 00:16:59 +0800
committerache <ache@FreeBSD.org>2005-12-15 00:16:59 +0800
commit39365705fe0e9d4d9f749d447ecb455ae84ace43 (patch)
tree2f40cc05d892749b036e4660111697fcd2e386c4
parentf53d13ed4e8666b20077cfb8312b4880e3a4b3ed (diff)
downloadfreebsd-ports-gnome-39365705fe0e9d4d9f749d447ecb455ae84ace43.tar.gz
freebsd-ports-gnome-39365705fe0e9d4d9f749d447ecb455ae84ace43.tar.zst
freebsd-ports-gnome-39365705fe0e9d4d9f749d447ecb455ae84ace43.zip
CVE-2005-3352
-rw-r--r--www/apache13/Makefile2
-rw-r--r--www/apache13/files/patch-secfix-CAN-2005-335235
2 files changed, 36 insertions, 1 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index d86f1ec4dc30..1aaac5514e10 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= 1.3.34
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= apache_${PORTVERSION}
diff --git a/www/apache13/files/patch-secfix-CAN-2005-3352 b/www/apache13/files/patch-secfix-CAN-2005-3352
new file mode 100644
index 000000000000..8febc0e58935
--- /dev/null
+++ b/www/apache13/files/patch-secfix-CAN-2005-3352
@@ -0,0 +1,35 @@
+--- src/main/util.c (original)
++++ src/main/util.c Mon Dec 12 08:36:54 2005
+@@ -1722,6 +1722,8 @@
+ j += 3;
+ else if (s[i] == '&')
+ j += 4;
++ else if (s[i] == '"')
++ j += 5;
+
+ if (j == 0)
+ return ap_pstrndup(p, s, i);
+@@ -1739,6 +1741,10 @@
+ else if (s[i] == '&') {
+ memcpy(&x[j], "&amp;", 5);
+ j += 4;
++ }
++ else if (s[i] == '"') {
++ memcpy(&x[j], "&quot;", 6);
++ j += 5;
+ }
+ else
+ x[j] = s[i];
+
+--- src/modules/standard/mod_imap.c (original)
++++ src/modules/standard/mod_imap.c Mon Dec 12 08:36:54 2005
+@@ -328,7 +328,7 @@
+ if (!strcasecmp(value, "referer")) {
+ referer = ap_table_get(r->headers_in, "Referer");
+ if (referer && *referer) {
+- return ap_pstrdup(r->pool, referer);
++ return ap_escape_html(r->pool, referer);
+ }
+ else {
+ /* XXX: This used to do *value = '\0'; ... which is totally bogus
+