3 files changed, 7 insertions, 230 deletions

diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index eb9cc9da92de..6d4f630f60bc 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apache+mod_ssl
 PORTVERSION=	${VERSION_APACHE}+${VERSION_MODSSL}
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES?=	www security
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITES_MODSSL:S/$/:mod_ssl/} \
@@ -36,8 +36,8 @@ PATCH_DEPENDS=	${BUILD_DEPENDS}
 CONFLICTS?=	apache+ipv6-1.* apache+ssl-1.* apache-1.* apache-2.* \
 		apache_fp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* w3c-httpd-3.*
-VERSION_APACHE=	1.3.32
-VERSION_MODSSL=	2.8.21
+VERSION_APACHE=	1.3.33
+VERSION_MODSSL=	2.8.22
 VERSION_MODSNMP=	1.3.14.13
 VERSION_MODACCEL=	1.0.31
 VERSION_MODDEFLATE=	1.0.21
diff --git a/www/apache13-modssl/distinfo b/www/apache13-modssl/distinfo
index 1bf4e2c32d55..9bc7a7d5167a 100644
--- a/www/apache13-modssl/distinfo
+++ b/www/apache13-modssl/distinfo
@@ -1,7 +1,7 @@
-MD5 (apache_1.3.32.tar.gz) = 45164531fb57bfa18af4b9efd0850dd3
-SIZE (apache_1.3.32.tar.gz) = 2472811
-MD5 (mod_ssl-2.8.21-1.3.32.tar.gz) = 19994ade6f8c46aa6cac87bca797fe82
-SIZE (mod_ssl-2.8.21-1.3.32.tar.gz) = 754629
+MD5 (apache_1.3.33.tar.gz) = 3dfd2c3778f37a2dfc22b97417a61407
+SIZE (apache_1.3.33.tar.gz) = 2468567
+MD5 (mod_ssl-2.8.22-1.3.33.tar.gz) = cdfdf1f576f77768c90825b43b462405
+SIZE (mod_ssl-2.8.22-1.3.33.tar.gz) = 754606
 MD5 (mod_snmp_1.3.14.13.tar.gz) = 47f47354a8317f676af3d745635fb33e
 SIZE (mod_snmp_1.3.14.13.tar.gz) = 91109
 MD5 (mod_accel-1.0.31.tar.gz) = edc31714cc6dc8d24396cb4ddf2ae2f6
diff --git a/www/apache13-modssl/files/patch-2004-10-29 b/www/apache13-modssl/files/patch-2004-10-29
deleted file mode 100644
index 1d6d4b55a52b..000000000000
--- a/www/apache13-modssl/files/patch-2004-10-29
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -ur src/modules/standard/mod_include.c apache_1.3.33/src/modules/standard/mod_include.c
---- src/modules/standard/mod_include.c	Sat Feb 28 23:19:04 2004
-+++ apache_1.3.33/src/modules/standard/mod_include.c	Mon Oct 25 17:44:04 2004
-@@ -309,9 +309,10 @@
-  * the tag value is html decoded if dodecode is non-zero
-  */
- 
--static char *get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode)
-+static char *get_tag(request_rec *r, FILE *in, char *tag, int tagbuf_len, int dodecode)
- {
-     char *t = tag, *tag_val, c, term;
-+    pool *p = r->pool;
- 
-     /* makes code below a little less cluttered */
-     --tagbuf_len;
-@@ -337,7 +338,7 @@
- 
-     /* find end of tag name */
-     while (1) {
--        if (t - tag == tagbuf_len) {
-+        if (t == tag + tagbuf_len) {
-             *t = '\0';
-             return NULL;
-         }
-@@ -371,16 +372,30 @@
-     term = c;
-     while (1) {
-         GET_CHAR(in, c, NULL, p);
--        if (t - tag == tagbuf_len) {
-+        if (t == tag + tagbuf_len) {
-             *t = '\0';
-+            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-+                          "mod_include: value length exceeds limit"
-+                          " (%d) in %s", tagbuf_len, r->filename);
-             return NULL;
-         }
--/* Want to accept \" as a valid character within a string. */
-+        /* Want to accept \" as a valid character within a string. */
-         if (c == '\\') {
--            *(t++) = c;         /* Add backslash */
-             GET_CHAR(in, c, NULL, p);
--            if (c == term) {    /* Only if */
--                *(--t) = c;     /* Replace backslash ONLY for terminator */
-+            /* Insert backslash only if not escaping a terminator char */
-+            if (c != term) {
-+                *(t++) = '\\';
-+                /*
-+                 * check to make sure that adding in the backslash won't cause
-+                 * an overflow, since we're now 1 character ahead.
-+                 */
-+                if (t == tag + tagbuf_len) {
-+                    *t = '\0';
-+                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-+                                  "mod_include: value length exceeds limit"
-+                                  " (%d) in %s", tagbuf_len, r->filename);
-+                    return NULL;
-+                }
-             }
-         }
-         else if (c == term) {
-@@ -395,9 +410,10 @@
-     return ap_pstrdup(p, tag_val);
- }
- 
--static int get_directive(FILE *in, char *dest, size_t len, pool *p)
-+static int get_directive(FILE *in, char *dest, size_t len, request_rec *r)
- {
-     char *d = dest;
-+    pool *p = r->pool;
-     char c;
- 
-     /* make room for nul terminator */
-@@ -413,6 +429,9 @@
-     /* now get directive */
-     while (1) {
- 	if (d == len + dest) {
-+            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
-+                          "mod_include: directive length exceeds limit"
-+                          " (%lu) in %s", (unsigned long)len+1, r->filename);
- 	    return 1;
- 	}
-         *d++ = ap_tolower(c);
-@@ -616,7 +635,7 @@
-     char *tag_val;
- 
-     while (1) {
--        if (!(tag_val = get_tag(r->pool, in, tag, sizeof(tag), 1))) {
-+        if (!(tag_val = get_tag(r, in, tag, sizeof(tag), 1))) {
-             return 1;
-         }
-         if (!strcmp(tag, "file") || !strcmp(tag, "virtual")) {
-@@ -839,7 +858,7 @@
-     char parsed_string[MAX_STRING_LEN];
- 
-     while (1) {
--        if (!(tag_val = get_tag(r->pool, in, tag, sizeof(tag), 1))) {
-+        if (!(tag_val = get_tag(r, in, tag, sizeof(tag), 1))) {
-             return 1;
-         }
-         if (!strcmp(tag, "cmd")) {
-@@ -890,7 +909,7 @@
-     encode = E_ENTITY;
- 
-     while (1) {
--        if (!(tag_val = get_tag(r->pool, in, tag, sizeof(tag), 1))) {
-+        if (!(tag_val = get_tag(r, in, tag, sizeof(tag), 1))) {
-             return 1;
-         }
-         if (!strcmp(tag, "var")) {
-@@ -952,7 +971,7 @@
-         return DECLINED;
-     }
-     while (1) {
--        if (!(tag_val = get_tag(r->pool, in, tag, sizeof(tag), 1))) {
-+        if (!(tag_val = get_tag(r, in, tag, sizeof(tag), 1))) {
-             break;
-         }
-         if (strnEQ(tag, "sub", 3)) {
-@@ -985,7 +1004,7 @@
-     table *env = r->subprocess_env;
- 
-     while (1) {
--        if (!(tag_val = get_tag(r->pool, in, tag, sizeof(tag), 0))) {
-+        if (!(tag_val = get_tag(r, in, tag, sizeof(tag), 0))) {
-             return 1;
-         }
-         if (!strcmp(tag, "errmsg")) {
-@@ -1101,7 +1120,7 @@
-     char parsed_string[MAX_STRING_LEN];
- 
-     while (1) {
--        if (!(tag_val = get_tag(r->pool, in, tag, sizeof(tag), 1))) {
-+        if (!(tag_val = get_tag(r, in, tag, sizeof(tag), 1))) {
-             return 1;
-         }
-         else if (!strcmp(tag, "done")) {
-@@ -1141,7 +1160,7 @@
-     char parsed_string[MAX_STRING_LEN];
- 
-     while (1) {
--        if (!(tag_val = get_tag(r->pool, in, tag, sizeof(tag), 1))) {
-+        if (!(tag_val = get_tag(r, in, tag, sizeof(tag), 1))) {
-             return 1;
-         }
-         else if (!strcmp(tag, "done")) {
-@@ -1917,7 +1936,7 @@
- 
-     expr = NULL;
-     while (1) {
--        tag_val = get_tag(r->pool, in, tag, sizeof(tag), 0);
-+        tag_val = get_tag(r, in, tag, sizeof(tag), 0);
-         if (!tag_val || *tag == '\0') {
-             return 1;
-         }
-@@ -1960,7 +1979,7 @@
- 
-     expr = NULL;
-     while (1) {
--        tag_val = get_tag(r->pool, in, tag, sizeof(tag), 0);
-+        tag_val = get_tag(r, in, tag, sizeof(tag), 0);
-         if (!tag_val || *tag == '\0') {
-             return 1;
-         }
-@@ -2007,7 +2026,7 @@
- {
-     char tag[MAX_STRING_LEN];
- 
--    if (!get_tag(r->pool, in, tag, sizeof(tag), 1)) {
-+    if (!get_tag(r, in, tag, sizeof(tag), 1)) {
-         return 1;
-     }
-     else if (!strcmp(tag, "done")) {
-@@ -2035,7 +2054,7 @@
- {
-     char tag[MAX_STRING_LEN];
- 
--    if (!get_tag(r->pool, in, tag, sizeof(tag), 1)) {
-+    if (!get_tag(r, in, tag, sizeof(tag), 1)) {
-         return 1;
-     }
-     else if (!strcmp(tag, "done")) {
-@@ -2065,7 +2084,7 @@
- 
-     var = (char *) NULL;
-     while (1) {
--        if (!(tag_val = get_tag(r->pool, in, tag, sizeof(tag), 1))) {
-+        if (!(tag_val = get_tag(r, in, tag, sizeof(tag), 1))) {
-             return 1;
-         }
-         else if (!strcmp(tag, "done")) {
-@@ -2102,7 +2121,7 @@
-     table_entry *elts = (table_entry *) arr->elts;
-     int i;
- 
--    if (!(tag_val = get_tag(r->pool, in, tag, sizeof(tag), 1))) {
-+    if (!(tag_val = get_tag(r, in, tag, sizeof(tag), 1))) {
-         return 1;
-     }
-     else if (!strcmp(tag, "done")) {
-@@ -2173,10 +2192,7 @@
- 
-     while (1) {
-         if (!find_string(f, STARTING_SEQUENCE, r, printing)) {
--            if (get_directive(f, directive, sizeof(directive), r->pool)) {
--		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
--			    "mod_include: error reading directive in %s",
--			    r->filename);
-+            if (get_directive(f, directive, sizeof(directive), r)) {
- 		ap_rputs(error, r);
-                 return;
-             }
-diff -ur src/modules/standard/mod_rewrite.c apache_1.3.33/src/modules/standard/mod_rewrite.c
---- src/modules/standard/mod_rewrite.c	Wed Oct 13 20:44:25 2004
-+++ apache_1.3.33/src/modules/standard/mod_rewrite.c	Wed Oct 27 16:23:04 2004
-@@ -1116,7 +1116,7 @@
-                                          r->path_info, NULL);
-             }
-             if (r->args != NULL &&
--                r->uri != r->unparsed_uri) {
-+                r->uri == r->unparsed_uri) {
-                 /* see proxy_http:proxy_http_canon() */
-                 r->filename = ap_pstrcat(r->pool, r->filename,
-                                          "?", r->args, NULL);