From: Bill Stoddard <stoddard@apache.org>
Date: Thu, 21 Sep 2000 22:44:51 +0000 (+0000)
Subject: Fix error in setting bytes_sent. Need more time to think about the other problem
X-Git-Tag: APACHE_2_0_ALPHA_7~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=964740fd45128e2ec44dc6bbddc719ab92c3211a;p=apache

Fix error in setting bytes_sent. Need more time to think about the other problem
noted in this commit. Thanks Jeff!


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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index f855e0a6c5..d3d8ad2879 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -3152,8 +3152,12 @@ static int core_filter(ap_filter_t *f, ap_bucket_brigade *b)
               * the bucket by definition represents the unfiltered contents
               * of a file. Thus it is acceptable to use apr_sendfile().
               */
-             rv = send_the_file(e->data, e->offset, e->length, r, &bytes_sent);
+             rv = send_the_file(e->data, e->offset, e->length, r, &written);
           
+             /* Returning on APR_SUCCESS is not the correct behaviour as there
+              * may be other buckets... Need to think about this awhile before
+              * I change it. wgs
+              */
              if (rv == APR_SUCCESS) {
                  ap_brigade_destroy(b);
                  return APR_SUCCESS;