[GNUnet-SVN] r37180 - in libmicrohttpd: . doc src/include src/microhttpd

[gnunet]

Author: grothoff
Date: 2016-05-17 13:37:54 +0200 (Tue, 17 May 2016)
New Revision: 37180

Modified:
   libmicrohttpd/ChangeLog
   libmicrohttpd/doc/libmicrohttpd.texi
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/microhttpd/connection.c
Log:
add MHD_CONNECTION_INFO_CONNECTION_SUSPENDED

Modified: libmicrohttpd/ChangeLog
===================================================================
--- libmicrohttpd/ChangeLog     2016-05-16 21:18:47 UTC (rev 37179)
+++ libmicrohttpd/ChangeLog     2016-05-17 11:37:54 UTC (rev 37180)
@@ -1,3 +1,7 @@
+Tue May 17 13:32:21 CEST 2016
+       Allow clients to determine whether a connection is suspended;
+       introduces MHD_CONNECTION_INFO_CONNECTION_SUSPENDED. -CG/FC
+
 Sun May 15 12:17:25 CEST 2016
        Fix handling system or process resource limit exhaustion upon
        accept(). -CG/CP

Modified: libmicrohttpd/doc/libmicrohttpd.texi
===================================================================
--- libmicrohttpd/doc/libmicrohttpd.texi        2016-05-16 21:18:47 UTC (rev 
37179)
+++ libmicrohttpd/doc/libmicrohttpd.texi        2016-05-17 11:37:54 UTC (rev 
37180)
@@ -2119,6 +2119,10 @@
 on a connection that was not previously suspended will result in
 undefined behavior.
 
+You can check whether a connection is currently suspended using
address@hidden by querying for
address@hidden
+
 @table @var
 @item connection
 the connection to resume
@@ -2637,6 +2641,11 @@
 callbacks are invoked in between, those might be used to set different
 values for TCP-CORK and TCP-NODELAY in the meantime.
 
address@hidden MHD_CONNECTION_INFO_CONNECTION_SUSPENDED
+Returns pointer to an integer that is @code{MHD_YES} if the connection
+is currently suspended (and thus can be safely resumed) and
address@hidden otherwise.
+
 @item MHD_CONNECTION_INFO_SOCKET_CONTEXT
 Returns the client-specific pointer to a @code{void *} that was
 (possibly) set during a @code{MHD_NotifyConnectionCallback} when the

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2016-05-16 21:18:47 UTC (rev 
37179)
+++ libmicrohttpd/src/include/microhttpd.h      2016-05-17 11:37:54 UTC (rev 
37180)
@@ -1157,6 +1157,11 @@
   int /* enum gnutls_protocol */ protocol;
 
   /**
+   * The suspended status of a connection.
+   */
+  int /* MHD_YES or MHD_NO */ suspended;
+
+  /**
    * Connect socket
    */
   MHD_socket connect_fd;
@@ -1255,8 +1260,13 @@
    * fresh for each HTTP request, while the "socket_context" is fresh
    * for each socket.
    */
-  MHD_CONNECTION_INFO_SOCKET_CONTEXT
+  MHD_CONNECTION_INFO_SOCKET_CONTEXT,
 
+  /**
+   * Check wheter the connection is suspended.
+   * @ingroup request
+   */
+  MHD_CONNECTION_INFO_CONNECTION_SUSPENDED
 };
 
 

Modified: libmicrohttpd/src/microhttpd/connection.c
===================================================================
--- libmicrohttpd/src/microhttpd/connection.c   2016-05-16 21:18:47 UTC (rev 
37179)
+++ libmicrohttpd/src/microhttpd/connection.c   2016-05-17 11:37:54 UTC (rev 
37180)
@@ -3013,6 +3013,8 @@
       return (const union MHD_ConnectionInfo *) &connection->socket_fd;
     case MHD_CONNECTION_INFO_SOCKET_CONTEXT:
       return (const union MHD_ConnectionInfo *) &connection->socket_context;
+    case MHD_CONNECTION_INFO_CONNECTION_SUSPENDED:
+      return (const union MHD_ConnectionInfo *) &connection->suspended;
     default:
       return NULL;
     };