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

fix #78 st joinable thread must be stop by other threads, 0.9.113

Browse source
This commit is contained in:
winlin 2014-05-23 17:23:33 +08:00
parent 6fba0db9b5
commit 0eb9e0af5b
14 changed files with 96 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/src/app/srs_app_http.cpp
View file

@ -291,6 +291,13 @@ SrsHttpHandler* SrsHttpHandler::res_content_type_mpegts(stringstream& ss)
return this;
}
SrsHttpHandler* SrsHttpHandler::res_content_type_flv(stringstream& ss)
{
ss << "Content-Type: video/x-flv" << __CRLF
<< "Allow: DELETE, GET, HEAD, OPTIONS, POST, PUT" << __CRLF;
return this;
}
SrsHttpHandler* SrsHttpHandler::res_content_length(stringstream& ss, int64_t length)
{
ss << "Content-Length: "<< length << __CRLF;
@ -1008,7 +1015,7 @@ const char* SrsHttpUri::get_path()
const char* SrsHttpUri::get_query()
{
return path.data();
return query.data();
}
string SrsHttpUri::get_uri_field(string uri, http_parser_url* hp_u, http_parser_url_fields field)