From: Cliff Woolley <jwoolley@apache.org>
Date: Tue, 27 Feb 2001 21:02:15 +0000 (+0000)
Subject: Update to reflect the absence of the apr_bucket_shared
X-Git-Tag: 2.0.14~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa49b7942b99a7763fad80085bb48f8abd6d96cd;p=apache

Update to reflect the absence of the apr_bucket_shared
struct and the newly-added start field of the apr_bucket struct


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

diff --git a/include/http_protocol.h b/include/http_protocol.h
index accbd10913..10250e04e0 100644
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -561,7 +561,7 @@ struct ap_bucket_error {
     /** The error code */
     int status;
     /** The error string */
-    const char    *start;
+    const char    *data;
 };
 
 AP_DECLARE_DATA extern const apr_bucket_type_t ap_bucket_type_error;
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index ee1234a10f..a42e436ac6 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -3219,8 +3219,7 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b)
              */
             else if (APR_BUCKET_IS_FILE(e)
                      && (e->length >= AP_MIN_SENDFILE_BYTES)) {
-                apr_bucket_shared *s = e->data;
-                apr_bucket_file *a = s->data;
+                apr_bucket_file *a = e->data;
     
                 /* We can't handle more than one file bucket at a time
                  * so we split here and send the file we have already
@@ -3233,7 +3232,7 @@ static apr_status_t core_output_filter(ap_filter_t *f, apr_bucket_brigade *b)
     
                 fd = a->fd;
                 flen = e->length;
-                foffset = s->start;
+                foffset = e->start;
             }
             else {
                 const char *str;
diff --git a/server/error_bucket.c b/server/error_bucket.c
index 071119882b..86eaacecbf 100644
--- a/server/error_bucket.c
+++ b/server/error_bucket.c
@@ -78,11 +78,10 @@ AP_DECLARE(apr_bucket *) ap_bucket_error_make(apr_bucket *b, int error,
         return NULL;
     }
     h->status = error;
-    if (buf) {
-        h->start = apr_pstrdup(p, buf);
-    }
+    h->data = (buf) ? apr_pstrdup(p, buf) : NULL;
 
     b->length = 0;
+    b->start  = 0;
     b->type = &ap_bucket_type_error;
     b->data = h;
     return b;