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

merge from srs2.

Browse source
This commit is contained in:
winlin 2016-01-13 12:52:19 +08:00
parent 266397acee
commit 61c0c168b9
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/app/srs_app_http_api.cpp
View file

@ -46,6 +46,7 @@ using namespace std;
#include <srs_kernel_consts.hpp> #include <srs_kernel_consts.hpp>
#include <srs_app_server.hpp> #include <srs_app_server.hpp>
#include <srs_protocol_amf0.hpp> #include <srs_protocol_amf0.hpp>
#include <srs_protocol_utility.hpp>
int srs_api_response_jsonp(ISrsHttpResponseWriter* w, string callback, string data) int srs_api_response_jsonp(ISrsHttpResponseWriter* w, string callback, string data)
{ {

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

@ -345,12 +345,6 @@ int SrsHttpResponseReader::read(char* data, int nb_data, int* nb_read)
return ret; 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. // chunked encoding.
if (owner->is_chunked()) { if (owner->is_chunked()) {
return read_chunked(data, nb_data, nb_read); return read_chunked(data, nb_data, nb_read);