Don't add callback wrappers on a JSONP CompressedResult which already has them (and doesn't corrupt the gzip'd payload)

Author: mythz

src/ServiceStack/CacheAccess.Providers/CacheClientExtensions.cs

@@ -24,7 +24,7 @@ public static object ResolveFromCache(this ICacheClient cacheClient,
 			IRequestContext context)
 		{
 			string modifiers = null;
-			if (context.ContentType == ContentType.Json)
+			if (context.ResponseContentType == ContentType.Json)
 			{
 				string jsonp = context.Get<IHttpRequest>().GetJsonpCallback();
 				if (jsonp != null)
@@ -70,7 +70,7 @@ public static object Cache(this ICacheClient cacheClient,
 			string serializedDto = EndpointHost.ContentTypeFilter.SerializeToString(context, responseDto);
 
 			string jsonp = null, modifiers = null;
-			if (context.ContentType == ContentType.Json)
+			if (context.ResponseContentType == ContentType.Json)
 			{
 				jsonp = context.Get<IHttpRequest>().GetJsonpCallback();
 				if (jsonp != null)

src/ServiceStack/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.7.1.0")]
+[assembly: AssemblyVersion("3.7.2.0")]

src/ServiceStack/WebHost.EndPoints/GenericHandler.cs

@@ -68,7 +68,7 @@ public override void ProcessRequest(IHttpRequest httpReq, IHttpResponse httpRes,
 				var response = GetResponse(httpReq, httpRes, request);
 				if (EndpointHost.ApplyResponseFilters(httpReq, httpRes, response)) return;
 
-				if (doJsonp)
+				if (doJsonp && !(response is CompressedResult))
 					httpRes.WriteToResponse(httpReq, response, (callback + "(").ToUtf8Bytes(), ")".ToUtf8Bytes());
 				else
 					httpRes.WriteToResponse(httpReq, response);

src/ServiceStack/WebHost.EndPoints/RestHandler.cs

@@ -69,7 +69,7 @@ public override void ProcessRequest(IHttpRequest httpReq, IHttpResponse httpRes,
 					return;
 				}
 
-                if(doJsonp)
+				if (doJsonp && !(response is CompressedResult))
                     httpRes.WriteToResponse(httpReq, response, (callback + "(").ToUtf8Bytes(), ")".ToUtf8Bytes());
                 else
                     httpRes.WriteToResponse(httpReq, response);