put ctx back in ap_add_filter()

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86224 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/util_filter.h b/include/util_filter.h
index c15fc18e065f7fa597c02e5c8327e17484bd9409..0f73772f0f48e1403a21aa2ea90c7d9115ee6d80 100644 (file)
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -283,7 +283,7 @@ API_EXPORT(void) ap_register_filter(const char *name,
  * @param r The request to add this filter for.
  * @deffunc void ap_add_filter(const char *name, request_rec *r)
  */
-API_EXPORT(void) ap_add_filter(const char *name, request_rec *r);
+API_EXPORT(void) ap_add_filter(const char *name, void *ctx, request_rec *r);
 
 /* The next two filters are for abstraction purposes only.  They could be
  * done away with, but that would require that we break modules if we ever

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 61279f2fd5963913d9bbe41a76bd0baa8e41b6d7..c50f6aa8c3291127e82b87f1a0548814835e9a18 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -3145,10 +3145,10 @@ static void core_register_filter(request_rec *r)
 
     for (i = 0; i < conf->filters->nelts; i++) {
         char *foobar = items[i];
-        ap_add_filter(foobar, r);
+        ap_add_filter(foobar, NULL, r);
     }
 
-    ap_add_filter("CORE", r);
+    ap_add_filter("CORE", NULL, r);
 }
 
 static void register_hooks(void)

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 8589c82954a181a20b2040becd3abe6aa77c9053..4ce47e612066aab729be39a6105d717b0446084c 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -2064,7 +2064,7 @@ API_EXPORT(void) ap_send_http_header(request_rec *r)
     if (r->chunked) {
         apr_table_mergen(r->headers_out, "Transfer-Encoding", "chunked");
         apr_table_unset(r->headers_out, "Content-Length");
-        ap_add_filter("CHUNK", r);
+        ap_add_filter("CHUNK", NULL, r);
     }
 
     if (r->byterange > 1) {

diff --git a/server/util_filter.c b/server/util_filter.c
index 3ebef147b2e8a3da08c87e5a5a4b5eeb659ad82f..ce949a83267aba5940963b3e7735c36ffba5a565 100644 (file)
--- a/server/util_filter.c
+++ b/server/util_filter.c
@@ -99,7 +99,7 @@ API_EXPORT(void) ap_register_filter(const char *name,
     apr_register_cleanup(FILTER_POOL, NULL, filter_cleanup, apr_null_cleanup);
 }
 
-API_EXPORT(void) ap_add_filter(const char *name, request_rec *r)
+API_EXPORT(void) ap_add_filter(const char *name, void *ctx, request_rec *r)
 {
     ap_filter_rec_t *frec = registered_filters;
 
@@ -108,7 +108,7 @@ API_EXPORT(void) ap_add_filter(const char *name, request_rec *r)
             ap_filter_t *f = apr_pcalloc(r->pool, sizeof(*f));
 
             f->frec = frec;
-            f->ctx = NULL;
+            f->ctx = ctx;
             f->r = r;
 
             if (INSERT_BEFORE(f, r->filters)) {