Revert "Add support for chunked httpclient and httpresponse. (#823)"

This reverts commit 4fbfb00.

Author: ggallotti

dotnet/src/dotnetframework/GxClasses/Core/Web/GxHttpServer.cs

@@ -12,6 +12,12 @@ namespace GeneXus.Http.Server
 	using System.Linq;
 	using Microsoft.AspNetCore.Http.Features;
 	using System.Text;
+	using System.Threading.Tasks;
+	using Microsoft.AspNetCore.Mvc.Formatters;
+	using System.Net.Http;
+	using Stubble.Core.Contexts;
+	using System.Net.Mime;
+
 #endif
 
 	public class GxHttpCookie

dotnet/src/dotnetframework/GxClasses/Domain/GxHttpClient.cs

@@ -66,7 +66,6 @@ public class GxHttpClient : IGxHttpClient, IDisposable
 		const int StreamWriterDefaultBufferSize = 1024;
 		Stream _sendStream;
 		byte[] _receiveData;
-		StreamReader _receiveStream;
 		int _timeout = 30000;
 		short _statusCode = 0;
 		string _proxyHost;
@@ -134,14 +133,6 @@ internal byte[] ReceiveData
 		{
 			get
 			{
-				if (_chunkedResponse && _receiveData == null && _receiveStream!=null)
-				{
-					using (MemoryStream memstream = new MemoryStream())
-					{
-						_receiveStream.BaseStream.CopyTo(memstream);
-						_receiveData = memstream.ToArray();
-					}
-				}
 				return _receiveData;
 			}
 		}
@@ -423,7 +414,6 @@ public void AddHeader(string name, string value)
 					GXLogging.Error(log, String.Format("Error parsing charset ", value, ex));
 				}
 			}
-		
 			_headers.Set(name, value);
 		}
 		public void ClearVariables()
@@ -707,7 +697,7 @@ HttpResponseMessage ExecuteRequest(string method, string requestUrl, CookieConta
 					reqStream.Seek(0, SeekOrigin.Begin);
 					request.Content = new ByteArrayContent(reqStream.ToArray());
 					setHeaders(request, handler.CookieContainer);
-					response = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).GetAwaiter().GetResult();
+					response = client.SendAsync(request).GetAwaiter().GetResult();
 				}
 			}
 			return response;
@@ -718,7 +708,6 @@ void ReadReponseContent(HttpResponseMessage response)
 			try
 			{
 				Stream stream = response.Content.ReadAsStreamAsync().GetAwaiter().GetResult();
-				_chunkedResponse = response.Headers.TransferEncodingChunked.HasValue && response.Headers.TransferEncodingChunked.Value;
 				string charset;
 				if (response.Content.Headers.ContentType == null)
 					charset = null;
@@ -741,28 +730,18 @@ void ReadReponseContent(HttpResponseMessage response)
 						charset = String.Empty;
 					}
 				}
-				if (_chunkedResponse)
+				
+				using (MemoryStream ms = new MemoryStream())
 				{
-					if (_encoding == null)
-						_encoding = Encoding.UTF8;
-
-					_receiveStream = new StreamReader(stream, _encoding);
-					_receiveData = null;
+					stream.CopyTo(ms);
+					_receiveData = ms.ToArray();
 				}
-				else
+				int bytesRead = _receiveData.Length;
+				GXLogging.Debug(log, "BytesRead " + _receiveData.Length);
+				if (bytesRead > 0 && !encodingFound)
 				{
-					using (MemoryStream ms = new MemoryStream())
-					{
-						stream.CopyTo(ms);
-						_receiveData = ms.ToArray();
-					}
-					int bytesRead = _receiveData.Length;
-					GXLogging.Debug(log, "BytesRead " + _receiveData.Length);
-					if (bytesRead > 0 && !encodingFound)
-					{
-						_encoding = DetectEncoding(charset, out encodingFound, _receiveData, bytesRead);
-					}
-				}
+					_encoding = DetectEncoding(charset, out encodingFound, _receiveData, bytesRead);
+				}				
 			}
 			catch (IOException ioEx)
 			{
@@ -808,7 +787,7 @@ public void Execute(string method, string name)
 
 		public void HttpClientExecute(string method, string name)
 		{
-			response = null;
+			HttpResponseMessage response = null;
 			Byte[] Buffer = new Byte[1024];
 			_errCode = 0;
 			_errDescription = string.Empty;
@@ -889,11 +868,11 @@ public void HttpClientExecute(string method, string name)
 				_errDescription = "The remote server returned an error: (" + _statusCode + ") " + _statusDescription + ".";
 			}
 			ClearSendStream();
+			GXLogging.DebugSanitized(log, "_responseString " + ToString());
 		}
 		NameValueCollection _respHeaders;
 		private bool disposedValue;
-		private bool _chunkedResponse;
-		HttpResponseMessage response;
+
 		void LoadResponseHeaders(HttpResponseMessage resp)
 		{
 			_respHeaders = new NameValueCollection();
@@ -1381,65 +1360,14 @@ private Encoding ExtractEncodingFromCharset(string responseText, string regExpP,
 			}
 			return enc;
 		}
-		public bool Eof
-		{
-			get
-			{
-				if (_chunkedResponse && _receiveStream != null)
-				{
-					return _receiveStream.EndOfStream;
-				}
-				return true;
-			}
-		}
 
-		public string ReadChunk()
-		{
-			if (_chunkedResponse)
-			{
-				if (_receiveStream != null)
-				{
-					if (!_receiveStream.EndOfStream)
-					{
-						string line = _receiveStream.ReadLine();
-						if (line != null)
-							return line;
-					}
-					else
-					{
-						_receiveStream.Dispose();
-						_receiveStream = null;
-						response.Dispose();
-						response = null;
-					}
-				}
-				return string.Empty;
-			}
-			else
-				return ToString();
-		}
 		public override string ToString()
 		{
-			string responseString;
-			if (_chunkedResponse)
-			{
-				StringBuilder sb = new StringBuilder();
-				while (!Eof){
-					sb.Append(ReadChunk());
-				}
-				responseString = sb.ToString();
-			}
-			else
-			{
-				if (_encoding == null)
-					_encoding = Encoding.UTF8;
-				if (_receiveData == null)
-					return string.Empty;
-
-				responseString = _encoding.GetString(_receiveData);
-			}
-			GXLogging.DebugSanitized(log, "_responseString " + responseString);
-			return responseString;
+			if (_encoding == null)
+				_encoding = Encoding.UTF8;
+			if (_receiveData == null)
+				return string.Empty;
+			return _encoding.GetString(_receiveData);
 		}
 		public void ToFile(string fileName)
 		{
@@ -1529,7 +1457,6 @@ protected virtual void Dispose(bool disposing)
 				{
 					_receiveData = null;
 					_sendStream?.Dispose();
-					_receiveStream?.Dispose();
 				}
 				disposedValue = true;
 			}

dotnet/src/dotnetframework/GxClasses/Helpers/HttpHelper.cs

@@ -48,13 +48,6 @@ public class HttpHeader
 		public static string LAST_MODIFIED = "Last-Modified";
 		public static string EXPIRES = "Expires";
 		public static string XGXFILENAME = "x-gx-filename";
-		internal static string ACCEPT = "Accept";
-		internal static string TRANSFER_ENCODING = "Transfer-Encoding";
-	}
-	internal class HttpHeaderValue
-	{
-		internal static string ACCEPT_SERVER_SENT_EVENT = "text/event-stream";
-		internal static string TRANSFER_ENCODING_CHUNKED = "chunked";
 	}
 	[DataContract()]
 	public class HttpJsonError

dotnet/src/dotnetframework/GxClasses/Middleware/GXHttp.cs

@@ -1933,10 +1933,10 @@ public void ProcessRequest(HttpContext httpContext)
 			InitPrivates();
 			try
 			{
-				SetStreaming();
+#if NETCORE
 				SendHeaders();
 				string clientid = context.ClientID; //Send clientid cookie (before response HasStarted) if necessary, since UseResponseBuffering is not in .netcore3.0
-
+#endif
 				bool validSession = ValidWebSession();
 				if (validSession && IntegratedSecurityEnabled)
 					validSession = ValidSession();
@@ -1971,6 +1971,9 @@ public void ProcessRequest(HttpContext httpContext)
 						context.DispatchAjaxCommands();
 				}
 				SetCompression(httpContext);
+#if !NETCORE
+				SendHeaders();
+#endif
 				context.ResponseCommited = true;
 			}
 			catch (Exception e)
@@ -1985,25 +1988,6 @@ public void ProcessRequest(HttpContext httpContext)
 				throw new Exception("GXApplication exception", e);
 			}
 		}
-		protected virtual bool ChunkedStreaming() { return false; }
-
-		private void SetStreaming()
-		{
-#if !NETCORE
-			if (ChunkedStreaming())
-			{
-				BringSessionStateToLife();
-				context.HttpContext.Response.BufferOutput = false;
-			}
-#endif
-		}
-#if !NETCORE
-		private void BringSessionStateToLife()
-		{
-			string sessionId = context.HttpContext.Session.SessionID;
-			GXLogging.Debug(log, "Session is alive: " + sessionId);
-		}
-#endif
 		internal string DumpHeaders(HttpContext httpContext)
 		{
 			StringBuilder str = new StringBuilder();
@@ -2049,6 +2033,7 @@ private bool ValidWebSession()
 #else
 			bool isExpired = IsFullAjaxRequest(HttpContext.Current) && this.AjaxOnSessionTimeout() == "Warn" && GxWebSession.IsSessionExpired(localHttpContext);
 #endif
+
 			if (isExpired)
 			{
 				GXLogging.Info(log, "440 Session timeout. Web Session has expired and GX' OnSessionTimeout' Pty is set to 'WARN'");
@@ -2236,15 +2221,23 @@ public virtual void sendAdditionalHeaders()
 						return;
 
 					string safeIECompMode = IE_COMP_Edge.Equals(IE_COMP_EmulateIE7) ? IE_COMP_Edge : IE_COMP_Edge;
+#if NETCORE
 					localHttpContext.Response.Headers["X-UA-Compatible"] = "IE=" + safeIECompMode;
+#else
+					localHttpContext.Response.AddHeader("X-UA-Compatible", "IE=" + safeIECompMode);
+#endif
 				}
 			}
 
 		}
 
 		protected virtual void sendSpaHeaders()
 		{
+#if NETCORE
 			localHttpContext.Response.Headers[GX_SPA_GXOBJECT_RESPONSE_HEADER] = GetPgmname().ToLower();
+#else
+			localHttpContext.Response.AddHeader(GX_SPA_GXOBJECT_RESPONSE_HEADER, GetPgmname().ToLower());
+#endif
 		}
 
 		private void webExecuteWorker(object target)
@@ -3070,6 +3063,15 @@ public abstract class GXDataArea : GXHttpHandler
 
 		protected GXMasterPage MasterPageObj { get; set; }
 
+		protected override void sendSpaHeaders()
+		{
+			base.sendSpaHeaders();
+			if (MasterPageObj != null)
+			{
+				localHttpContext.Response.AddHeader(GX_SPA_MASTERPAGE_HEADER, MasterPageObj.GetPgmname());
+			}
+		}
+
 		protected override void ValidateSpaRequest()
 		{
 			string sourceMasterPage = localHttpContext.Request.Headers[GX_SPA_MASTERPAGE_HEADER];
@@ -3078,10 +3080,6 @@ protected override void ValidateSpaRequest()
 				context.DisableSpaRequest();
 				sendSpaHeaders();
 			}
-			if (MasterPageObj != null)
-			{
-				localHttpContext.Response.Headers[GX_SPA_MASTERPAGE_HEADER] = MasterPageObj.GetPgmname();
-			}
 		}
 	}
 	public class GXDataAreaControl

dotnet/src/dotnetframework/GxClasses/Model/GXWebProcedure.cs

@@ -8,11 +8,6 @@ namespace GeneXus.Procedure
 	using System.Threading;
 	using GeneXus.Mime;
 	using GeneXus.Utils;
-#if NETCORE
-	using Microsoft.AspNetCore.Http;
-#else
-	using System.Web;
-#endif
 	using log4net;
 	using GeneXus.Application;
 	using GeneXus.Data.NTier;
@@ -51,13 +46,7 @@ public override void cleanup()
 				context.DeleteReferer();
 			}
 		}
-		protected override void SetCompression(HttpContext httpContext)
-		{
-			if (!ChunkedStreaming())
-			{
-				base.SetCompression(httpContext);
-			}
-		}
+
 		public void setContextReportHandler()
 		{