I don't know why CVS was being a pain, but here is the patch finally.
:-)
Index: include/util_filter.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/util_filter.h,v
retrieving revision 1.67
diff -u -r1.67 util_filter.h
--- include/util_filter.h 3 Mar 2002 06:04:08 -0000 1.67
+++ include/util_filter.h 6 Mar 2002 19:52:52 -0000
@@ -263,9 +263,6 @@
/** The next filter in the chain */
ap_filter_t *next;
- /** The previous filter in the chain */
- ap_filter_t *prev;
-
/** The request_rec associated with the current filter. If a
sub-request
* adds filters, then the sub-request is the request associated
with the
* filter.
Index: server/core.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/core.c,v
retrieving revision 1.159
diff -u -r1.159 core.c
--- server/core.c 6 Mar 2002 18:03:19 -0000 1.159
+++ server/core.c 6 Mar 2002 19:52:52 -0000
@@ -4040,7 +4040,7 @@
AP_FTYPE_NETWORK);
ap_subreq_core_filter_handle =
ap_register_output_filter("SUBREQ_CORE",
ap_sub_req_output_filter,
- AP_FTYPE_HTTP_HEADER);
+ AP_FTYPE_CONTENT + 5);
ap_old_write_func = ap_register_output_filter("OLD_WRITE",
ap_old_write_filter,
AP_FTYPE_CONTENT - 10);
}
Index: server/protocol.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
retrieving revision 1.87
diff -u -r1.87 protocol.c
--- server/protocol.c 3 Mar 2002 22:04:03 -0000 1.87
+++ server/protocol.c 6 Mar 2002 19:52:52 -0000
@@ -777,9 +777,6 @@
r->request_config = ap_create_request_config(r->pool);
/* Must be set before we run create request hook */
- conn->output_filters->prev = NULL;
- conn->input_filters->prev = NULL;
-
r->proto_output_filters = conn->output_filters;
r->output_filters = r->proto_output_filters;
r->proto_input_filters = conn->input_filters;
Index: server/util_filter.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_filter.c,v
retrieving revision 1.85
diff -u -r1.85 util_filter.c
--- server/util_filter.c 6 Mar 2002 17:29:39 -0000 1.85
+++ server/util_filter.c 6 Mar 2002 19:52:52 -0000
@@ -329,7 +329,7 @@
f->ctx = ctx;
f->r = r;
f->c = c;
- f->next = f->prev = NULL;
+ f->next = NULL;
if (INSERT_BEFORE(f, *outf)) {
f->next = *outf;
@@ -351,10 +351,6 @@
}
if (first && first != (*outf)) {
first->next = f;
- f->prev = first;
- }
- if (*outf && ((*outf)->prev == first)) {
- (*outf)->prev = f;
}
}
*outf = f;
@@ -365,11 +361,7 @@
fscan = fscan->next;
f->next = fscan->next;
- if (fscan->next->prev == fscan) {
- f->prev = fscan;
- fscan->next->prev = f;
- fscan->next = f;
- }
+ fscan->next = f;
}
if (frec->ftype < AP_FTYPE_CONNECTION && (*r_filters ==
*c_filters)) {
@@ -472,7 +464,6 @@
if (*curr == f) {
*curr = (*curr)->next;
- (*curr)->prev = NULL;
return;
}
@@ -483,7 +474,6 @@
}
fscan->next = f->next;
- f->next->prev = fscan;
}
AP_DECLARE(void) ap_remove_input_filter(ap_filter_t *f)
