themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'master' into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2013-09-15 15:24:15 -06:00
commit dd05c524ec
2 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/Rest/Rest.cs
View file

@ -135,6 +135,11 @@ namespace Rests
return;
var str = JsonConvert.SerializeObject(obj, Formatting.Indented);
var jsonp = e.Request.Parameters["jsonp"];
if (!string.IsNullOrWhiteSpace(jsonp))
{
str = string.Format("{0}({1});", jsonp, str);
}
e.Response.Connection.Type = ConnectionType.Close;
e.Response.ContentType = new ContentTypeHeader("application/json");
e.Response.Add(serverHeader);