We never actually store anything in input_data (from the conn_rec), so it

doesn't make much sense to check to see if there is something there.  This
removes the input_data brigade from the conn_rec altogether.  There is no
good reason for a filter to be accessing a bucket brigade from within the
conn_rec.  This shouldn't be here anymore, just like the output_filter
shouldn't be storing the data in the conn_rec.

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

diff --git a/include/httpd.h b/include/httpd.h
index 993e45c583467c1816ea92e64db79a7db4ed1143..fe63ab82be7d155aa14c94fb0bba6486c9d84eb1 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -77,7 +77,6 @@ extern "C" {
 
 /* Headers in which EVERYONE has an interest... */
 #include "ap_config.h"
-#include "ap_buckets.h"
 #include "os.h"
 #include "apr_general.h"
 #include "apr_lib.h"
@@ -904,9 +903,6 @@ struct conn_rec {
     /** A list of input filters to be used for this request 
      *  @defvar ap_filter_t *filters */
     struct ap_filter_t *input_filters;
-    /** Location to store data read from the client.
-     *  @defvar ap_bucket_brigade *input_data */
-    struct ap_bucket_brigade *input_data;
     /** A list of output filters to be used for this connection
      *  @defvar ap_filter_t *filters */
     struct ap_filter_t *output_filters;

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 978191189f96165d7ff83a2a036cc03f0fa0f9e1..6fc08d71ddeb7b8e7a040d49dca144e67add007d 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -956,12 +956,7 @@ static int getline(char *s, int n, conn_rec *c, int fold)
     ap_bucket_brigade *b;
     ap_bucket *e;
 
-    if (!c->input_data) {
-        b = ap_brigade_create(c->pool);
-    }
-    else {
-        b = c->input_data;
-    }
+    b = ap_brigade_create(c->pool);
 
     while (1) {
         if (AP_BRIGADE_EMPTY(b)) {