[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 35/154: use using_tls
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 35/154: use using_tls |
Date: |
Mon, 19 Aug 2019 10:15:47 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository libmicrohttpd.
commit ffd6e4c44857dd214c046d5ba678d9fbd19f2d94
Author: ng0 <address@hidden>
AuthorDate: Fri Jul 19 22:48:47 2019 +0000
use using_tls
---
src/microhttpd/mhd_send.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/microhttpd/mhd_send.c b/src/microhttpd/mhd_send.c
index 656a3f14..6ad79fb9 100644
--- a/src/microhttpd/mhd_send.c
+++ b/src/microhttpd/mhd_send.c
@@ -130,7 +130,7 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
#endif
#if TCP_CORK
- if ((use_corknopush) && (have_cork && ! want_cork))
+ if ((! using_tls) && (use_corknopush) && (have_cork && ! want_cork))
{
if (0 == setsockopt (s,
IPPROTO_TCP,
@@ -156,7 +156,7 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
/* TCP_NOPUSH on FreeBSD is equal to cork on Linux, with the
* exception that we know that TCP_NOPUSH will definitely
* exist and we can disregard TCP_NODELAY unless requested. */
- if ((use_corknopush) && (have_cork && ! want_cork))
+ if ((! using_tls) && (use_corknopush) && (have_cork && ! want_cork))
{
if (0 == setsockopt (s,
IPPROTO_TCP,
@@ -169,7 +169,7 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
}
#endif
#if TCP_NODELAY
- if ((! use_corknopush) && (! have_cork && want_cork))
+ if ((! using_tls) && (! use_corknopush) && (! have_cork && want_cork))
{
if (0 == setsockopt (s,
IPPROTO_TCP,
@@ -250,9 +250,7 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
#endif /* EPOLL_SUPPORT */
}
#if TCP_CORK
- if (use_corknopush)
- {
- if (! have_cork && want_cork && ! have_more)
+ if ((! using_tls) && (use_corknopush) && (! have_cork && want_cork && !
have_more))
{
if (0 == setsockopt (s,
IPPROTO_TCP,
@@ -271,19 +269,16 @@ MHD_send_on_connection_ (struct MHD_Connection
*connection,
connection->sk_tcp_nodelay_on = false;
}
}
- }
#elif TCP_NOPUSH
// We don't have MSG_MORE.
if (use_corknopush)
{
- // ...
+ if (! have_more && )// ...
}
#endif
#if TCP_NODELAY
- if (! use_corknopush)
- {
- if (have_cork && ! want_cork)
+ if ((! using_tls) && (! use_corknopush) && (have_cork && ! want_cork))
{
if (0 == setsockopt (s,
IPPROTO_TCP,
@@ -294,7 +289,6 @@ MHD_send_on_connection_ (struct MHD_Connection *connection,
connection->sk_tcp_nodelay_on = true;
}
}
- }
#endif
/*
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [GNUnet-SVN] [libmicrohttpd] 32/154: setsockopt(): check return value., (continued)
- [GNUnet-SVN] [libmicrohttpd] 32/154: setsockopt(): check return value., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 21/154: mhd_send.c: Use daemon from connection struct., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 45/154: fix compiler error., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 44/154: remove verbose comments in mhd_send.c, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 55/154: doxygen: MHD_SSO, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 30/154: comments, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 49/154: more OLDSOCK., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 59/154: sendfile and netbsd, comment., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 31/154: combine ifs, fix uninitialized var error, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 62/154: fix errors., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 35/154: use using_tls,
gnunet <=
- [GNUnet-SVN] [libmicrohttpd] 36/154: implement TCP_NOPUSH branch content, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 34/154: Use s in setsockopt(), gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 38/154: check getsockopt's., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 64/154: move sendfile function work to connection.c, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 58/154: start SENDMSG/WRITEV., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 60/154: doxygen fix., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 57/154: cover the case of TCP_NOPUSH and TCP_CORK coexisting on the same OS., gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 56/154: doxygen, links, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 52/154: doxygen, gnunet, 2019/08/19
- [GNUnet-SVN] [libmicrohttpd] 40/154: doxygen for _send2, gnunet, 2019/08/19