From 8c46768d5bfb26f22447a53988de6ddcf39f567e Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Mon, 6 Jan 2020 21:34:55 -0500
Subject: [PATCH] [core] remove unused request_st member 'request'

---
 src/connections.c    |  2 --
 src/request.h        |  3 ---
 src/t/test_request.c | 10 ++++------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/connections.c b/src/connections.c
index f9fd82d7..9fda8fda 100644
--- a/src/connections.c
+++ b/src/connections.c
@@ -545,7 +545,6 @@ static connection *connection_init(server *srv) {
 	con->x = buffer_init();
 
 	CLEAN(request.uri);
-	CLEAN(request.request);
 	CLEAN(request.pathinfo);
 
 	CLEAN(request.orig_uri);
@@ -610,7 +609,6 @@ void connections_free(server *srv) {
 	buffer_free(con->x);
 
 		CLEAN(request.uri);
-		CLEAN(request.request);
 		CLEAN(request.pathinfo);
 
 		CLEAN(request.orig_uri);
diff --git a/src/request.h b/src/request.h
index 7d7bdbe1..35d35219 100644
--- a/src/request.h
+++ b/src/request.h
@@ -76,10 +76,7 @@ struct request_st {
     connection *con;
 
     /** HEADER */
-    /* the request-line */
-    buffer *request;
     buffer *uri;
-
     buffer *orig_uri;
 
     http_method_t  http_method;
diff --git a/src/t/test_request.c b/src/t/test_request.c
index c4880d83..c1a895de 100644
--- a/src/t/test_request.c
+++ b/src/t/test_request.c
@@ -21,7 +21,6 @@ static void test_request_connection_reset(connection *con)
     con->header_len = 0;
     con->http_status = 0;
     con->proto_default_port = 80;
-    buffer_reset(con->request.request);
     buffer_reset(con->request.orig_uri);
     buffer_reset(con->request.uri);
     array_reset_data_strings(&con->request.headers);
@@ -30,9 +29,10 @@ static void test_request_connection_reset(connection *con)
 static void run_http_request_parse(connection *con, int line, int status, const char *desc, const char *req, size_t reqlen)
 {
     unsigned short hloffsets[32];
+    char hdrs[1024];
     test_request_connection_reset(con);
-    buffer * const hdrs = con->request.request;
-    buffer_copy_string_len(hdrs, req, reqlen);
+    assert(reqlen < sizeof(hdrs));
+    memcpy(hdrs, req, reqlen);
     hloffsets[0] = 1;
     hloffsets[1] = 0;
     for (const char *n=req, *end=req+reqlen; (n=memchr(n,'\n',end-n)); ++n) {
@@ -40,7 +40,7 @@ static void run_http_request_parse(connection *con, int line, int status, const
         hloffsets[hloffsets[0]] = n - req + 1;
     }
     --hloffsets[0]; /*(ignore final blank line "\r\n" ending headers)*/
-    int http_status = http_request_parse(&con->request, hdrs->ptr, hloffsets,
+    int http_status = http_request_parse(&con->request, hdrs, hloffsets,
                                          con->proto_default_port);
     if (http_status != status) {
         fprintf(stderr,
@@ -590,7 +590,6 @@ int main (void)
     con.proto_default_port  = 80;
     con.request.conf        = &con.conf;
     con.request.con         = &con;
-    con.request.request     = buffer_init();
     con.request.orig_uri    = buffer_init();
     con.request.uri         = buffer_init();
     con.conf.errh           = srv.errh;
@@ -601,7 +600,6 @@ int main (void)
 
     test_request_http_request_parse(&con);
 
-    buffer_free(con.request.request);
     buffer_free(con.request.orig_uri);
     buffer_free(con.request.uri);
     array_free_data(&con.request.headers);