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

Added support for overriding multiplexing behaviour of HTTP proxy connector.

Browse source
This commit is contained in:
Thulinma 2014-02-13 10:33:01 +01:00
parent bda368b75f
commit 537c3cff94
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/connectors/conn_http.cpp
View file

@ -508,7 +508,7 @@ namespace Connector_HTTP {
}else{ }else{
long long int ret = Util::getMS(); long long int ret = Util::getMS();
//success, check type of response //success, check type of response
if (H.GetHeader("Content-Length") != "" || H.GetHeader("Transfer-Encoding") == "chunked"){ if (H.GetHeader("MistMultiplex") != "No" && (H.GetHeader("Content-Length") != "" || H.GetHeader("Transfer-Encoding") == "chunked")){
//known length - simply re-send the request with added headers and continue //known length - simply re-send the request with added headers and continue
DEBUG_MSG(DLVL_HIGH, "Proxying %s - known length or chunked transfer encoding", uid.c_str()); DEBUG_MSG(DLVL_HIGH, "Proxying %s - known length or chunked transfer encoding", uid.c_str());
H.SetHeader("X-UID", uid); H.SetHeader("X-UID", uid);

6
src/connectors/conn_http_progressive_mp4.cpp
View file

@ -509,6 +509,10 @@ namespace Connector_HTTP {
std::stringstream rangeReply; std::stringstream rangeReply;
rangeReply << "bytes " << byteStart << "-" << byteEnd << "/" << size; rangeReply << "bytes " << byteStart << "-" << byteEnd << "/" << size;
HTTP_S.SetHeader("Content-Length", byteEnd - byteStart + 1); HTTP_S.SetHeader("Content-Length", byteEnd - byteStart + 1);
//do not multiplex requests that are > 1MiB
if (byteEnd - byteStart + 1 > 1024*1024){
HTTP_S.SetHeader("MistMultiplex", "No");
}
HTTP_S.SetHeader("Content-Range", rangeReply.str()); HTTP_S.SetHeader("Content-Range", rangeReply.str());
/// \todo Switch to chunked? /// \todo Switch to chunked?
HTTP_S.SendResponse("206", "Partial content", conn); HTTP_S.SendResponse("206", "Partial content", conn);
@ -516,6 +520,8 @@ namespace Connector_HTTP {
} }
}else{ }else{
HTTP_S.SetHeader("Content-Length", byteEnd - byteStart + 1); HTTP_S.SetHeader("Content-Length", byteEnd - byteStart + 1);
//do not multiplex requests that aren't ranged
HTTP_S.SetHeader("MistMultiplex", "No");
/// \todo Switch to chunked? /// \todo Switch to chunked?
HTTP_S.SendResponse("200", "OK", conn); HTTP_S.SendResponse("200", "OK", conn);
//HTTP_S.StartResponse(HTTP_R, conn); //HTTP_S.StartResponse(HTTP_R, conn);