From beaa342af6966a6acb7780644ff6285c85d5f641 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 19 Sep 2011 21:11:16 +0200
Subject: waitress: muke sure chunked handler reads \r\n

---
 src/libwaitress/waitress.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libwaitress/waitress.c b/src/libwaitress/waitress.c
index 2101e2a..5e3fd41 100644
--- a/src/libwaitress/waitress.c
+++ b/src/libwaitress/waitress.c
@@ -539,8 +539,12 @@ static WaitressHandlerReturn_t WaitressHandleChunked (WaitressHandle_t *waith,
 						waith->request.chunkSize) == WAITRESS_HANDLER_ABORTED) {
 					return WAITRESS_HANDLER_ABORTED;
 				}
-				/* FIXME: skip trailing \r\n */
-				content += waith->request.chunkSize+2;
+				content += waith->request.chunkSize;
+				if (content[0] == '\r' && content[1] == '\n') {
+					content += 2;
+				} else {
+					return WAITRESS_HANDLER_ERR;
+				}
 				waith->request.chunkSize = 0;
 			} else {
 				if (WaitressHandleIdentity (waith, content, remaining) ==
-- 
cgit v1.2.3