mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 11:58:52 +00:00
http: response body often missing after specific request
This patch works around a problem with the HTTP body being dropped from the response to a specific client and under specific circumstances: a) Client request comes from node.js user agent "Shred" via use of swagger-client library. b) Asterisk and Client are *not* on the same host or TCP/IP stack In testing this problem, it has been determined that the write of the HTTP body is lost, even if the data is written using low level write function. The only solution found is to instruct the TCP stack with the shutdown function to flush the last write and finish the transmission. See review for more details. ASTERISK-23548 #close (closes issue ASTERISK-23548) Reported by: Sam Galarneau Review: https://reviewboard.asterisk.org/r/3402/ ........ Merged revisions 411462 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 411463 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 411465 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -625,12 +625,22 @@ error:
|
||||
void ast_tcptls_close_session_file(struct ast_tcptls_session_instance *tcptls_session)
|
||||
{
|
||||
if (tcptls_session->f) {
|
||||
/*
|
||||
* Issuing shutdown() is necessary here to avoid a race
|
||||
* condition where the last data written may not appear
|
||||
* in the TCP stream. See ASTERISK-23548
|
||||
*/
|
||||
fflush(tcptls_session->f);
|
||||
if (tcptls_session->fd != -1) {
|
||||
shutdown(tcptls_session->fd, SHUT_RDWR);
|
||||
}
|
||||
if (fclose(tcptls_session->f)) {
|
||||
ast_log(LOG_ERROR, "fclose() failed: %s\n", strerror(errno));
|
||||
}
|
||||
tcptls_session->f = NULL;
|
||||
tcptls_session->fd = -1;
|
||||
} else if (tcptls_session->fd != -1) {
|
||||
shutdown(tcptls_session->fd, SHUT_RDWR);
|
||||
if (close(tcptls_session->fd)) {
|
||||
ast_log(LOG_ERROR, "close() failed: %s\n", strerror(errno));
|
||||
}
|
||||
|
Reference in New Issue
Block a user