aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-09-08 22:02:47 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-09-08 22:02:47 +0300
commit3474e1b7f9bf7bdbde47d13c59961508bcd273da (patch)
tree664576b5f7f2e5411b343fbc6529ae01a63b5818
parent5f7ba548f17be92561c4cdc17d32f0d308cd4e47 (diff)
downloadlibmicrohttpd-3474e1b7f9bf7bdbde47d13c59961508bcd273da.tar.gz
libmicrohttpd-3474e1b7f9bf7bdbde47d13c59961508bcd273da.zip
Fixed sending responses >16KiB in HTTPS mode with epoll
-rw-r--r--ChangeLog7
-rw-r--r--src/microhttpd/connection_https.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b4517d2f..b400bb65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
1Tue Sep 08 21:39:00 MSK 2017
2 Fixed build of examples when MHD build with non-pthread lib.
3 MHD_queue_response(): added check for using in correct thread.
4 Fixed sending responses larger 16 KiB in TLS mode with epoll.
5 Improved doxy for MHD_get_timeout() and related functions.
6 Minor internal refactoring. -EG
7
1Tue Jul 23 11:32:00 MSK 2017 8Tue Jul 23 11:32:00 MSK 2017
2 Updated chunked_example.c to provide real illustration of usage of 9 Updated chunked_example.c to provide real illustration of usage of
3 chunked encoding. -EG 10 chunked encoding. -EG
diff --git a/src/microhttpd/connection_https.c b/src/microhttpd/connection_https.c
index 03f80b8c..2b9e9eca 100644
--- a/src/microhttpd/connection_https.c
+++ b/src/microhttpd/connection_https.c
@@ -128,9 +128,9 @@ send_tls_adapter (struct MHD_Connection *connection,
128 return MHD_ERR_NOTCONN_; 128 return MHD_ERR_NOTCONN_;
129 } 129 }
130#ifdef EPOLL_SUPPORT 130#ifdef EPOLL_SUPPORT
131 /* If NOT all available data was sent - socket is not write ready anymore. */ 131 /* Unlike non-TLS connections, do not reset "write-ready" if
132 if (i > (size_t)res) 132 * sent smaller amount than provided, as TLS connections may
133 connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY; 133 * break data into smaller parts for sending. */
134#endif /* EPOLL_SUPPORT */ 134#endif /* EPOLL_SUPPORT */
135 return res; 135 return res;
136} 136}