From d582000e37054ed2028679a3a3d26b904a8939ee Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 6 Dec 2007 04:35:39 +0000 Subject: [PATCH] r15167@tombo: nickm | 2007-12-05 23:35:30 -0500 Backport: Apply patch from bug 1841036: set the base of the correct event in evhttp_connection_start_detectclose() svn:r570 --- ChangeLog | 1 + http.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d32c91e3..1c07c16e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Changes in current version: o provide event_reinit() to reintialize an event_base after fork o small improvements to evhttp documentation o always generate Date and Content-Length headers for HTTP/1.1 replies + o set the correct event base for HTTP close events Changes in 1.4.0-beta: diff --git a/http.c b/http.c index c7ac1404..a52c6575 100644 --- a/http.c +++ b/http.c @@ -943,7 +943,7 @@ evhttp_connection_start_detectclose(struct evhttp_connection *evcon) event_del(&evcon->close_ev); event_set(&evcon->close_ev, evcon->fd, EV_READ, evhttp_detect_close_cb, evcon); - EVHTTP_BASE_SET(evcon, &evcon->ev); + EVHTTP_BASE_SET(evcon, &evcon->close_ev); event_add(&evcon->close_ev, NULL); }