cvs commit: apache/src mod_mime.c

[Alexei Kosut]

akosut      96/04/08 06:05:00

  Modified:    src       mod_mime.c
  Log:
  Modify find_ct() to correctly deal with multiple content encodings.
  
  Revision  Changes    Path
  1.6       +7 -3      apache/src/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_mime.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -C3 -r1.5 -r1.6
  *** mod_mime.c        1996/03/31 01:07:02     1.5
  --- mod_mime.c        1996/04/08 13:04:59     1.6
  ***************
  *** 228,236 ****
          r->content_language = type;
        
          /* Check for Content-Encoding */
  !       if ((type = table_get (conf->encoding_types, ext)))
  !       r->content_encoding = type;
  ! 
          /* Check for a special handler, but not for proxy request */
          if ((type = table_get (conf->handlers, ext)) && !r->proxyreq)
          r->handler = type;
  --- 228,240 ----
          r->content_language = type;
        
          /* Check for Content-Encoding */
  !       if ((type = table_get (conf->encoding_types, ext))) {
  !       if (!r->content_encoding)
  !           r->content_encoding = type;
  !       else
  !           r->content_encoding = pstrcat(r->pool, r->content_encoding,
  !                                         ", ", type, NULL);
  !       }
          /* Check for a special handler, but not for proxy request */
          if ((type = table_get (conf->handlers, ext)) && !r->proxyreq)
          r->handler = type;