r15214@tombo: nickm | 2008-04-17 11:47:10 -0400

 Make name_from_addr() threadsafe in http.c

svn:r713

diff --git a/ChangeLog b/ChangeLog
index de3ad26421fd91db498aaca0e560267751888665..eb32130c0b256aa4ca22418064d75a46e03b80d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,7 +65,7 @@ Changes in current version:
  o Correct the documentation on buffer printf functions.
  o Don't warn on unimplemented epoll_create(): this isn't a problem, just a reason to fall back to poll or select.
  o Correctly handle timeouts larger than 35 minutes on Linux with epoll.c.  This is probably a kernel defect, but we'll have to support old kernels anyway even if it gets fixed.
-
+ o Make name_from_addr() threadsafe in http.c
 
 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 338e6cfd0080e0eda1b17446c6efbf8236a94182..48d43201608e49271e5509e5124b829c592a7ceb 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2272,14 +2272,17 @@ evhttp_get_request_connection(
        evutil_socket_t fd, struct sockaddr *sa, socklen_t salen)
 {
        struct evhttp_connection *evcon;
-       char *hostname, *portname;
+       char *hostname = NULL, *portname = NULL;
 
        name_from_addr(sa, salen, &hostname, &portname);
        event_debug(("%s: new request from %s:%s on %d\n",
                        __func__, hostname, portname, fd));
 
        /* we need a connection object to put the http request on */
-       if ((evcon = evhttp_connection_new(hostname, atoi(portname))) == NULL)
+       evcon = evhttp_connection_new(hostname, atoi(portname));
+       event_free(hostname);
+       event_free(portname);
+       if (evcon == NULL)
                return (NULL);
 
        /* associate the base if we have one*/
@@ -2379,9 +2382,8 @@ name_from_addr(struct sockaddr *sa, socklen_t salen,
     char **phost, char **pport)
 {
 #ifdef HAVE_GETNAMEINFO
-       /* XXXX not threadsafe. */
-       static char ntop[NI_MAXHOST];
-       static char strport[NI_MAXSERV];
+       char ntop[NI_MAXHOST];
+       char strport[NI_MAXSERV];
        int ni_result;
 
        if ((ni_result = getnameinfo(sa, salen,
@@ -2391,10 +2393,11 @@ name_from_addr(struct sockaddr *sa, socklen_t salen,
                        event_err(1, "getnameinfo failed");
                else
                        event_errx(1, "getnameinfo failed: %s", gai_strerror(ni_result));
+               return;
        }
- 
-       *phost = ntop;
-       *pport = strport;
+
+       *phost = event_strdup(ntop);
+       *pport = event_strdup(strport);
 #else
        /* XXXX */
 #endif