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 2015-12-31 16:02:01 +08:00
commit 973194c663
7 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -282,7 +282,7 @@ int SrsHttpResponseWriter::send_header(char* data, int size)
// set server if not set.
if (hdr->get("Server").empty()) {
hdr->set("Server", RTMP_SIG_SRS_KEY"/"RTMP_SIG_SRS_VERSION);
hdr->set("Server", RTMP_SIG_SRS_SERVER);
}
// chunked encoding