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

RTC: Fix the OPTIONS read, no infinited chunked mode

Browse source
This commit is contained in:
winlin 2020-07-02 12:41:08 +08:00
parent a273298e63
commit 9ff8bff601
3 changed files with 76 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
trunk/src/protocol/srs_service_http_conn.cpp
View file

@ -334,6 +334,12 @@ void SrsHttpMessage::set_header(SrsHttpHeader* header, bool keep_alive)
if (!clv.empty()) {
_content_length = ::atoll(clv.c_str());
}
// If method is OPTIONS, and no size(content-length or chunked), it's not infinite chunked,
// it means there is no body, so we must close the body reader.
if (_method == SRS_CONSTS_HTTP_OPTIONS && !chunked && _content_length == -1) {
_body->close();
}
}
srs_error_t SrsHttpMessage::set_url(string url, bool allow_jsonp)
@ -921,6 +927,11 @@ SrsHttpResponseReader::~SrsHttpResponseReader()
{
}
void SrsHttpResponseReader::close()
{
is_eof = true;
}
bool SrsHttpResponseReader::eof()
{
return is_eof;

5
trunk/src/protocol/srs_service_http_conn.hpp
View file

@ -264,6 +264,11 @@ public:
// while buffer is a fast cache which may have cached some data from reader.
SrsHttpResponseReader(SrsHttpMessage* msg, ISrsReader* reader, SrsFastStream* buffer);
virtual ~SrsHttpResponseReader();
public:
// User close the HTTP response reader.
// For example, OPTIONS has no body, no content-length and not chunked,
// so we must close it(set to eof) to avoid reading the response body.
void close();
// Interface ISrsHttpResponseReader
public:
virtual bool eof();