httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_core.c http_protocol.c util_filter.c
Date Thu, 14 Sep 2000 05:08:44 GMT
dougm       00/09/13 22:08:44

  Modified:    src/include util_filter.h
               src/main http_core.c http_protocol.c util_filter.c
  Log:
  put ctx back in ap_add_filter()
  
  Revision  Changes    Path
  1.16      +1 -1      apache-2.0/src/include/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_filter.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- util_filter.h	2000/09/14 00:34:15	1.15
  +++ util_filter.h	2000/09/14 05:08:39	1.16
  @@ -283,7 +283,7 @@
    * @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
  
  
  
  1.121     +2 -2      apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.120
  retrieving revision 1.121
  diff -u -r1.120 -r1.121
  --- http_core.c	2000/09/14 02:16:07	1.120
  +++ http_core.c	2000/09/14 05:08:41	1.121
  @@ -3145,10 +3145,10 @@
   
       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)
  
  
  
  1.125     +1 -1      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.124
  retrieving revision 1.125
  diff -u -r1.124 -r1.125
  --- http_protocol.c	2000/09/13 23:13:19	1.124
  +++ http_protocol.c	2000/09/14 05:08:41	1.125
  @@ -2064,7 +2064,7 @@
       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) {
  
  
  
  1.18      +2 -2      apache-2.0/src/main/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_filter.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- util_filter.c	2000/09/14 00:34:15	1.17
  +++ util_filter.c	2000/09/14 05:08:42	1.18
  @@ -99,7 +99,7 @@
       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 @@
               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)) {
  
  
  

Mime
View raw message