[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 02/05: MHD_get_timeout(): fixed incorrect t
From: |
gnunet |
Subject: |
[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. |
Date: |
Tue, 28 Feb 2017 17:52:22 +0100 |
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
- [GNUnet-SVN] [libmicrohttpd] branch master updated (a44c8f33 -> 78295468), gnunet, 2017/02/28
- [GNUnet-SVN] [libmicrohttpd] 03/05: MHD_get_timeout(): fixed return of latest timeout instead of earliest., gnunet, 2017/02/28
- [GNUnet-SVN] [libmicrohttpd] 04/05: MHD_get_timeout(): one more 'int' -> 'bool' replacement., gnunet, 2017/02/28
- [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 <=
- [GNUnet-SVN] [libmicrohttpd] 05/05: Walk double-linked lists from 'tail' to 'head'. Walking connection as "First in - First Served" gives more uniform processing time., gnunet, 2017/02/28
- [GNUnet-SVN] [libmicrohttpd] 01/05: configure.ac: skip large GnuTLS and gcrypt tests if HTTPS is disabled, gnunet, 2017/02/28