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

Fixed info_streamname.js output, was outputting embed_streamname.js output instead.

Browse source
This commit is contained in:
Thulinma 2014-11-05 15:34:59 +01:00
parent d1bbb26e96
commit e6fce96650
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/output/output_http_internal.cpp
View file

@ -219,6 +219,7 @@ namespace Mist {
if ((H.url.length() > 9 && H.url.substr(0, 6) == "/info_" && H.url.substr(H.url.length() - 3, 3) == ".js") || (H.url.length() > 10 && H.url.substr(0, 7) == "/embed_" && H.url.substr(H.url.length() - 3, 3) == ".js")){
std::string response;
std::string rURL = H.url;
std::string host = H.GetHeader("Host");
if (host.find(':') != std::string::npos){
host.resize(host.find(':'));
@ -338,7 +339,7 @@ namespace Mist {
configLock.close();
#include "../embed.js.h"
response += "mistvideo['" + streamName + "'] = " + json_resp.toString() + ";\n";
if (H.url.substr(0, 6) != "/info_" && !json_resp.isMember("error")){
if (rURL.substr(0, 6) != "/info_" && !json_resp.isMember("error")){
response.append("\n(");
if (embed_js[embed_js_len - 2] == ';'){//check if we have a trailing ;\n or just \n
response.append((char*)embed_js, (size_t)embed_js_len - 2); //remove trailing ";\n" from xxd conversion