Merge with main repo.

2 files changed, 9 insertions, 3 deletions

diff --git a/src/IO/http.c b/src/IO/http.c
index 1be94e0d..8c7dcef1 100644
--- a/src/IO/http.c
+++ b/src/IO/http.c
@@ -189,7 +189,7 @@ static void Http_connect_queued_sockets(HostConnection_t *hc)
             a_Chain_fcb(OpSend, sd->Info, &sd->SockFD, "FD");
             Http_send_query(sd->Info, sd);
             sd->connected_to = hc->host;
-            dList_append(hc->active_fds, (void *)sd->SockFD);
+            dList_append(hc->active_fds, INT2VOIDP(sd->SockFD));
          }
       }
    }
@@ -214,7 +214,7 @@ static void Http_socket_free(int SKey)
       } else {
          if (S->connected_to) {
             HostConnection_t *hc = Http_host_connection_get(S->connected_to);
-            dList_remove_fast(hc->active_fds, (void *)S->SockFD);
+            dList_remove_fast(hc->active_fds, INT2VOIDP(S->SockFD));
             Http_connect_queued_sockets(hc);
             if (dList_length(hc->active_fds) == 0)
                Http_host_connection_remove(hc);
@@ -728,7 +728,7 @@ void a_Http_ccc(int Op, int Branch, int Dir, ChainLink *Info,
          case OpSend:
             if (Data2) {
                if (!strcmp(Data2, "FD")) {
-                  Info->LocalKey = (void *)*(int*)Data1;
+                  Info->LocalKey = INT2VOIDP(*(int*)Data1);
                   a_Chain_bcb(OpSend, Info, Data1, Data2);
                } else if (!strcmp(Data2, "reply_complete")) {
                   int fd = VOIDP2INT(Info->LocalKey);
diff --git a/src/url.c b/src/url.c
index c38f182c..102e776f 100644
--- a/src/url.c
+++ b/src/url.c
@@ -691,6 +691,12 @@ static uint_t Url_host_public_internal_dots(const char *host)
           * in February 2014 and picking out those where it was simplest for
           * them to describe the situation by beginning with a "*.[tld]" rule
           * or every rule was "[something].[tld]".
+          *
+          * TODO: Consider the old publicsuffix code again. This TLD list has
+          * shrunk and shrunk over the years, and has become a poorer and
+          * poorer approximation of administrative boundaries -- and, as of
+          * mid-2014, even NZ and UK are allowing domains to be registered
+          * at the second level, which doesn't leave much.
           */
          const char *const tlds[] = {"bd","bn","ck","cy","er","et","fj","fk",
                                      "gu","il","jm","ke","kh","kw","mm","mz",