httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Sun, 15 Sep 2002 00:30:56 GMT
jerenkrantz    2002/09/14 17:30:56

  Modified:    .        CHANGES
               server   core.c
  Log:
  Allow AddOutputFilterByType to take in multiple filters.
  
  Revision  Changes    Path
  1.928     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.927
  retrieving revision 1.928
  diff -u -u -r1.927 -r1.928
  --- CHANGES	15 Sep 2002 00:00:47 -0000	1.927
  +++ CHANGES	15 Sep 2002 00:30:56 -0000	1.928
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.42
   
  +  *) Allow AddOutputFilterByType to add multiple filters per directive.
  +     [Justin Erenkrantz]
  +
     *) Remove warnings with Sun's Forte compiler.  [Justin Erenkrantz]
   
     *) Fixed mod_disk_cache's generation of 304s
  
  
  
  1.203     +10 -5     httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.202
  retrieving revision 1.203
  diff -u -u -r1.202 -r1.203
  --- core.c	10 Sep 2002 19:41:43 -0000	1.202
  +++ core.c	15 Sep 2002 00:30:56 -0000	1.203
  @@ -2578,6 +2578,7 @@
   {
       core_dir_config *conf = conf_;
       ap_filter_rec_t *old, *new;
  +    const char *filter_name;
   
       if (!conf->ct_output_filters) {
           conf->ct_output_filters = apr_hash_make(cmd->pool);
  @@ -2588,12 +2589,16 @@
                                                 APR_HASH_KEY_STRING);
       }
   
  -    new = apr_pcalloc(cmd->pool, sizeof(ap_filter_rec_t));
  -    new->name = apr_pstrdup(cmd->pool, arg);
  +    while (*arg &&
  +           (filter_name = ap_getword(cmd->pool, &arg, ';'))) {
  +        new = apr_pcalloc(cmd->pool, sizeof(ap_filter_rec_t));
  +        new->name = filter_name;
   
  -    /* We found something, so let's append it.  */
  -    if (old) {
  -        new->next = old;
  +        /* We found something, so let's append it.  */
  +        if (old) {
  +            new->next = old;
  +        }
  +        old = new;
       }
   
       apr_hash_set(conf->ct_output_filters, arg2, APR_HASH_KEY_STRING, new);
  
  
  

Mime
View raw message