You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2004/05/29 05:34:17 UTC

cvs commit: httpd-2.0/modules/filters mod_deflate.c

jerenkrantz    2004/05/28 20:34:17

  Modified:    .        CHANGES
               modules/filters mod_deflate.c
  Log:
  Fix bug in mod_deflate that unconditionally sent deflate'd output even when
  Accept-Encoding is not present.
  
  Reported by Roy Fielding for http://cvs.apache.org/viewcvs/ with Safari.
  
  Revision  Changes    Path
  1.1498    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1497
  retrieving revision 1.1498
  diff -u -u -r1.1497 -r1.1498
  --- CHANGES	27 May 2004 23:35:40 -0000	1.1497
  +++ CHANGES	29 May 2004 03:34:14 -0000	1.1498
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Fix bug in mod_deflate that unconditionally sent deflate'd output
  +     even when Accept-Encoding is not present.  [Justin Erenkrantz]
  +
     *) Pass environment variables through to piped loggers, resolving
        a regression since 1.3.  [Ken Coar, Jeff Trawick]
   
  
  
  
  1.48      +1 -1      httpd-2.0/modules/filters/mod_deflate.c
  
  Index: mod_deflate.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_deflate.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -u -r1.47 -r1.48
  --- mod_deflate.c	21 Apr 2004 22:08:34 -0000	1.47
  +++ mod_deflate.c	29 May 2004 03:34:17 -0000	1.48
  @@ -340,7 +340,7 @@
           /* force-gzip will just force it out regardless if the browser
            * can actually do anything with it.
            */
  -        if (apr_table_get(r->subprocess_env, "force-gzip") != NULL) {
  +        if (!apr_table_get(r->subprocess_env, "force-gzip")) {
               const char *accepts;
               /* if they don't have the line, then they can't play */
               accepts = apr_table_get(r->headers_in, "Accept-Encoding");