httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental mod_cache.c
Date Sun, 01 Sep 2002 23:50:43 GMT
brianp      2002/09/01 16:50:43

  Modified:    modules/experimental mod_cache.c
  Log:
  Resolve filter handles at startup to eliminate a filter
  name-to-function mapping on each request
  
  Revision  Changes    Path
  1.55      +37 -22    httpd-2.0/modules/experimental/mod_cache.c
  
  Index: mod_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_cache.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- mod_cache.c	27 Aug 2002 19:22:45 -0000	1.54
  +++ mod_cache.c	1 Sep 2002 23:50:42 -0000	1.55
  @@ -66,6 +66,12 @@
   /* -------------------------------------------------------------- */
   
   
  +/* Handles for cache filters, resolved at startup to eliminate
  + * a name-to-function mapping on each request
  + */
  +static ap_filter_rec_t *cache_in_filter_handle;
  +static ap_filter_rec_t *cache_out_filter_handle;
  +static ap_filter_rec_t *cache_conditional_filter_handle;
   
   /*
    * CACHE handler
  @@ -196,7 +202,8 @@
               ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                            "cache: no cache - add cache_in filter and DECLINE");
               /* add cache_in filter to cache this request */
  -            ap_add_output_filter("CACHE_IN", NULL, r, r->connection);
  +            ap_add_output_filter_handle(cache_in_filter_handle, NULL, r,
  +                                        r->connection);
           }
           return DECLINED;
       }
  @@ -229,7 +236,8 @@
                * filters have been set. So lets run the insert_filter hook.
                */
               ap_run_insert_filter(r);
  -            ap_add_output_filter("CACHE_OUT", NULL, r, r->connection);
  +            ap_add_output_filter_handle(cache_out_filter_handle, NULL,
  +                                        r, r->connection);
   
               /* kick off the filter stack */
               out = apr_brigade_create(r->pool, c->bucket_alloc);
  @@ -259,7 +267,8 @@
                                "cache: conditional - add cache_in filter and "
                                "DECLINE");
                   /* Why not add CACHE_CONDITIONAL? */
  -                ap_add_output_filter("CACHE_IN", NULL, r, r->connection);
  +                ap_add_output_filter_handle(cache_in_filter_handle, NULL,
  +                                            r, r->connection);
   
                   return DECLINED;
               }
  @@ -291,7 +300,8 @@
                                    "cache: nonconditional - no cached "
                                    "etag/lastmods - add cache_in and DECLINE");
   
  -                    ap_add_output_filter("CACHE_IN", NULL, r, r->connection);
  +                    ap_add_output_filter_handle(cache_in_filter_handle, NULL,
  +                                                r, r->connection);
   
                       return DECLINED;
                   }
  @@ -300,10 +310,10 @@
                                r->server,
                                "cache: nonconditional - add cache_conditional "
                                "and DECLINE");
  -                ap_add_output_filter("CACHE_CONDITIONAL", 
  -                                     NULL, 
  -                                     r, 
  -                                     r->connection);
  +                ap_add_output_filter_handle(cache_conditional_filter_handle,
  +                                            NULL, 
  +                                            r, 
  +                                            r->connection);
   
                   return DECLINED;
               }
  @@ -377,11 +387,13 @@
   
       if (f->r->status == HTTP_NOT_MODIFIED) {
           /* replace ourselves with CACHE_OUT filter */
  -        ap_add_output_filter("CACHE_OUT", NULL, f->r, f->r->connection);
  +        ap_add_output_filter_handle(cache_out_filter_handle, NULL,
  +                                    f->r, f->r->connection);
       }
       else {
           /* replace ourselves with CACHE_IN filter */
  -        ap_add_output_filter("CACHE_IN", NULL, f->r, f->r->connection);
  +        ap_add_output_filter_handle(cache_in_filter_handle, NULL,
  +                                    f->r, f->r->connection);
       }
       ap_remove_output_filter(f);
   
  @@ -987,22 +999,25 @@
        * Make them AP_FTYPE_CONTENT for now.
        * XXX ianhH:they should run AFTER all the other content filters.
        */
  -    ap_register_output_filter("CACHE_IN", 
  -                              cache_in_filter, 
  -                              NULL,
  -                              AP_FTYPE_CONTENT_SET-1);
  +    cache_in_filter_handle = 
  +        ap_register_output_filter("CACHE_IN", 
  +                                  cache_in_filter, 
  +                                  NULL,
  +                                  AP_FTYPE_CONTENT_SET-1);
       /* CACHE_OUT must go into the filter chain before SUBREQ_CORE to
        * handle subrequsts. Decrementing filter type by 1 ensures this 
        * happens.
        */
  -    ap_register_output_filter("CACHE_OUT", 
  -                              cache_out_filter, 
  -                              NULL,
  -                              AP_FTYPE_CONTENT_SET-1);
  -    ap_register_output_filter("CACHE_CONDITIONAL", 
  -                              cache_conditional_filter, 
  -                              NULL,
  -                              AP_FTYPE_CONTENT_SET);
  +    cache_out_filter_handle = 
  +        ap_register_output_filter("CACHE_OUT", 
  +                                  cache_out_filter, 
  +                                  NULL,
  +                                  AP_FTYPE_CONTENT_SET-1);
  +    cache_conditional_filter_handle =
  +        ap_register_output_filter("CACHE_CONDITIONAL", 
  +                                  cache_conditional_filter, 
  +                                  NULL,
  +                                  AP_FTYPE_CONTENT_SET);
       ap_hook_post_config(cache_post_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
   }
   
  
  
  

Mime
View raw message