r15166@tombo: nickm | 2007-12-05 23:35:10 -0500

 Apply patch from bug 1841036: set the base of the correct event in evhttp_connection_start_detectclose()

svn:r571

diff --git a/ChangeLog b/ChangeLog
index bef5d050fd84483cf27d4464c852b2b02517f2b8..49e584f2d01d28c7171f8dce7d1cd5f5f69721a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,7 @@ Changes in current version:
  o move EV_PERSIST handling out of the event backends
  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:
  o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.

diff --git a/http.c b/http.c
index 38c0379deb6c58d97f3f7e2dbbec31af6cbc5eba..77bfb8f1184c157050adc334858fc11cc068e100 100644 (file)
--- a/http.c
+++ b/http.c
@@ -941,7 +941,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);
 }