From 2821152f7fde5accd587ceaf5c33ee14db8caf07 Mon Sep 17 00:00:00 2001
From: Niels Provos <provos@gmail.com>
Date: Tue, 19 Aug 2008 11:38:32 +0000
Subject: [PATCH] from trunk: Fix a bug where headers arriving in multiple
 packets were not parsed; fix from Jiang Hong; test by me.

svn:r929
---
 ChangeLog           |  3 +++
 http.c              |  1 +
 test/regress_http.c | 23 ++++++++++++++++++-----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f05e7da..f0ef72f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Changes in 1.4.7-stable:
+ o Fix a bug where headers arriving in multiple packets were not parsed; fix from Jiang Hong; test by me.
+	
 Changes in 1.4.6-stable:
  o evutil.h now includes <stdarg.h> directly
  o switch all uses of [v]snprintf over to evutil
diff --git a/http.c b/http.c
index c45af681..38a89b66 100644
--- a/http.c
+++ b/http.c
@@ -1577,6 +1577,7 @@ evhttp_read_firstline(struct evhttp_connection *evcon,
 		return;
 	}
 
+	evcon->state = EVCON_READING_HEADERS;
 	evhttp_read_header(evcon, req);
 }
 
diff --git a/test/regress_http.c b/test/regress_http.c
index 7c7149dc..7dc763cf 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -289,9 +289,20 @@ http_chunked_cb(struct evhttp_request *req, void *arg)
 	event_once(-1, EV_TIMEOUT, http_chunked_trickle_cb, state, &when);
 }
 
+static void
+http_complete_write(int fd, short what, void *arg)
+{
+	struct bufferevent *bev = arg;
+	const char *http_request = "host\r\n"
+	    "Connection: close\r\n"
+	    "\r\n";
+	bufferevent_write(bev, http_request, strlen(http_request));
+}
+
 static void
 http_basic_test(void)
 {
+	struct timeval tv;
 	struct bufferevent *bev;
 	int fd;
 	const char *http_request;
@@ -314,17 +325,19 @@ http_basic_test(void)
 	bev = bufferevent_new(fd, http_readcb, http_writecb,
 	    http_errorcb, NULL);
 
+	/* first half of the http request */
 	http_request =
 	    "GET /test HTTP/1.1\r\n"
-	    "Host: somehost\r\n"
-	    "Connection: close\r\n"
-	    "\r\n";
+	    "Host: some";
 
 	bufferevent_write(bev, http_request, strlen(http_request));
+	timerclear(&tv);
+	tv.tv_usec = 10000;
+	event_once(-1, EV_TIMEOUT, http_complete_write, bev, &tv);
 	
 	event_dispatch();
 
-	if (test_ok != 2) {
+	if (test_ok != 3) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
 	}
@@ -354,7 +367,7 @@ http_basic_test(void)
 
 	evhttp_free(http);
 	
-	if (test_ok != 4) {
+	if (test_ok != 5) {
 		fprintf(stdout, "FAILED\n");
 		exit(1);
 	}