1 files changed, 30 insertions, 10 deletions

diff --git a/ot_http.c b/ot_http.c
index 36819c7..2216453 100644
--- a/ot_http.c
+++ b/ot_http.c
@@ -24,6 +24,7 @@
 #include "ot_scan.h"
 #include "ot_event.h"
 #include "ot_fdstate.h"
+#include "ot_vector.h"
 #include "ot_fmt.h"
 #include "ot_stats.h"
 #include "ot_urlencoded.h"
@@ -233,7 +234,6 @@ static ssize_t http_handle_stats(const int64_t sock, struct ot_workstruct *ws, c
                                               {"scrp", TASK_STATS_SCRAPE},
                                               {"udp4", TASK_STATS_UDP},
                                               {"tcp4", TASK_STATS_TCP},
-                                              {"busy", TASK_STATS_BUSY_NETWORKS},
                                               {"torr", TASK_STATS_TORRENTS},
                                               {"fscr", TASK_STATS_FULLSCRAPE},
                                               {"s24s", TASK_STATS_SLASH24S},
@@ -418,13 +418,15 @@ static ssize_t http_handle_fullscrape(const int64_t sock, struct ot_workstruct *
 }
 #endif
 
+static int compare_hash(const void *left, const void *right) { return memcmp(left, right, sizeof(ot_hash)); }
+
 static ssize_t http_handle_scrape(const int64_t sock, struct ot_workstruct *ws, char *read_ptr) {
   static const ot_keywords keywords_scrape[] = {{"info_hash", 1}, {NULL, -3}};
 
   ot_hash *multiscrape_buf = (ot_hash *)ws->request;
   char    *reply           = ws->reply;
   int      scanon          = 1;
-  size_t   numwant         = 0;
+  size_t   i, unique, numwant = 0;
 
   /* This is to hack around stupid clients that send "scrape ?info_hash" */
   if (read_ptr[-1] != '?') {
@@ -461,6 +463,14 @@ static ssize_t http_handle_scrape(const int64_t sock, struct ot_workstruct *ws,
   if (numwant > OT_MAXMULTISCRAPE_COUNT)
     numwant = OT_MAXMULTISCRAPE_COUNT;
 
+  /* A bencoded dictionary has its keys in order and names each one once, so
+     the answer cannot just follow the order the client asked in */
+  qsort(multiscrape_buf, numwant, sizeof(ot_hash), compare_hash);
+  for (i = unique = 1; i < numwant; ++i)
+    if (memcmp(multiscrape_buf[i], multiscrape_buf[unique - 1], sizeof(ot_hash)))
+      memcpy(multiscrape_buf[unique++], multiscrape_buf[i], sizeof(ot_hash));
+  numwant = unique;
+
   /* Enough for http header + whole scrape string */
   return_tcp_scrape_for_torrent((const ot_hash *)multiscrape_buf, numwant, &reply, ws->outbuf + G_OUTBUF_SIZE);
   ws->reply_size = reply - ws->reply;
@@ -727,6 +737,24 @@ ssize_t http_handle_request(const int64_t sock, struct ot_workstruct *ws) {
   /* Tell subroutines where to put reply data */
   ws->reply = ws->outbuf + SUCCESS_HTTP_HEADER_LENGTH;
 
+  /* Find out if the client wants to keep this connection alive, before any
+     subroutine gets to answer: an error reply finishes with the connection
+     on its way out, and ws outlives the connection it was serving */
+  ws->keep_alive = 0;
+#ifdef WANT_KEEPALIVE
+  if ((write_ptr = http_header(ws->request, ws->header_size, "connection")) && (*write_ptr == 'K' || *write_ptr == 'k'))
+    ws->keep_alive = 1;
+#endif
+  {
+    struct http_data *connection = fdstate_cookie(sock);
+    if (connection) {
+      if (ws->keep_alive)
+        connection->flag |= STRUCT_HTTP_FLAG_KEEPALIVE;
+      else
+        connection->flag &= ~STRUCT_HTTP_FLAG_KEEPALIVE;
+    }
+  }
+
   /* This one implicitely tests strlen < 5, too -- remember, it is \n terminated */
   if (memcmp(read_ptr, "GET /", 5))
     HTTPERROR_400;
@@ -763,14 +791,6 @@ ssize_t http_handle_request(const int64_t sock, struct ot_workstruct *ws) {
   else
     HTTPERROR_404;
 
-  /* Find out if the client wants to keep this connection alive */
-  ws->keep_alive = 0;
-#ifdef WANT_KEEPALIVE
-  read_ptr = http_header(ws->request, ws->header_size, "connection");
-  if (read_ptr && (*read_ptr == 'K' || *read_ptr == 'k'))
-    ws->keep_alive = 1;
-#endif
-
   /* If routines handled sending themselves, just return */
   if (ws->reply_size == -2)
     return 0;