[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 51/154: gnutls cork integration
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 51/154: gnutls cork integration |
Date: |
Mon, 19 Aug 2019 10:16:03 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository libmicrohttpd.
commit 5304f73f9e8ebeafc1b80f2033b7c3add1169e75
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jul 22 18:28:02 2019 +0200
gnutls cork integration
---
src/microhttpd/mhd_send.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index 34c8e99f..b77d6614 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -170,11 +170,16 @@ MHD_send_on_connection_ (struct MHD_Connection
*connection,
#endif
#ifdef HTTPS_SUPPORT
+
if (using_tls)
{
- int i;
- if (i > SSIZE_MAX)
- i = SSIZE_MAX;
+ if (want_cork && ! have_cork)
+ {
+ gnutls_record_cork (connection->tls_session);
+ connection->sk_tcp_nodelay_on = false;
+ }
+ if (buffer_size > SSIZE_MAX)
+ buffer_size = SSIZE_MAX;
ret = gnutls_record_send (connection->tls_session,
buffer,
buffer_size);
@@ -198,6 +203,12 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
* sent amount smaller than provided amount, as TLS
* connections may break data into smaller parts for sending. */
#endif /* EPOLL_SUPPORT */
+
+ if (! want_cork && have_cork)
+ {
+ (void) gnutls_record_uncork (connection->tls_session, 0);
+ connection->sk_tcp_nodelay_on = true;
+ }
}
else
#endif
@@ -288,13 +299,6 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
}
#endif
- /*
- // pseudo-code for gnutls corking
- if (have_more_data && !corked)
- gnutls_record_cork(connection->tls_session);
- if (!have_more_data && corked)
- gnutls_record_uncork(connection->tls_session);
- */
return ret;
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [libmicrohttpd] 52/154: doxygen, (continued)
- [GNUnet-SVN] [libmicrohttpd] 52/154: doxygen, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 40/154: doxygen for _send2, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 48/154: connection.c: preprocessor ifdef some setsockopts., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 46/154: Merge remote-tracking branch 'origin/master' into dev/ng0/gsoc2019, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 53/154: reminder, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 41/154: doxygen for send_, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 50/154: do use MSG_NOSIGNAL in send() if available, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 47/154: Merge remote-tracking branch 'origin/master' into dev/ng0/gsoc2019, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 42/154: indent, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 54/154: Merge branch 'dev/ng0/gsoc2019' of git+ssh://gnunet.org/libmicrohttpd into dev/ng0/gsoc2019, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 51/154: gnutls cork integration,
gnunet <=
- [GNUnet-SVN] [libmicrohttpd] 61/154: incomplete commit, adding 2 new helper functions and more., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 69/154: function replace., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 79/154: fix, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 82/154: revert last patch, should be only on master for now, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 67/154: remove commented code, replaced by functions., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 85/154: pre_cork socket.., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 72/154: first attempt to add MHD_send_on_connection2_, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 66/154: doxygen., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 70/154: conditionally return and setsockopt., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 74/154: fix failure to build., gnunet, 2019/08/19