1 files changed, 44 insertions, 8 deletions

diff --git a/src/lib/internal.h b/src/lib/internal.h
index 4c3ceddc..4ea6528a 100644
--- a/src/lib/internal.h
+++ b/src/lib/internal.h
@@ -454,7 +454,7 @@ struct MHD_Request
    * HTTP version string (i.e. http/1.1).  Allocated
    * in pool.
    */
-  char *version;
+  char *version_s;
 
   /**
    * Close connection after sending response?
@@ -493,7 +493,6 @@ struct MHD_Request
    */
   char *colon;
 
-
   /**
    * Function used for reading HTTP request stream.
    */
@@ -515,11 +514,6 @@ struct MHD_Request
 #endif /* UPGRADE_SUPPORT */
 
   /**
-   * Foreign address (of length @e addr_len).
-   */
-  struct sockaddr_storage addr;
-
-  /**
    * Thread handle for this connection (if we are using
    * one thread per connection).
    */
@@ -741,7 +735,23 @@ struct MHD_Connection
    * Reference to the MHD_Daemon struct.
    */
   struct MHD_Daemon *daemon;
+  
+  /**
+   * We allow the main application to associate some pointer with the
+   * TCP connection (which may span multiple HTTP requests).  Here is
+   * where we store it.  (MHD does not know or care what it is).
+   * The location is given to the #MHD_NotifyConnectionCallback and
+   * also accessible via #MHD_CONNECTION_INFO_SOCKET_CONTEXT.
+   */
+  void *socket_context;
 
+#ifdef HTTPS_SUPPORT
+  /**
+   * State kept per TLS connection. Plugin-specific.
+   */
+  struct MHD_TLS_ConnectionState *tls_cs;
+#endif
+  
   /**
    * Information about the current request we are processing
    * on this connection.
@@ -749,6 +759,11 @@ struct MHD_Connection
   struct MHD_Request request;
 
   /**
+   * Foreign address (of length @e addr_len). 
+   */
+  struct sockaddr_storage addr;
+
+  /**
    * Length of the foreign address.
    */
   socklen_t addr_len;
@@ -858,7 +873,7 @@ struct MHD_Daemon
   /**
    * Closure for @e early_uri_logger_cb.
    */
-  void *early_uri_logger_cls;
+  void *early_uri_logger_cb_cls;
 
   /**
    * Function to call whenever a connection is started or
@@ -881,6 +896,17 @@ struct MHD_Daemon
    * Closure for @e unescape_cb.
    */
   void *unescape_cb_cls;
+
+  /**
+   * Pointer to master daemon (NULL if this is the master)
+   */
+  struct MHD_Daemon *master;
+
+  /**
+   * Worker daemons (one per thread)
+   */
+  struct MHD_Daemon *worker_pool;
+
   
 #if HTTPS_SUPPORT
   /**
@@ -1135,6 +1161,16 @@ struct MHD_Daemon
   unsigned int ip_connection_limit;
 
   /**
+   * Number of active parallel connections.
+   */
+  unsigned int connections;
+
+  /**
+   * Number of worker daemons
+   */
+  unsigned int worker_pool_size;
+
+  /**
    * Default timeout in seconds for idle connections.
    */
   time_t connection_default_timeout;