]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
* modules/filters/mod_deflate.c
authorJoe Orton <jorton@apache.org>
Fri, 5 Oct 2018 10:43:46 +0000 (10:43 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 5 Oct 2018 10:43:46 +0000 (10:43 +0000)
  (deflate_out_filter): Fix typo setting output note. (Coverity warning)
  (deflate_in_filter): Fix redundant assignment. (clang warning)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842888 13f79535-47bb-0310-9956-ffa450edef68

modules/filters/mod_deflate.c

index ab586d27c976ff964b5db27faf73cca645ec715a..6bf3a842d3b42a13721d356fe3be0ea0281d9b2d 100644 (file)
@@ -905,7 +905,7 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
 
             if (c->note_output_name) {
                 apr_table_setn(r->notes, c->note_output_name,
-                               (ctx->stream.total_in > 0)
+                               (ctx->stream.total_out > 0)
                                 ? apr_off_t_toa(r->pool,
                                                 ctx->stream.total_out)
                                 : "-");
@@ -1366,8 +1366,6 @@ static apr_status_t deflate_in_filter(ap_filter_t *f,
             ctx->stream.next_in = (unsigned char *)data;
             ctx->stream.avail_in = (int)len;
 
-            zRC = Z_OK;
-
             if (!ctx->validation_buffer) {
                 while (ctx->stream.avail_in != 0) {
                     if (ctx->stream.avail_out == 0) {