From acf4516b12712c0a23659454b6cfebd0ba61926c Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Thu, 29 Aug 2013 13:35:06 +0100
Subject: [PATCH] remove message type (PIPED|BUFFERD) because when I use mmap
 for file io I will always have a memory address, so its kind of buffered.

---
 include/http/message.h         | 8 --------
 include/http/response.h        | 9 ++++-----
 src/http/response/304.c        | 1 -
 src/http/response/403.c        | 1 -
 src/http/response/404.c        | 1 -
 src/http/response/login_form.c | 2 --
 src/http/response/randval.c    | 2 --
 src/http/response/session.c    | 2 --
 8 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/include/http/message.h b/include/http/message.h
index 2161793..afba548 100644
--- a/include/http/message.h
+++ b/include/http/message.h
@@ -28,19 +28,11 @@
 #include "hash.h"
 #include "stream.h"
 
-typedef enum e_HttpMessageType {
-	HTTP_MESSAGE_BUFFERED=0,
-	HTTP_MESSAGE_PIPED
-} HttpMessageType;
-
-
 CLASS(HttpMessage) {
 	char *          version;
 
 	Hash            header;
 
-	HttpMessageType type;
-	Stream          handle;
 	char *          body;
 	int             nbody;
 	int             dbody;
diff --git a/include/http/response.h b/include/http/response.h
index 98818ff..ea89240 100644
--- a/include/http/response.h
+++ b/include/http/response.h
@@ -30,6 +30,7 @@
 #include "class.h"
 #include "http/message.h"
 #include "session.h"
+#include "asset.h"
 
 
 CLASS(HttpResponse) {
@@ -43,16 +44,14 @@ HttpResponse httpResponse304(
 		const char *, size_t,
 		const char *, size_t,
 		const char *, size_t);
-HttpResponse httpResponse404();
 HttpResponse httpResponse403();
+HttpResponse httpResponse404();
+HttpResponse httpResponse500();
 HttpResponse httpResponseMe();
 HttpResponse httpResponseLoginForm();
 HttpResponse httpResponseRandval(time_t, int);
 HttpResponse httpResponseSession(Session);
-HttpResponse httpResponseAsset(
-		const char *,
-		const char *, size_t,
-		const char *, size_t);
+HttpResponse httpResponseAsset(Asset);
 
 #endif // __HTTP_RESPONSE_H__
 
diff --git a/src/http/response/304.c b/src/http/response/304.c
index 81519a7..c3223f0 100644
--- a/src/http/response/304.c
+++ b/src/http/response/304.c
@@ -43,7 +43,6 @@ httpResponse304(
 	response = new(HttpResponse, "HTTP/1.1", 304, "Not Modified");
 	message  = (HttpMessage)response;
 
-	message->type  = HTTP_MESSAGE_BUFFERED;
 	message->nbody = 0;
 	message->body  = NULL;
 
diff --git a/src/http/response/403.c b/src/http/response/403.c
index b1ef08f..7321bcc 100644
--- a/src/http/response/403.c
+++ b/src/http/response/403.c
@@ -41,7 +41,6 @@ httpResponse403()
 	response = new(HttpResponse, "HTTP/1.1", 403, "Forbidden");
 	message  = (HttpMessage)response;
 
-	message->type  = HTTP_MESSAGE_BUFFERED;
 	message->nbody = 0;
 	message->body  = NULL;
 
diff --git a/src/http/response/404.c b/src/http/response/404.c
index cab83ad..0dc5120 100644
--- a/src/http/response/404.c
+++ b/src/http/response/404.c
@@ -55,7 +55,6 @@ httpResponse404()
 	hashAdd(message->header,
 			new(HttpHeader, CSTRA("Content-Type"), CSTRA("text/html")));
 
-	message->type  = HTTP_MESSAGE_BUFFERED;
 	message->nbody = sizeof(RESP_DATA) - 1;
 	message->body  = memMalloc(sizeof(RESP_DATA));
 	memcpy(message->body, RESP_DATA, sizeof(RESP_DATA));
diff --git a/src/http/response/login_form.c b/src/http/response/login_form.c
index e136e28..9aa2ac1 100644
--- a/src/http/response/login_form.c
+++ b/src/http/response/login_form.c
@@ -52,8 +52,6 @@ httpResponseLoginForm()
 	hashAdd(message->header,
 			new(HttpHeader, CSTRA("Content-Type"), CSTRA("text/html")));
 
-	message->type  = HTTP_MESSAGE_BUFFERED;
-
 	message->nbody = sizeof(RESP_DATA)-1;
 	message->body  = memMalloc(message->nbody);
 	memcpy(message->body, RESP_DATA, message->nbody);
diff --git a/src/http/response/randval.c b/src/http/response/randval.c
index 39fff37..55f985f 100644
--- a/src/http/response/randval.c
+++ b/src/http/response/randval.c
@@ -52,8 +52,6 @@ httpResponseRandval(time_t ctime, int value)
 	hashAdd(message->header,
 			new(HttpHeader, CSTRA("Content-Type"), CSTRA("application/json")));
 
-	message->type  = HTTP_MESSAGE_BUFFERED;
-
 	remaining = 10 - (time(NULL) - ctime);
 
 	nbuf = sprintf(buffer, RESP_DATA, ctime, remaining, value);
diff --git a/src/http/response/session.c b/src/http/response/session.c
index 4d2941e..5aae94a 100644
--- a/src/http/response/session.c
+++ b/src/http/response/session.c
@@ -52,8 +52,6 @@ httpResponseSession(Session session)
 	hashAdd(message->header,
 			new(HttpHeader, CSTRA("Content-Type"), CSTRA("application/json")));
 
-	message->type  = HTTP_MESSAGE_BUFFERED;
-
 	nbuf = sprintf(buffer, RESP_DATA,
 			(NULL != session)? session->id : 0,
 			(NULL != session)? SESSION_LIVETIME : 0,