From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Oct 2010 16:23:10 +0000 (-0400)
Subject: Merge branch 'http_small_tweaks'
X-Git-Tag: release-2.0.9-rc~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a3b5872fe1a2fa0f67d1b435b4650d337c16c4d;p=libevent

Merge branch 'http_small_tweaks'

Conflicts:
	http-internal.h
---

2a3b5872fe1a2fa0f67d1b435b4650d337c16c4d
diff --cc http-internal.h
index 073dd488,e9b296f7..0a07643f
--- a/http-internal.h
+++ b/http-internal.h
@@@ -56,9 -54,10 +54,11 @@@ enum evhttp_connection_state 
  
  struct event_base;
  
+ /* A client or server connection. */
  struct evhttp_connection {
- 	/* we use tailq only if they were created for an http server */
 -	/* we use this tailq only if they were created for an http server */
 -	TAILQ_ENTRY(evhttp_connection) (next);
++	/* we use this tailq only if this connection was created for an http
++	 * server */
 +	TAILQ_ENTRY(evhttp_connection) next;
  
  	evutil_socket_t fd;
  	struct bufferevent *bufev;