[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36226 - libmicrohttpd/src/microhttpd
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36226 - libmicrohttpd/src/microhttpd |
Date: |
Sat, 8 Aug 2015 14:29:20 +0200 |
Author: Karlson2k
Date: 2015-08-08 14:29:20 +0200 (Sat, 08 Aug 2015)
New Revision: 36226
Modified:
libmicrohttpd/src/microhttpd/daemon.c
Log:
Small refactoring in MHD_handle_connection() for optimization
Modified: libmicrohttpd/src/microhttpd/daemon.c
===================================================================
--- libmicrohttpd/src/microhttpd/daemon.c 2015-08-08 11:10:06 UTC (rev
36225)
+++ libmicrohttpd/src/microhttpd/daemon.c 2015-08-08 12:29:20 UTC (rev
36226)
@@ -811,8 +811,17 @@
(MHD_CONNECTION_CLOSED != con->state) )
{
tvp = NULL;
- if (timeout > 0)
+#if HTTPS_SUPPORT
+ if (MHD_YES == con->tls_read_ready)
{
+ /* do not block (more data may be inside of TLS buffers waiting for
us) */
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
+ tvp = &tv;
+ }
+#endif
+ if (NULL == tvp && timeout > 0)
+ {
now = MHD_monotonic_time();
if (now - con->last_activity > timeout)
tv.tv_sec = 0;
@@ -821,15 +830,6 @@
tv.tv_usec = 0;
tvp = &tv;
}
-#if HTTPS_SUPPORT
- if (MHD_YES == con->tls_read_ready)
- {
- /* do not block (more data may be inside of TLS buffers waiting for
us) */
- tv.tv_sec = 0;
- tv.tv_usec = 0;
- tvp = &tv;
- }
-#endif
if (0 == (con->daemon->options & MHD_USE_POLL))
{
/* use select */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36226 - libmicrohttpd/src/microhttpd,
gnunet <=