kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-10 11:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "http.c: Reduce log spam"

Browse Source
This commit is contained in:
Jenkins2
2017-07-11 19:42:10 -05:00
committed by Gerrit Code Review
parent 3e7cfe3a92 303f935a50
commit fbcfa6b4b2
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
main/http.c
View File

@@ -508,7 +508,7 @@ void ast_http_send(struct ast_tcptls_session_instance *ser,
send_content = method != AST_HTTP_HEAD || status_code >= 400; send_content = method != AST_HTTP_HEAD || status_code >= 400;
/* send http header */ /* send http header */
ast_iostream_printf(ser->stream, if (ast_iostream_printf(ser->stream,
"HTTP/1.1 %d %s\r\n" "HTTP/1.1 %d %s\r\n"
"%s" "%s"
"Date: %s\r\n" "Date: %s\r\n"
@@ -526,13 +526,16 @@ void ast_http_send(struct ast_tcptls_session_instance *ser,
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 && out && ast_str_strlen(out) ? ast_str_buffer(out) : ""
); ) <= 0) {
ast_debug(1, "ast_iostream_printf() failed: %s\n", strerror(errno));
close_connection = 1;
}
/* send content */ /* send content */
if (send_content && fd) { if (!close_connection && send_content && fd) {
while ((len = read(fd, buf, sizeof(buf))) > 0) { while ((len = read(fd, buf, sizeof(buf))) > 0) {
if (ast_iostream_write(ser->stream, buf, len) != len) { if (ast_iostream_write(ser->stream, buf, len) != len) {
ast_log(LOG_WARNING, "fwrite() failed: %s\n", strerror(errno)); ast_debug(1, "ast_iostream_write() failed: %s\n", strerror(errno));
close_connection = 1; close_connection = 1;
break; break;
} }