Merge branch 'http_small_tweaks'

Conflicts:
	http-internal.h

diff --cc http-internal.h
index 073dd48888662bc8f6048d96db152755b767bd6b,e9b296f756b6b125f6e95f25ebdb27ee079dffb5..0a07643fa3d43f16ec298f1f6bcb3a9559ce9776
--- 1/http-internal.h
--- 2/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;

diff --cc http.c
Simple merge