1 files changed, 26 insertions, 6 deletions

diff --git a/include/httpd.h b/include/httpd.h
index 52cc8df16c..45120988dc 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -80,6 +80,7 @@
 #include "apr_pools.h"
 #include "apr_time.h"
 #include "apr_network_io.h"
+#include "apr_buckets.h"
 
 #include "pcreposix.h"
 
@@ -327,7 +328,6 @@ extern "C" {
  */
 #define AP_MAX_SENDFILE 16777216
 
-
 /**
  * Special Apache error codes. These are basically used
  *  in http_main.c so we can keep track of various errors.
@@ -914,15 +914,11 @@ struct conn_rec {
 
     /* Information about the connection itself */
 
-    /** Connection to the client */
-    apr_socket_t *client_socket;
-
-    /* Who is the client? */
-
     /** local address */
     apr_sockaddr_t *local_addr;
     /** remote address */
     apr_sockaddr_t *remote_addr;
+
     /** Client's IP address */
     char *remote_ip;
     /** Client's DNS name, if known.  NULL if DNS hasn't been checked,
@@ -1058,6 +1054,30 @@ struct server_rec {
     int limit_req_fields; 
 };
 
+typedef struct core_output_filter_ctx {
+    apr_bucket_brigade *b;
+    apr_pool_t *subpool; /* subpool of c->pool used for data saved after a
+                          * request is finished
+                          */
+    int subpool_has_stuff; /* anything in the subpool? */
+} core_output_filter_ctx_t;
+ 
+typedef struct core_filter_ctx {
+    apr_bucket_brigade *b;
+    int first_line;
+} core_ctx_t;
+ 
+typedef struct core_net_rec {
+    /** Connection to the client */
+    apr_socket_t *client_socket;
+
+    /** connection record */
+    conn_rec *c;
+ 
+    core_output_filter_ctx_t *out_ctx;
+    core_ctx_t *in_ctx;
+} core_net_rec;
+
 /**
  * Examine a field value (such as a media-/content-type) string and return
  * it sans any parameters; e.g., strip off any ';charset=foo' and the like.