Upgrade to 1.3.35

This commit is contained in:
Andrey A. Chernov 2006-05-10 13:57:18 +00:00
parent bcb3a6f096
commit 978d1b7230
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=161926
3 changed files with 5 additions and 41 deletions

View file

@ -6,14 +6,13 @@
#
PORTNAME= apache
PORTVERSION= 1.3.34
PORTREVISION= 4
PORTVERSION= 1.3.35
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
DISTNAME= apache_${PORTVERSION}
#PATCH_SITES= ${MASTER_SITE_APACHE_HTTPD}
#PATCH_SITE_SUBDIR= patches/apply_to_1.3.34/
#PATCH_SITE_SUBDIR= patches/apply_to_1.3.35/
#PATCHFILES=
#PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}

View file

@ -1,3 +1,3 @@
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 (apache_1.3.35.tar.gz) = 31f99663028828a8b56633e255ee634e
SHA256 (apache_1.3.35.tar.gz) = ec9d1822cd275622776d8013abd0f533eb29d4f78d0a39c98ececef2a2c964fd
SIZE (apache_1.3.35.tar.gz) = 2472434

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