kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 15:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "http: Send headers and body in one write."

Browse Source
This commit is contained in:
Joshua Colp
2016-12-07 13:37:31 -06:00
committed by Gerrit Code Review
parent 119c41d001 503006123a
commit 18fe80e776
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
main/http.c
View File

@@ -454,6 +454,7 @@ void ast_http_send(struct ast_tcptls_session_instance *ser,
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 || !server_header_field) { if (!ser || !server_header_field) {
/* The connection is not open. */ /* The connection is not open. */
@@ -504,6 +505,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 */
ast_iostream_printf(ser->stream, ast_iostream_printf(ser->stream,
"HTTP/1.1 %d %s\r\n" "HTTP/1.1 %d %s\r\n"
@@ -513,33 +516,25 @@ 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) : ""
); );
/* send content */ /* send content */
if (method != AST_HTTP_HEAD || status_code >= 400) { if (send_content && fd) {
if (out && ast_str_strlen(out)) { while ((len = read(fd, buf, sizeof(buf))) > 0) {
len = ast_str_strlen(out); if (ast_iostream_write(ser->stream, buf, len) != len) {
if (ast_iostream_write(ser->stream, ast_str_buffer(out), len) != len) { ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
ast_log(LOG_ERROR, "fwrite() failed: %s\n", strerror(errno));
close_connection = 1; close_connection = 1;
} break;
}
if (fd) {
while ((len = read(fd, buf, sizeof(buf))) > 0) {
if (ast_iostream_write(ser->stream, buf, len) != len) {
ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno));
close_connection = 1;
break;
}
} }
} }
} }