kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-06 05:02:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

http.c: Fix http header send content.

Browse Source 
Currently ast_http_send barricades a portion of the content that
needs to be sent in order to establish a connection for things
like the ARI client. The conditional and contents have been changed
to ensure that everything that needs to be sent, will be sent.

ASTERISK-27372

Change-Id: I8816d2d8f80f4fefc6dcae4b5fdfc97f1e46496d
This commit is contained in:
Ben Ford
2017-10-23 13:42:27 -05:00
parent fb4ed70e62
commit dfe00b80e7
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
main/http.c
View File

@@ -451,9 +451,12 @@ void ast_http_send(struct ast_tcptls_session_instance *ser,
struct timeval now = ast_tvnow(); struct timeval now = ast_tvnow();
struct ast_tm tm; struct ast_tm tm;
char timebuf[80]; char timebuf[80];
char buf[256];
int len;
int content_length = 0; int content_length = 0;
int close_connection; int close_connection;
struct ast_str *server_header_field = ast_str_create(MAX_SERVER_NAME_LENGTH); struct ast_str *server_header_field = ast_str_create(MAX_SERVER_NAME_LENGTH);
int send_content;
if (!ser || !ser->f || !server_header_field) { if (!ser || !ser->f || !server_header_field) {
/* The connection is not open. */ /* The connection is not open. */
@@ -504,6 +507,8 @@ void ast_http_send(struct ast_tcptls_session_instance *ser,
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
} }
send_content = method != AST_HTTP_HEAD || status_code >= 400;
/* send http header */ /* send http header */
if (fprintf(ser->f, if (fprintf(ser->f,
"HTTP/1.1 %d %s\r\n" "HTTP/1.1 %d %s\r\n"
@@ -513,46 +518,30 @@ void ast_http_send(struct ast_tcptls_session_instance *ser,
"%s" "%s"
"%s" "%s"
"Content-Length: %d\r\n" "Content-Length: %d\r\n"
"\r\n", "\r\n"
"%s",
status_code, status_title ? status_title : "OK", status_code, status_title ? status_title : "OK",
ast_str_buffer(server_header_field), ast_str_buffer(server_header_field),
timebuf, timebuf,
close_connection ? "Connection: close\r\n" : "", close_connection ? "Connection: close\r\n" : "",
static_content ? "" : "Cache-Control: no-cache, no-store\r\n", static_content ? "" : "Cache-Control: no-cache, no-store\r\n",
http_header ? ast_str_buffer(http_header) : "", http_header ? ast_str_buffer(http_header) : "",
content_length content_length,
send_content && out && ast_str_strlen(out) ? ast_str_buffer(out) : ""
) <= 0) { ) <= 0) {
ast_debug(1, "fprintf() failed: %s\n", strerror(errno)); ast_debug(1, "fprintf() failed: %s\n", strerror(errno));
close_connection = 1; close_connection = 1;
} } else if (send_content && fd) {
/* send file content */
/* send content */ while ((len = read(fd, buf, sizeof(buf))) > 0) {
if (!close_connection && (method != AST_HTTP_HEAD || status_code >= 400)) {
if (out && ast_str_strlen(out)) {
/* /*
* NOTE: Because ser->f is a non-standard FILE *, fwrite() will probably not * NOTE: Because ser->f is a non-standard FILE *, fwrite() will probably not
* behave exactly as documented. * behave exactly as documented.
*/ */
if (fwrite(ast_str_buffer(out), ast_str_strlen(out), 1, ser->f) != 1) { if (fwrite(buf, len, 1, ser->f) != 1) {
ast_debug(1, "fwrite() failed: %s\n", strerror(errno)); ast_debug(1, "fwrite() failed: %s\n", strerror(errno));
close_connection = 1; close_connection = 1;
} break;
}
if (fd) {
char buf[256];
int len;
while ((len = read(fd, buf, sizeof(buf))) > 0) {
/*
* NOTE: Because ser->f is a non-standard FILE *, fwrite() will probably not
* behave exactly as documented.
*/
if (fwrite(buf, len, 1, ser->f) != 1) {
ast_debug(1, "fwrite() failed: %s\n", strerror(errno));
close_connection = 1;
break;
}
} }
} }
} }