[GNUnet-SVN] [libmicrohttpd] 02/05: MHD_get_timeout(): fixed incorrect timeout for TLS connections. If connection is in "MHD_EVENT_LOOP_INFO_WRITE" mode, any pending incoming data should not result in zero timeout. Already handled properly by 'data_already_pending'. Note: old check was incorrect even for "MHD_EVENT_LOOP_INFO_READ" connections as only first connection in "normal timeout" list was checked.

[gnunet]

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

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

commit 0b4e8535a30c4b76dbb95b1c598f0a44325046d1
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Tue Feb 28 19:16:37 2017 +0300

    MHD_get_timeout(): fixed incorrect timeout for TLS connections.
    If connection is in "MHD_EVENT_LOOP_INFO_WRITE" mode, any pending incoming 
data should not
    result in zero timeout.
    Already handled properly by 'data_already_pending'.
    Note: old check was incorrect even for "MHD_EVENT_LOOP_INFO_READ" 
connections as only
    first connection in "normal timeout" list was checked.
---
 src/microhttpd/daemon.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index a6b1af89..0b27d2a7 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2992,11 +2992,6 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
          if ( (! have_timeout) ||
               (earliest_deadline > pos->last_activity + 
pos->connection_timeout) )
            earliest_deadline = pos->last_activity + pos->connection_timeout;
-#ifdef HTTPS_SUPPORT
-         if (  (0 != (daemon->options & MHD_USE_TLS)) &&
-               (0 != gnutls_record_check_pending (pos->tls_session)) )
-           earliest_deadline = 0;
-#endif /* HTTPS_SUPPORT */
          have_timeout = MHD_YES;
        }
     }
@@ -3008,11 +3003,6 @@ MHD_get_timeout (struct MHD_Daemon *daemon,
       if ( (! have_timeout) ||
           (earliest_deadline > pos->last_activity + pos->connection_timeout) )
        earliest_deadline = pos->last_activity + pos->connection_timeout;
-#ifdef HTTPS_SUPPORT
-      if (  (0 != (daemon->options & MHD_USE_TLS)) &&
-           (0 != gnutls_record_check_pending (pos->tls_session)) )
-       earliest_deadline = 0;
-#endif /* HTTPS_SUPPORT */
       have_timeout = MHD_YES;
     }
 

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