Update to 1.3.37+30.23. This version has mod_rewrite buffer overflow fixed.

This commit is contained in:
Lev A. Serebryakov 2006-11-01 12:26:21 +00:00
parent 94fcf3eb1d
commit 2e04ad7157
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=176046
3 changed files with 9 additions and 44 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= apache
PORTVERSION= ${APACHE_VERSION}+${RA_VERSION}
PORTREVISION?= 1
PORTREVISION?= 0
CATEGORIES= russian www
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= ${PORTNAME}_${APACHE_VERSION}
@ -34,8 +34,8 @@ CONFLICTS= apache+ipv6-* \
publicfile-* \
ru-apache+mod_ssl-*
RA_VERSION= 30.22
APACHE_VERSION= 1.3.34
RA_VERSION= 30.23
APACHE_VERSION= 1.3.37
#
# Small hack for alternate processing patchfiles

View File

@ -1,6 +1,6 @@
MD5 (apache_1.3.34.tar.gz) = 9978cc552b423f0015c1052d23ab619e
SHA256 (apache_1.3.34.tar.gz) = ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4
SIZE (apache_1.3.34.tar.gz) = 2468056
MD5 (patches_1.3.34rusPL30.22.tar.gz) = 802d4dc44586bf2804d9684315168ff7
SHA256 (patches_1.3.34rusPL30.22.tar.gz) = 30b5b37e49056d7738d15f54a55b7e79f1dd8cee269390660b34a0c4edb27be7
SIZE (patches_1.3.34rusPL30.22.tar.gz) = 138288
MD5 (apache_1.3.37.tar.gz) = b278f0969a9ccadeb781316e79e3520f
SHA256 (apache_1.3.37.tar.gz) = 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc
SIZE (apache_1.3.37.tar.gz) = 2665370
MD5 (patches_1.3.37rusPL30.23.tar.gz) = b6f702913aae4624f47ce74cec18889d
SHA256 (patches_1.3.37rusPL30.23.tar.gz) = 16f742aa531469980a80ba9f50cbb88f091bca1bb0cba457288992a4bc8f0d65
SIZE (patches_1.3.37rusPL30.23.tar.gz) = 138315

View File

@ -1,35 +0,0 @@
--- 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], "&", 5);
j += 4;
+ }
+ else if (s[i] == '"') {
+ memcpy(&x[j], """, 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