From 8e16728b42758902f9a9eaf32a7e7aaaf180b6bd Mon Sep 17 00:00:00 2001 From: "honza.pofider@seznam.cz" Date: Thu, 10 Nov 2016 17:14:11 +0100 Subject: [PATCH] fix #20 --- .../jsreport.Client/JsReportWebHandler.cs | 20 +------------------ .../Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/jsreport/jsreport.Client/JsReportWebHandler.cs b/jsreport/jsreport.Client/JsReportWebHandler.cs index 82e9a35..a531324 100644 --- a/jsreport/jsreport.Client/JsReportWebHandler.cs +++ b/jsreport/jsreport.Client/JsReportWebHandler.cs @@ -21,8 +21,6 @@ public void ProcessRequest(HttpContext context) if (ReportingService == null) throw new InvalidOperationException("Missing ReportingService on JsReportWebHandler"); - var url = CreateRequestUrl(context); - var request = (HttpWebRequest)WebRequest.Create(ReportingService.ServiceUri.ToString().TrimEnd('/') + context.Request.Url.PathAndQuery.Replace("/jsreport.axd", "")); request.Method = context.Request.HttpMethod; @@ -47,22 +45,6 @@ public void ProcessRequest(HttpContext context) } } - private static string CreateRequestUrl(HttpContext context) - { - string url = context.Request.QueryString["url"] ?? "/"; - - if (url.Contains("?")) - url += "&"; - else - url += "?"; - - if (!url.EndsWith("&")) - url += "&"; - - url += "serverUrl=" + context.Server.UrlEncode(context.Request.Url.GetLeftPart(UriPartial.Authority) + "/jsreport.axd?url=/"); - return url; - } - private static void ParseRequestHeaders(HttpContext context, HttpWebRequest request) { foreach (string header in context.Request.Headers.AllKeys) @@ -124,7 +106,7 @@ private static void ProcessResponse(HttpContext context, HttpWebResponse respons context.Response.StatusCode = (int)responseMerge.StatusCode; - if (context.Request.Path == "/jsreport.axd") + if (context.Request.Path == "/jsreport.axd" || context.Request.Path == "/jsreport.axd/") { using (var reader = new StreamReader(responseMerge.GetResponseStream())) { diff --git a/jsreport/jsreport.Client/Properties/AssemblyInfo.cs b/jsreport/jsreport.Client/Properties/AssemblyInfo.cs index c3abe0f..7a26d64 100644 --- a/jsreport/jsreport.Client/Properties/AssemblyInfo.cs +++ b/jsreport/jsreport.Client/Properties/AssemblyInfo.cs @@ -26,5 +26,5 @@ // 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("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] +[assembly: AssemblyVersion("1.0.3.0")] +[assembly: AssemblyFileVersion("1.0.3.0")]