Remove the offset field from ap_bucket type. This is a file bucket

specific value, and therefore it belongs in the ap_bucket_file type,
which was also created with this commit.  ap_bucket needs to be as generic
as possible to make it easily extensible, which means we have to keep
the generic ap_bucket type very separate from ap_bucket_foo.

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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 2c3329dda57d752929d4d4dbfc9b5ec65722330f..9f5fa5feb949bf4c4401d99696dc21fcd4cde86e 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -3382,10 +3382,11 @@ static int core_output_filter(ap_filter_t *f, ap_bucket_brigade *b)
                 break;
             }
             else if (e->type == AP_BUCKET_FILE) {
+                ap_bucket_file *a = e->data;
                 /* Assume there is at most one AP_BUCKET_FILE in the brigade */
-                fd = e->data;
+                fd = a->fd;
                 flen = e->length;
-                foffset = e->offset;
+                foffset = a->offset;
             }
             else {
                 const char *str;