diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-03-15 18:15:02 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2017-03-15 18:20:29 +0300 |
commit | 4b6e4c630dc6027ee5046d3c558864d94c6758c7 (patch) | |
tree | 54baf9681cb94fb66d85abe1bef877afeb41831d /src/microhttpd/response.c | |
parent | b8c844ae6acfa03b0e3390e44b77714674ca83b6 (diff) | |
download | libmicrohttpd-4b6e4c630dc6027ee5046d3c558864d94c6758c7.tar.gz libmicrohttpd-4b6e4c630dc6027ee5046d3c558864d94c6758c7.zip |
upgraded connections: removed redundant states and checks and unified processing logic.
Fixed early close in TLS thread-per-connection mode.
Diffstat (limited to 'src/microhttpd/response.c')
-rw-r--r-- | src/microhttpd/response.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/microhttpd/response.c b/src/microhttpd/response.c index 26ad649b..9004013f 100644 --- a/src/microhttpd/response.c +++ b/src/microhttpd/response.c | |||
@@ -678,9 +678,8 @@ MHD_upgrade_action (struct MHD_UpgradeResponseHandle *urh, | |||
678 | SHUT_RDWR); | 678 | SHUT_RDWR); |
679 | } | 679 | } |
680 | #endif /* HTTPS_SUPPORT */ | 680 | #endif /* HTTPS_SUPPORT */ |
681 | urh->was_closed = true; | ||
682 | EXTRA_CHECK (MHD_CONNECTION_UPGRADE == connection->state); | 681 | EXTRA_CHECK (MHD_CONNECTION_UPGRADE == connection->state); |
683 | connection->state = MHD_CONNECTION_UPGRADE_CLOSED; | 682 | urh->was_closed = true; |
684 | /* As soon as connection will be marked with BOTH | 683 | /* As soon as connection will be marked with BOTH |
685 | * 'urh->was_closed' AND 'urh->clean_ready', it will | 684 | * 'urh->was_closed' AND 'urh->clean_ready', it will |
686 | * be moved to cleanup list by MHD_resume_connection(). */ | 685 | * be moved to cleanup list by MHD_resume_connection(). */ |