Skip to content

Commit 7fa5359

Browse files
_chunkedResponse condition depends only on TransferEncodingChunked header in the response.
1 parent 211451d commit 7fa5359

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,7 @@ public void AddHeader(string name, string value)
415415
GXLogging.Error(log, String.Format("Error parsing charset ", value, ex));
416416
}
417417
}
418-
if (name.Equals( HttpHeader.ACCEPT, StringComparison.OrdinalIgnoreCase) && value.Equals(HttpHeaderValue.ACCEPT_SERVER_SENT_EVENT, StringComparison.OrdinalIgnoreCase))
419-
_chunkedResponse = true;
420-
418+
421419
_headers.Set(name, value);
422420
}
423421
public void ClearVariables()
@@ -701,10 +699,7 @@ HttpResponseMessage ExecuteRequest(string method, string requestUrl, CookieConta
701699
reqStream.Seek(0, SeekOrigin.Begin);
702700
request.Content = new ByteArrayContent(reqStream.ToArray());
703701
setHeaders(request, handler.CookieContainer);
704-
if (_chunkedResponse)
705-
response = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).GetAwaiter().GetResult();
706-
else
707-
response = client.SendAsync(request).GetAwaiter().GetResult();
702+
response = client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead).GetAwaiter().GetResult();
708703
}
709704
}
710705
return response;
@@ -715,6 +710,7 @@ void ReadReponseContent(HttpResponseMessage response)
715710
try
716711
{
717712
Stream stream = response.Content.ReadAsStreamAsync().GetAwaiter().GetResult();
713+
_chunkedResponse = response.Headers.TransferEncodingChunked.HasValue && response.Headers.TransferEncodingChunked.Value;
718714
string charset;
719715
if (response.Content.Headers.ContentType == null)
720716
charset = null;
@@ -884,10 +880,6 @@ public void HttpClientExecute(string method, string name)
884880
_errDescription = "The remote server returned an error: (" + _statusCode + ") " + _statusDescription + ".";
885881
}
886882
ClearSendStream();
887-
if (!_chunkedResponse)
888-
{
889-
GXLogging.DebugSanitized(log, "_responseString " + ToString());
890-
}
891883
}
892884
NameValueCollection _respHeaders;
893885
private bool disposedValue;
@@ -1419,22 +1411,26 @@ public string ReadChunk()
14191411
}
14201412
public override string ToString()
14211413
{
1414+
string responseString;
14221415
if (_chunkedResponse)
14231416
{
14241417
StringBuilder sb = new StringBuilder();
14251418
while (!Eof){
14261419
sb.Append(ReadChunk());
14271420
}
1428-
return sb.ToString();
1421+
responseString = sb.ToString();
14291422
}
14301423
else
14311424
{
14321425
if (_encoding == null)
14331426
_encoding = Encoding.UTF8;
14341427
if (_receiveData == null)
14351428
return string.Empty;
1436-
return _encoding.GetString(_receiveData);
1429+
1430+
responseString = _encoding.GetString(_receiveData);
14371431
}
1432+
GXLogging.DebugSanitized(log, "_responseString " + responseString);
1433+
return responseString;
14381434
}
14391435
public void ToFile(string fileName)
14401436
{

0 commit comments

Comments
 (0)