Fixup fromcvs/togit conversion pkgsrc-2013Q1
authorpkgsrc fixup <pkgsrc@dragonflybsd.org>
Tue, 16 Jul 2013 01:31:32 +0000 (18:31 -0700)
committerCharlie Root <root@crater.dragonflybsd.org>
Tue, 16 Jul 2013 01:31:32 +0000 (18:31 -0700)
www/apache22/patches/patch-modules_mappers_mod_rewrite.c [deleted file]

diff --git a/www/apache22/patches/patch-modules_mappers_mod_rewrite.c b/www/apache22/patches/patch-modules_mappers_mod_rewrite.c
deleted file mode 100644 (file)
index 70a16b5..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-Fix for security vulnerability reported in CVE-2013-1862. Patch taken
-from here:
-
-http://people.apache.org/~jorton/mod_rewrite-CVE-2013-1862.patch
-
---- modules/mappers/mod_rewrite.c.orig 2013-02-18 21:31:42.000000000 +0000
-+++ modules/mappers/mod_rewrite.c      2013-05-30 23:50:27.000000000 +0100
-@@ -500,11 +500,11 @@
-     logline = apr_psprintf(r->pool, "%s %s %s %s [%s/sid#%pp][rid#%pp/%s%s%s] "
-                                     "(%d) %s%s%s%s" APR_EOL_STR,
--                           rhost ? rhost : "UNKNOWN-HOST",
--                           rname ? rname : "-",
--                           r->user ? (*r->user ? r->user : "\"\"") : "-",
-+                           rhost ? ap_escape_logitem(r->pool, rhost) : "UNKNOWN-HOST",
-+                           rname ? ap_escape_logitem(r->pool, rname) : "-",
-+                           r->user ? (*r->user ? ap_escape_logitem(r->pool, r->user) : "\"\"") : "-",
-                            current_logtime(r),
--                           ap_get_server_name(r),
-+                           ap_escape_logitem(r->pool, ap_get_server_name(r)),
-                            (void *)(r->server),
-                            (void *)r,
-                            r->main ? "subreq" : "initial",
-@@ -514,7 +514,7 @@
-                            perdir ? "[perdir " : "",
-                            perdir ? perdir : "",
-                            perdir ? "] ": "",
--                           text);
-+                           ap_escape_logitem(r->pool, text));
-     nbytes = strlen(logline);
-     apr_file_write(conf->rewritelogfp, logline, &nbytes);