[GNUnet-SVN] [libmicrohttpd] branch master updated (a21ff8a9 -> 51b64e8b)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from a21ff8a9 Removed MHD_tls_connection_handle_idle() and 
MHD_Connection::idle_handler. Ensure that 
MHD_connection_update_event_loop_info() is called for MHD_TLS_CONNECTION_INIT 
state to properly update read/write event loop info when doing TLS handshake
     new 3516d336 MHD_tls_connection_shutdown(): remember real result of TLS 
shutdown
     new 51b64e8b MHD_connection_mark_closed_(): changed return type to 'bool'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/connection.c       |  2 +-
 src/microhttpd/connection_https.c | 16 ++++++++--------
 src/microhttpd/connection_https.h |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c
index 915d3e1d..f7a00bde 100644
--- a/src/microhttpd/connection.c
+++ b/src/microhttpd/connection.c
@@ -567,7 +567,7 @@ MHD_connection_mark_closed_ (struct MHD_Connection 
*connection)
        * remote side as end of transmission. */
       if (0 != (daemon->options & MHD_USE_TLS))
         {
-          if (MHD_NO == MHD_tls_connection_shutdown(connection))
+          if (! MHD_tls_connection_shutdown(connection))
             shutdown (connection->socket_fd,
                       SHUT_WR);
         }
diff --git a/src/microhttpd/connection_https.c 
b/src/microhttpd/connection_https.c
index 28f019a5..614726b7 100644
--- a/src/microhttpd/connection_https.c
+++ b/src/microhttpd/connection_https.c
@@ -137,17 +137,17 @@ MHD_set_https_callbacks (struct MHD_Connection 
*connection)
  * Initiate shutdown of TLS layer of connection.
  *
  * @param connection to use
- * @return #MHD_YES if succeed, #MHD_NO otherwise.
+ * @return true if succeed, false otherwise.
  */
-int
+bool
 MHD_tls_connection_shutdown (struct MHD_Connection *connection)
 {
-  if (connection->tls_closed)
-    return MHD_NO;
-
-  connection->tls_closed = true;
-  return (GNUTLS_E_SUCCESS == gnutls_bye(connection->tls_session, 
GNUTLS_SHUT_WR)) ?
-      MHD_YES : MHD_NO;
+  if (! connection->tls_closed)
+    {
+      connection->tls_closed =
+          (GNUTLS_E_SUCCESS == gnutls_bye(connection->tls_session, 
GNUTLS_SHUT_WR));
+    }
+  return connection->tls_closed ? MHD_YES : MHD_NO;;
 }
 
 /* end of connection_https.c */
diff --git a/src/microhttpd/connection_https.h 
b/src/microhttpd/connection_https.h
index 6bb218b6..b9686870 100644
--- a/src/microhttpd/connection_https.h
+++ b/src/microhttpd/connection_https.h
@@ -43,9 +43,9 @@ MHD_set_https_callbacks (struct MHD_Connection *connection);
  * Initiate shutdown of TLS layer of connection.
  *
  * @param connection to use
- * @return #MHD_YES if succeed, #MHD_NO otherwise.
+ * @return true if succeed, false otherwise.
  */
-int
+bool
 MHD_tls_connection_shutdown (struct MHD_Connection *connection);
 #endif /* HTTPS_SUPPORT */
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden