Merge "res_http_websocket: Fix faulty read logic."

changes/21/5121/3
zuul 9 years ago committed by Gerrit Code Review
commit ff0569740a

@ -529,10 +529,12 @@ static inline int ws_safe_read(struct ast_websocket *session, char *buf, int len
return -1;
}
}
xlen = xlen - rlen;
rbuf = rbuf + rlen;
if (!xlen) {
break;
if (rlen > 0) {
xlen = xlen - rlen;
rbuf = rbuf + rlen;
if (!xlen) {
break;
}
}
if (ast_wait_for_input(ast_iostream_get_fd(session->stream), 1000) < 0) {
ast_log(LOG_ERROR, "ast_wait_for_input returned err: %s\n", strerror(errno));

Loading…
Cancel
Save