[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 47
From: |
gitolite |
Subject: |
[GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 47f1d52e799227322c83d3114d3a6b7b54d2e5dd |
Date: |
Tue, 1 Nov 2016 17:59:56 +0100 (CET) |
The branch, master has been updated
via 47f1d52e799227322c83d3114d3a6b7b54d2e5dd (commit)
from 7a0929e352f4320add587e7e6e14c109e8b388ee (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 47f1d52e799227322c83d3114d3a6b7b54d2e5dd
Author: Evgeny Grin (Karlson2k) <address@hidden>
Date: Tue Nov 1 19:58:59 2016 +0300
Fixed processing "upgraded" TLS with epoll().
-----------------------------------------------------------------------
Summary of changes:
src/microhttpd/daemon.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 2d0ab19..006e8d5 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -3568,6 +3568,13 @@ run_epoll_for_upgrade (struct MHD_Daemon *daemon)
struct UpgradeEpollHandle * const ueh = events[i].data.ptr;
struct MHD_UpgradeResponseHandle * const urh = ueh->urh;
+ /* Each MHD_UpgradeResponseHandle can be processed two times:
+ * one for TLS data and one for socketpair data.
+ * If forwarding was finished on first time, second time must
+ * be skipped as urh must not be used anymore. */
+ if (MHD_NO != urh->clean_ready)
+ continue;
+
/* Update our state based on what is ready according to epoll() */
if (0 != (events[i].events & EPOLLIN))
ueh->celi |= MHD_EPOLL_STATE_READ_READY;
hooks/post-receive
--
GNU libmicrohttpd
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libmicrohttpd] GNU libmicrohttpd branch master updated. 47f1d52e799227322c83d3114d3a6b7b54d2e5dd,
gitolite <=