httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_deflate.c
Date Wed, 13 Aug 2003 21:14:13 GMT
stas        2003/08/13 14:14:13

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               modules/filters Tag: APACHE_2_0_BRANCH mod_deflate.c
  Log:
  backporting from 2.1:
    *) Fix mod_deflate so that it does not call deflate() without checking
       first whether it has something to deflate. (Currently this causes
       deflate to generate a fatal error according to the zlib spec.)
       PR 22259.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.146 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.145
  retrieving revision 1.988.2.146
  diff -u -r1.988.2.145 -r1.988.2.146
  --- CHANGES	8 Aug 2003 09:37:53 -0000	1.988.2.145
  +++ CHANGES	13 Aug 2003 21:14:13 -0000	1.988.2.146
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.48
   
  +  *) Fix mod_deflate so that it does not call deflate() without checking
  +     first whether it has something to deflate. (Currently this causes
  +     deflate to generate a fatal error according to the zlib spec.)
  +     PR 22259. [Stas Bekman]
  +
     *) mod_ssl: Fix FakeBasicAuth for subrequest.  Log an error when an
        identity spoof is encountered.
        [Sander Striker]
  
  
  
  1.751.2.429 +1 -8      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.428
  retrieving revision 1.751.2.429
  diff -u -r1.751.2.428 -r1.751.2.429
  --- STATUS	13 Aug 2003 21:09:38 -0000	1.751.2.428
  +++ STATUS	13 Aug 2003 21:14:13 -0000	1.751.2.429
  @@ -65,13 +65,6 @@
     [ please place file names and revisions from HEAD here, so it is easy to
       identify exactly what the proposed changes are! ]
   
  -    * Fix mod_deflate so that it does not call deflate() without checking
  -      first whether it has something to deflate. (Currently this causes
  -      deflate to generate a fatal error according to the zlib spec.)
  -      PR 22259. [Stas Bekman]
  -      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/filters/mod_deflate.c.diff?r1=1.35&r2=1.36
  -      +1: stas, jwoolley, nd
  -
       * Correct the code in ap_check_cache_feshness to check max_age, smax_age,
         and expires correctly. This is a RFC 2616 compliance issue.
         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/experimental/cache_util.c.diff?r1=1.26&r2=1.27
  
  
  
  No                   revision
  No                   revision
  1.26.2.7  +5 -4      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.6
  retrieving revision 1.26.2.7
  diff -u -r1.26.2.6 -r1.26.2.7
  --- mod_deflate.c	28 Jul 2003 02:05:57 -0000	1.26.2.6
  +++ mod_deflate.c	13 Aug 2003 21:14:13 -0000	1.26.2.7
  @@ -530,10 +530,11 @@
           if (APR_BUCKET_IS_FLUSH(e)) {
               apr_bucket *bkt;
               apr_status_t rv;
  -
  -            zRC = deflate(&(ctx->stream), Z_SYNC_FLUSH);
  -            if (zRC != Z_OK) {
  -                return APR_EGENERAL;
  +            if (ctx->stream.avail_in > 0) {
  +                zRC = deflate(&(ctx->stream), Z_SYNC_FLUSH);
  +                if (zRC != Z_OK) {
  +                    return APR_EGENERAL;
  +                }
               }
   
               ctx->stream.next_out = ctx->buffer;
  
  
  

Mime
View raw message