gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [libmicrohttpd] branch master updated (5f7ba548 -> 4adf1c6d


From: gnunet
Subject: [GNUnet-SVN] [libmicrohttpd] branch master updated (5f7ba548 -> 4adf1c6d)
Date: Fri, 08 Sep 2017 21:04:51 +0200

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 5f7ba548 Additional clarification about MHD_get_timeout().
     new 3474e1b7 Fixed sending responses >16KiB in HTTPS mode with epoll
     new 4adf1c6d send_tls_adapter(): removed leftover errno manipulation

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:
 ChangeLog                         | 7 +++++++
 src/microhttpd/connection_https.c | 7 +++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4517d2f..b400bb65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 08 21:39:00 MSK 2017
+       Fixed build of examples when MHD build with non-pthread lib.
+       MHD_queue_response(): added check for using in correct thread.
+       Fixed sending responses larger 16 KiB in TLS mode with epoll.
+       Improved doxy for MHD_get_timeout() and related functions.
+       Minor internal refactoring. -EG
+
 Tue Jul 23 11:32:00 MSK 2017
        Updated chunked_example.c to provide real illustration of usage of
        chunked encoding. -EG
diff --git a/src/microhttpd/connection_https.c 
b/src/microhttpd/connection_https.c
index 03f80b8c..87b74525 100644
--- a/src/microhttpd/connection_https.c
+++ b/src/microhttpd/connection_https.c
@@ -114,7 +114,6 @@ send_tls_adapter (struct MHD_Connection *connection,
   if ( (GNUTLS_E_AGAIN == res) ||
        (GNUTLS_E_INTERRUPTED == res) )
     {
-      MHD_socket_set_error_ (MHD_SCKT_EINTR_);
 #ifdef EPOLL_SUPPORT
       if (GNUTLS_E_AGAIN == res)
         connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY;
@@ -128,9 +127,9 @@ send_tls_adapter (struct MHD_Connection *connection,
       return MHD_ERR_NOTCONN_;
     }
 #ifdef EPOLL_SUPPORT
-  /* If NOT all available data was sent - socket is not write ready anymore. */
-  if (i > (size_t)res)
-    connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY;
+  /* Unlike non-TLS connections, do not reset "write-ready" if
+   * sent smaller amount than provided, as TLS connections may
+   * break data into smaller parts for sending. */
 #endif /* EPOLL_SUPPORT */
   return res;
 }

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]