httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src CHANGES
Date Thu, 05 Oct 2000 12:01:56 GMT
trawick     00/10/05 05:01:53

  Modified:    src/include util_filter.h
               src/main http_protocol.c http_core.c http_connection.c
                        util_filter.c
               src/modules/experimental mod_charset_lite.c
               src      CHANGES
  Log:
  Now that we have ap_add_input_filter(), rename ap_add_filter() to
  ap_add_output_filter().
  
  Revision  Changes    Path
  1.22      +11 -9     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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- util_filter.h	2000/10/04 23:19:29	1.21
  +++ util_filter.h	2000/10/05 12:01:37	1.22
  @@ -149,7 +149,7 @@
    *
    * The types have a particular sort order, which allows us to insert them
    * into the filter chain in a determistic order. Within a particular grouping,
  - * the ordering is equivalent to the order of calls to ap_add_filter().
  + * the ordering is equivalent to the order of calls to ap_add_*_filter().
    */
   typedef enum {
       AP_FTYPE_CONTENT,
  @@ -263,8 +263,8 @@
    *
    * This function is used to register an input filter with the system. 
    * After this registration is performed, then a filter may be added 
  - * into the filter chain by using ap_add_filter() and simply specifying 
  - * the name.
  + * into the filter chain by using ap_add_input_filter() and simply 
  + * specifying the name.
    *
    * The filter's callback and type should be passed.
    */
  @@ -284,8 +284,8 @@
    *
    * This function is used to register an output filter with the system. 
    * After this registration is performed, then a filter may be added 
  - * into the filter chain by using ap_add_filter() and simply specifying 
  - * the name.
  + * into the filter chain by using ap_add_output_filter() and simply 
  + * specifying the name.
    *
    * The filter's callback and type should be passed.
    */
  @@ -329,11 +329,13 @@
    * Add a filter to the current request.  Filters are added in a FIFO manner.
    * The first filter added will be the first filter called.
    * @param name The name of the filter to add
  - * @param r The request to add this filter for.
  - * @deffunc void ap_add_filter(const char *name, request_rec *r)
  + * @param ctx Context data to set in the filter
  + * @param r The request to add this filter for (or NULL if it isn't associated with a request)
  + * @param c The connection to add this filter for
  + * @deffunc void ap_add_output_filter(const char *name, void *ctx, request_rec *r, conn_rec
*c)
    */
  -API_EXPORT(void) ap_add_filter(const char *name, void *ctx, request_rec *r,
  -                               conn_rec *c);
  +API_EXPORT(void) ap_add_output_filter(const char *name, void *ctx, 
  +                                      request_rec *r, conn_rec *c);
   
   /* 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.141     +2 -2      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.140
  retrieving revision 1.141
  diff -u -r1.140 -r1.141
  --- http_protocol.c	2000/10/05 11:21:20	1.140
  +++ http_protocol.c	2000/10/05 12:01:39	1.141
  @@ -2099,8 +2099,8 @@
       if (r->chunked) {
           apr_table_mergen(r->headers_out, "Transfer-Encoding", "chunked");
           apr_table_unset(r->headers_out, "Content-Length");
  -        ap_add_filter("BUFFER", NULL, r, r->connection);
  -        ap_add_filter("CHUNK", NULL, r, r->connection);
  +        ap_add_output_filter("BUFFER", NULL, r, r->connection);
  +        ap_add_output_filter("CHUNK", NULL, r, r->connection);
       }
   
       if (r->byterange > 1) {
  
  
  
  1.144     +1 -1      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.143
  retrieving revision 1.144
  diff -u -r1.143 -r1.144
  --- http_core.c	2000/10/04 23:19:33	1.143
  +++ http_core.c	2000/10/05 12:01:40	1.144
  @@ -3434,7 +3434,7 @@
   
       for (i = 0; i < conf->filters->nelts; i++) {
           char *foobar = items[i];
  -        ap_add_filter(foobar, NULL, r, r->connection);
  +        ap_add_output_filter(foobar, NULL, r, r->connection);
       }
   }
   
  
  
  
  1.49      +1 -1      apache-2.0/src/main/http_connection.c
  
  Index: http_connection.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- http_connection.c	2000/10/04 23:19:32	1.48
  +++ http_connection.c	2000/10/05 12:01:41	1.49
  @@ -217,7 +217,7 @@
   int ap_pre_http_connection(conn_rec *c)
   {
       ap_add_input_filter("CORE_IN", NULL, c);
  -    ap_add_filter("CORE", NULL, NULL, c);
  +    ap_add_output_filter("CORE", NULL, NULL, c);
       return OK;
   }
   
  
  
  
  1.26      +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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- util_filter.c	2000/10/04 23:19:33	1.25
  +++ util_filter.c	2000/10/05 12:01:41	1.26
  @@ -148,8 +148,8 @@
       }
   }
   
  -API_EXPORT(void) ap_add_filter(const char *name, void *ctx, request_rec *r,
  -                               conn_rec *c)
  +API_EXPORT(void) ap_add_output_filter(const char *name, void *ctx, 
  +                                      request_rec *r, conn_rec *c)
   {
       ap_filter_rec_t *frec = registered_output_filters;
   
  
  
  
  1.23      +5 -3      apache-2.0/src/modules/experimental/mod_charset_lite.c
  
  Index: mod_charset_lite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/experimental/mod_charset_lite.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_charset_lite.c	2000/10/05 02:36:55	1.22
  +++ mod_charset_lite.c	2000/10/05 12:01:48	1.23
  @@ -109,7 +109,8 @@
       int debug;
       const char *charset_source; /* source encoding */
       const char *charset_default; /* how to ship on wire */
  -    enum {IA_INIT, IA_IMPADD, IA_NOIMPADD} implicit_add; /* tmp hack! module does ap_add_filter()?
*/
  +    /** module does ap_add_*_filter()? */    
  +    enum {IA_INIT, IA_IMPADD, IA_NOIMPADD} implicit_add; 
   } charset_dir_t;
   
   /* charset_filter_ctx_t is created for each filter instance; because the same
  @@ -366,14 +367,15 @@
       if (reqinfo && 
           dc->implicit_add == IA_IMPADD &&
           reqinfo->output_ctx) {
  -        ap_add_filter(XLATEOUT_FILTER_NAME, reqinfo->output_ctx, r, r->connection);
  +        ap_add_output_filter(XLATEOUT_FILTER_NAME, reqinfo->output_ctx, r, 
  +                             r->connection);
       }
       
   #ifdef NOT_YET /* no input filters yet; we still rely on BUFF */
       if (reqinfo && 
           dc->implicit_add == IA_IMPADD &&
           reqinfo->input_ctx) {
  -        /* ap_add_filter(XLATEIN_FILTER_NAME, reqinfo->input_ctx, r); */
  +        /* ap_add_input_filter(XLATEIN_FILTER_NAME, reqinfo->input_ctx, r); */
       }
   #endif
   }
  
  
  
  1.250     +3 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.249
  retrieving revision 1.250
  diff -u -r1.249 -r1.250
  --- CHANGES	2000/10/05 11:21:30	1.249
  +++ CHANGES	2000/10/05 12:01:52	1.250
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0a7
  +  *) Now that we have ap_add_input_filter(), rename ap_add_filter() to 
  +     ap_add_output_filter().  [Jeff Trawick]
  +
     *) Multiple build and configuration fixes
       Build process:
   
  
  
  

Mime
View raw message