hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-08-23 12:43:50 +02:00
commit f5239deab2
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/downloader.cpp
View file

@ -102,10 +102,10 @@ namespace HTTP{
} }
if (proxied && !ssl){ if (proxied && !ssl){
H.url = link.getProxyUrl(); H.url = link.getProxyUrl();
if (proxyUrl.port.size()){ if (link.port.size()){
H.SetHeader("Host", proxyUrl.host + ":" + proxyUrl.port); H.SetHeader("Host", link.host + ":" + link.port);
}else{ }else{
H.SetHeader("Host", proxyUrl.host); H.SetHeader("Host", link.host);
} }
}else{ }else{
H.url = "/" + Encodings::URL::encode(link.path, "/:=@[]"); H.url = "/" + Encodings::URL::encode(link.path, "/:=@[]");

9
src/output/output_rtmp.cpp
View file

@ -550,10 +550,6 @@ namespace Mist{
reqUrl = app_name;//LTS reqUrl = app_name;//LTS
app_name = app_name.substr(app_name.find('/', 7) + 1); app_name = app_name.substr(app_name.find('/', 7) + 1);
RTMPStream::chunk_snd_max = 65536; //64KiB RTMPStream::chunk_snd_max = 65536; //64KiB
myConn.SendNow(RTMPStream::SendCTL(1, RTMPStream::chunk_snd_max)); //send chunk size max (msg 1)
myConn.SendNow(RTMPStream::SendCTL(5, RTMPStream::snd_window_size)); //send window acknowledgement size (msg 5)
myConn.SendNow(RTMPStream::SendCTL(6, RTMPStream::rec_window_size)); //send rec window acknowledgement size (msg 6)
myConn.SendNow(RTMPStream::SendUSR(0, 1)); //send UCM StreamBegin (0), stream 1
//send a _result reply //send a _result reply
AMF::Object amfReply("container", AMF::AMF0_DDV_CONTAINER); AMF::Object amfReply("container", AMF::AMF0_DDV_CONTAINER);
amfReply.addContent(AMF::Object("", "_result")); //result success amfReply.addContent(AMF::Object("", "_result")); //result success
@ -571,6 +567,11 @@ namespace Mist{
//amfReply.getContentP(3)->addContent(AMF::Object("data", AMF::AMF0_ECMA_ARRAY)); //amfReply.getContentP(3)->addContent(AMF::Object("data", AMF::AMF0_ECMA_ARRAY));
//amfReply.getContentP(3)->getContentP(4)->addContent(AMF::Object("version", "3,5,4,1004")); //amfReply.getContentP(3)->getContentP(4)->addContent(AMF::Object("version", "3,5,4,1004"));
sendCommand(amfReply, messageType, streamId); sendCommand(amfReply, messageType, streamId);
//Send other stream-related packets
myConn.SendNow(RTMPStream::SendCTL(1, RTMPStream::chunk_snd_max)); //send chunk size max (msg 1)
myConn.SendNow(RTMPStream::SendCTL(5, RTMPStream::snd_window_size)); //send window acknowledgement size (msg 5)
myConn.SendNow(RTMPStream::SendCTL(6, RTMPStream::rec_window_size)); //send rec window acknowledgement size (msg 6)
myConn.SendNow(RTMPStream::SendUSR(0, 1)); //send UCM StreamBegin (0), stream 1
//send onBWDone packet - no clue what it is, but real server sends it... //send onBWDone packet - no clue what it is, but real server sends it...
//amfReply = AMF::Object("container", AMF::AMF0_DDV_CONTAINER); //amfReply = AMF::Object("container", AMF::AMF0_DDV_CONTAINER);
//amfReply.addContent(AMF::Object("", "onBWDone"));//result //amfReply.addContent(AMF::Object("", "onBWDone"));//result