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

Merge branch 'development' of github.com:DDVTECH/DMS into development

Browse source
This commit is contained in:
Niels Groot Obbink 2012-08-29 16:27:31 +02:00
commit 3acbd7cb36
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/conn_http.cpp
View file

@ -166,7 +166,7 @@ namespace Connector_HTTP{
response += "mistvideo['" + streamname + "'] = "+json_resp.toString()+";\n"; response += "mistvideo['" + streamname + "'] = "+json_resp.toString()+";\n";
if (url.substr(0, 6) != "/info_" && !json_resp.isMember("error")){ if (url.substr(0, 6) != "/info_" && !json_resp.isMember("error")){
response.append("\n("); response.append("\n(");
response.append((char*)embed_js, (size_t)embed_js_len); response.append((char*)embed_js, (size_t)embed_js_len-2);//remove trailing ";\n" from xxd conversion
response.append("(\"" + streamname + "\"));\n"); response.append("(\"" + streamname + "\"));\n");
} }
H.SetBody(response); H.SetBody(response);