1 files changed, 12 insertions, 7 deletions

diff --git a/src/lib/internal.h b/src/lib/internal.h
index 92b5b511..1e95698e 100644
--- a/src/lib/internal.h
+++ b/src/lib/internal.h
@@ -429,7 +429,7 @@ struct MHD_Request
    * response (which maybe shared between requests) and the IP
    * address (which persists across individual requests).
    */
-  struct MemoryPool *pool;
+  struct MemoryPool *pool; // FIXME: keep with connnection!
 
   /**
    * We allow the main application to associate some pointer with the
@@ -515,12 +515,6 @@ struct MHD_Request
 #endif /* UPGRADE_SUPPORT */
 
   /**
-   * Thread handle for this connection (if we are using
-   * one thread per connection).
-   */
-  MHD_thread_handle_ID_ pid;
-
-  /**
    * Size of @e read_buffer (in bytes).  This value indicates
    * how many bytes we're willing to read into the buffer;
    * the real buffer is one byte longer to allow for
@@ -760,6 +754,12 @@ struct MHD_Connection
   struct MHD_Request request;
 
   /**
+   * Thread handle for this connection (if we are using
+   * one thread per connection).
+   */
+  MHD_thread_handle_ID_ pid;
+
+  /**
    * Foreign address (of length @e addr_len). 
    */
   struct sockaddr_storage addr;
@@ -1218,6 +1218,11 @@ struct MHD_Daemon
    */
   struct MHD_Connection *cleanup_tail;
 
+  /**
+   * Table storing number of connections per IP
+   */
+  void *per_ip_connection_count;
+
 #ifdef EPOLL_SUPPORT
   /**
    * Head of EDLL of connections ready for processing (in epoll mode).