Lab/libuhttpd
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

buffer: sync from upstream

Browse Source 
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
This commit is contained in:
Jianhui Zhao committed 2020-02-07 17:29:46 +08:00
1 parent a0f308b0cb
commit 7ff34b7319
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/buffer
+1 -1
Submodule src/buffer updated: 7b1ba65e2c...99adb71b0b.
src/connection.c
+4 -4
View File
@@ -341,10 +341,10 @@ static void conn_write_cb(struct ev_loop *loop, struct ev_io *w, int revents)
#if UHTTPD_SSL_SUPPORT
if (conn->ssl)
ret = buffer_pull_to_fd(&conn->wb, w->fd, buffer_length(&conn->wb), conn_ssl_write, conn->ssl);
ret = buffer_pull_to_fd_ex(&conn->wb, w->fd, buffer_length(&conn->wb), conn_ssl_write, conn->ssl);
else
#endif
ret = buffer_pull_to_fd(&conn->wb, w->fd, buffer_length(&conn->wb), NULL, NULL);
ret = buffer_pull_to_fd(&conn->wb, w->fd, buffer_length(&conn->wb));
if (ret < 0) {
uh_log_err("write error: %s\n", strerror(errno));
@@ -404,10 +404,10 @@ static void conn_read_cb(struct ev_loop *loop, struct ev_io *w, int revents)
#if UHTTPD_SSL_SUPPORT
if (conn->ssl)
ret = buffer_put_fd(rb, w->fd, -1, &eof, conn_ssl_read, conn->ssl);
ret = buffer_put_fd_ex(rb, w->fd, -1, &eof, conn_ssl_read, conn->ssl);
else
#endif
ret = buffer_put_fd(rb, w->fd, -1, &eof, NULL, NULL);
ret = buffer_put_fd(rb, w->fd, -1, &eof);
if (ret < 0) {
conn_error(conn, 500, NULL);