diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-10-25 14:33:28 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2015-10-25 14:33:28 +0000 |
| commit | 2a6eada873b10f20c9a7366d19bad98b9bd945df (patch) | |
| tree | c0d0ff9a8eac695390bc249d4042a0f662530799 /src/microhttpd/connection_https.c | |
| parent | 7131394fa881b732cd141fda9875953f5b5c1831 (diff) | |
| download | libmicrohttpd-2a6eada873b10f20c9a7366d19bad98b9bd945df.tar.gz libmicrohttpd-2a6eada873b10f20c9a7366d19bad98b9bd945df.zip | |
-fix assertion failure from race on shutdown and buffer shrinkage with pipelining
Diffstat (limited to 'src/microhttpd/connection_https.c')
| -rw-r--r-- | src/microhttpd/connection_https.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/microhttpd/connection_https.c b/src/microhttpd/connection_https.c index fd4d1de4..de408a9b 100644 --- a/src/microhttpd/connection_https.c +++ b/src/microhttpd/connection_https.c | |||
| @@ -69,8 +69,8 @@ run_tls_handshake (struct MHD_Connection *connection) | |||
| 69 | MHD_DLOG (connection->daemon, | 69 | MHD_DLOG (connection->daemon, |
| 70 | "Error: received handshake message out of context\n"); | 70 | "Error: received handshake message out of context\n"); |
| 71 | #endif | 71 | #endif |
| 72 | MHD_connection_close (connection, | 72 | MHD_connection_close_ (connection, |
| 73 | MHD_REQUEST_TERMINATED_WITH_ERROR); | 73 | MHD_REQUEST_TERMINATED_WITH_ERROR); |
| 74 | return MHD_YES; | 74 | return MHD_YES; |
| 75 | } | 75 | } |
| 76 | return MHD_NO; | 76 | return MHD_NO; |
| @@ -142,8 +142,8 @@ MHD_tls_connection_handle_idle (struct MHD_Connection *connection) | |||
| 142 | #endif | 142 | #endif |
| 143 | timeout = connection->connection_timeout; | 143 | timeout = connection->connection_timeout; |
| 144 | if ( (timeout != 0) && (timeout <= (MHD_monotonic_sec_counter() - connection->last_activity))) | 144 | if ( (timeout != 0) && (timeout <= (MHD_monotonic_sec_counter() - connection->last_activity))) |
| 145 | MHD_connection_close (connection, | 145 | MHD_connection_close_ (connection, |
| 146 | MHD_REQUEST_TERMINATED_TIMEOUT_REACHED); | 146 | MHD_REQUEST_TERMINATED_TIMEOUT_REACHED); |
| 147 | switch (connection->state) | 147 | switch (connection->state) |
| 148 | { | 148 | { |
| 149 | /* on newly created connections we might reach here before any reply has been received */ | 149 | /* on newly created connections we might reach here before any reply has been received */ |