external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine code for hooks and http core.

Browse source
This commit is contained in:
winlin 2015-12-29 18:33:02 +08:00
parent 79fdc4e766
commit f516636448
12 changed files with 144 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

15
trunk/src/app/srs_app_http_conn.cpp
View file

@ -344,6 +344,12 @@ int SrsHttpResponseReader::read(char* data, int nb_data, int* nb_read)
return ret;
}
// for some server, content-length is -1, while not chunked, directly read
// everything as body.
if (owner->content_length() == -1 && !owner->is_chunked()) {
return read_specified(data, nb_data, nb_read);
}
// chunked encoding.
if (owner->is_chunked()) {
return read_chunked(data, nb_data, nb_read);
@ -483,8 +489,8 @@ int SrsHttpResponseReader::read_specified(char* data, int nb_data, int* nb_read)
// increase the total read to determine whether EOF.
nb_total_read += nb_bytes;
// for not chunked
if (!owner->is_chunked()) {
// for not chunked and specified content length.
if (!owner->is_chunked() && owner->content_length() != -1) {
// when read completed, eof.
if (nb_total_read >= (int)owner->content_length()) {
is_eof = true;
@ -1207,6 +1213,11 @@ int SrsResponseOnlyHttpConn::on_got_http_message(ISrsHttpMessage* msg)
ISrsHttpResponseReader* br = msg->body_reader();
// when not specified the content length, ignore.
if (msg->content_length() == -1) {
return ret;
}
// drop all request body.
while (!br->eof()) {
char body[4096];