lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-12-22 04:02:04 +03:00
Code Activity

Merge pull request #44 from mitchh/master

Browse Source 
Fix 30s hang->timeout when closing a socket with no more data
This commit is contained in:
Sergey Lyubka
2012-10-20 00:39:51 -07:00
parent 3770020b74 f8713ede2d
commit 672e1ec8c6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mongoose.c
View File

@@ -1478,7 +1478,7 @@ static int pull(FILE *fp, struct mg_connection *conn, char *buf, int len) {
// pipe, fread() may block until IO buffer is filled up. We cannot afford // pipe, fread() may block until IO buffer is filled up. We cannot afford
// to block and must pass all read bytes immediately to the client. // to block and must pass all read bytes immediately to the client.
nread = read(fileno(fp), buf, (size_t) len); nread = read(fileno(fp), buf, (size_t) len);
} else if (!wait_until_socket_is_readable(conn)) { } else if (!conn->must_close && !wait_until_socket_is_readable(conn)) {
nread = -1; nread = -1;
} else if (conn->ssl != NULL) { } else if (conn->ssl != NULL) {
nread = SSL_read(conn->ssl, buf, len); nread = SSL_read(conn->ssl, buf, len);
@@ -4515,6 +4515,8 @@ static void close_socket_gracefully(struct mg_connection *conn) {
} }
static void close_connection(struct mg_connection *conn) { static void close_connection(struct mg_connection *conn) {
conn->must_close = 1;
if (conn->ssl) { if (conn->ssl) {
SSL_free(conn->ssl); SSL_free(conn->ssl);
conn->ssl = NULL; conn->ssl = NULL;