Fix build warnings and add changelog entry for evhttp patches.

svn:r1424

diff --git a/ChangeLog b/ChangeLog
index 9238946a3fea2d4d4a092a1bc0e07a1ee48ac4e1..ad9665c5ad40c382047003829db9ad0425daa3ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Changes in 2.0.3-alpha:
  o Fix a rare crash bug in evdns.
  o Have bufferevent_socket_connect() with no arguments put a bufferevent into connecting mode.
  o Support sendfile on Solaris: patch from Caitlin Mercer.
+ o New functions to explicitly reference a socket used by an evhttp object. Patches from David Reiss.
 
 
 Changes in 2.0.2-alpha:

diff --git a/http.c b/http.c
index 8fc1e7d3bf229ad0c6d660a146c4fdb08311271b..aa631983c9096c21e47c64d1160f0c45e3c9c410 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2394,7 +2394,7 @@ struct evhttp_bound_socket *
 evhttp_bind_socket_with_handle(struct evhttp *http, const char *address, ev_uint16_t port)
 {
        evutil_socket_t fd;
-       int res;
+       struct evhttp_bound_socket *bound;
 
        if ((fd = bind_socket(address, port, 1 /*reuse*/)) == -1)
                return (NULL);
@@ -2405,8 +2405,7 @@ evhttp_bind_socket_with_handle(struct evhttp *http, const char *address, ev_uint
                return (NULL);
        }
 
-       struct evhttp_bound_socket *bound =
-               evhttp_accept_socket_with_handle(http, fd);
+       bound = evhttp_accept_socket_with_handle(http, fd);
 
        if (bound != NULL) {
                event_debug(("Bound to port %d - Awaiting connections ... ",