From: Niels Provos <provos@gmail.com>
Date: Sat, 18 Nov 2006 08:51:12 +0000 (+0000)
Subject: make regression test work for poll and select
X-Git-Tag: release-2.0.1-alpha~694
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31ba30abfee720e49c19e7a4790854cfbe0e9d5e;p=libevent

make regression test work for poll and select


svn:r265
---

diff --git a/http.c b/http.c
index 9a09294f..32895fc5 100644
--- a/http.c
+++ b/http.c
@@ -1190,6 +1190,9 @@ evhttp_send_error(struct evhttp_request *req, int error, const char *reason)
 
 	struct evbuffer *buf = evbuffer_new();
 
+	/* close the connection on error */
+	evhttp_add_header(req->output_headers, "Connection", "close");
+
 	evhttp_response_code(req, error, reason);
 
 	evbuffer_add_printf(buf, fmt, error, reason);
diff --git a/test/regress_http.c b/test/regress_http.c
index 9ebf24d0..d5166fbb 100644
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -163,7 +163,7 @@ http_errorcb(struct bufferevent *bev, short what, void *arg)
 void
 http_basic_cb(struct evhttp_request *req, void *arg)
 {
-	event_debug((stderr, "%s: called\n", __func__));
+	event_debug(("%s: called\n", __func__));
 
 	struct evbuffer *evb = evbuffer_new();
 	evbuffer_add_printf(evb, "This is funny");
@@ -380,7 +380,7 @@ http_post_test(void)
 void
 http_post_cb(struct evhttp_request *req, void *arg)
 {
-	event_debug((stderr, "%s: called\n", __func__));
+	event_debug(("%s: called\n", __func__));
 
 	/* Yes, we are expecting a post request */
 	if (req->type != EVHTTP_REQ_POST) {
@@ -447,6 +447,7 @@ http_failure_readcb(struct bufferevent *bev, void *arg)
 	const char *what = "400 Bad Request";
 	if (evbuffer_find(bev->input, what, strlen(what)) != NULL) {
 		test_ok = 2;
+		bufferevent_disable(bev, EV_READ);
 		event_loopexit(NULL);
 	}
 }