httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1572911 - /httpd/httpd/trunk/modules/filters/mod_deflate.c
Date Fri, 28 Feb 2014 10:42:47 GMT
Author: ylavic
Date: Fri Feb 28 10:42:47 2014
New Revision: 1572911

URL: http://svn.apache.org/r1572911
Log:
mod_deflate: follows up r1572896.
Be safe from successive or post end-of-stream flush buckets.

Modified:
    httpd/httpd/trunk/modules/filters/mod_deflate.c

Modified: httpd/httpd/trunk/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?rev=1572911&r1=1572910&r2=1572911&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Fri Feb 28 10:42:47 2014
@@ -1522,8 +1522,10 @@ static apr_status_t inflate_out_filter(a
             zRC = flush_libz_buffer(ctx, c, f->c->bucket_alloc, inflate,
                                     Z_SYNC_FLUSH, UPDATE_CRC);
             if (zRC == Z_STREAM_END) {
-                ctx->validation_buffer = apr_pcalloc(f->r->pool,
-                                                     VALIDATION_SIZE);
+                if (ctx->validation_buffer == NULL) {
+                    ctx->validation_buffer = apr_pcalloc(f->r->pool,
+                                                         VALIDATION_SIZE);
+                }
             }
             else if (zRC != Z_OK) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01402)



Mime
View raw message