httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_deflate.c
Date Sat, 17 May 2003 18:27:43 GMT
nd          2003/05/17 11:27:43

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/filters Tag: APACHE_2_0_BRANCH mod_deflate.c
  Log:
  Check also for r->content_encoding (now we should have them all...)
  for already compressed content in mod_deflate.
  
  PR: 19913
  Submitted by: Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>
  Reviewed by: Jeff Trawick, Justin Erenkrantz
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.102 +4 -1      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.101
  retrieving revision 1.988.2.102
  diff -u -r1.988.2.101 -r1.988.2.102
  --- CHANGES	17 May 2003 17:14:05 -0000	1.988.2.101
  +++ CHANGES	17 May 2003 18:27:41 -0000	1.988.2.102
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.46
   
  +  *) Add another check for already compressed content in mod_deflate.
  +     PR 19913. [Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>]
  +
     *) Fixes for VPATH builds; copying special.mk and any future .mk files 
        from the source tree as well as the build tree (now creates a usable
        configuration for apxs), and eliminated redundant -I'nclude paths.
  @@ -24,7 +27,7 @@
     *) mod_log_config: Add the ability to log the id of the thread 
        processing the request via new %P formats.  [Jeff Trawick]
   
  -  *) Use appropriate language code for Czech (cs) and Traditional Chinese
  +  *) Use appropriate language codes for Czech (cs) and Traditional Chinese
        (zh-tw) in default config files. PR 9427.  [André Malo]
   
     *) mod_auth_ldap: Use generic whitespace character class when parsing
  
  
  
  1.751.2.293 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.292
  retrieving revision 1.751.2.293
  diff -u -r1.751.2.292 -r1.751.2.293
  --- STATUS	17 May 2003 17:14:04 -0000	1.751.2.292
  +++ STATUS	17 May 2003 18:27:42 -0000	1.751.2.293
  @@ -198,11 +198,6 @@
         modules/ssl/ssl_engine_io.c r1.106, r1.107 (minor breakage)
         +1: wrowe, jerenkrantz
         
  -    * Add another check for already compressed content in mod_deflate.
  -      PR 19913.
  -      modules/filters/mod_deflate.c: r1.34
  -      +1: nd, trawick, jerenkrantz
  -
   CURRENT RELEASE NOTES:
   
       * Backwards compatibility is expected of future Apache 2.0 releases,
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.26.2.5  +6 -0      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.26.2.4
  retrieving revision 1.26.2.5
  diff -u -r1.26.2.4 -r1.26.2.5
  --- mod_deflate.c	4 Apr 2003 00:40:58 -0000	1.26.2.4
  +++ mod_deflate.c	17 May 2003 18:27:43 -0000	1.26.2.5
  @@ -340,6 +340,12 @@
               encoding = apr_table_get(r->err_headers_out, "Content-Encoding");
           }
   
  +        if (r->content_encoding) {
  +            encoding = encoding ? apr_pstrcat(r->pool, encoding, ",",
  +                                              r->content_encoding, NULL)
  +                                : r->content_encoding;
  +        }
  +
           if (encoding) {
               const char *tmp = encoding;
   
  
  
  

Mime
View raw message