X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=serve.c;h=c046926ba141c76fc2a6b6fb1db80e31c1c28e8c;hb=81be89e0bee5bebc478a19b317d8ef4d5f6704a9;hp=bda085f09c8e10314c2c497dbca978fd9241e7b5;hpb=ba6f0905fdb9e65c1ac5fbc79c9a4ef0b59b3e68;p=thirdparty%2Fgit.git

diff --git a/serve.c b/serve.c
index bda085f09c..c046926ba1 100644
--- a/serve.c
+++ b/serve.c
@@ -167,7 +167,8 @@ static int process_request(void)
 
 	packet_reader_init(&reader, 0, NULL, 0,
 			   PACKET_READ_CHOMP_NEWLINE |
-			   PACKET_READ_GENTLE_ON_EOF);
+			   PACKET_READ_GENTLE_ON_EOF |
+			   PACKET_READ_DIE_ON_ERR_PACKET);
 
 	/*
 	 * Check to see if the client closed their end before sending another
@@ -175,7 +176,7 @@ static int process_request(void)
 	 */
 	if (packet_reader_peek(&reader) == PACKET_READ_EOF)
 		return 1;
-	reader.options = PACKET_READ_CHOMP_NEWLINE;
+	reader.options &= ~PACKET_READ_GENTLE_ON_EOF;
 
 	while (state != PROCESS_REQUEST_DONE) {
 		switch (packet_reader_peek(&reader)) {
@@ -216,6 +217,8 @@ static int process_request(void)
 
 			state = PROCESS_REQUEST_DONE;
 			break;
+		case PACKET_READ_RESPONSE_END:
+			BUG("unexpected stateless separator packet");
 		}
 	}