Skip to content

Http.Sync now handles timeout responses raised as WebExceptions. These a... #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2014
Merged

Http.Sync now handles timeout responses raised as WebExceptions. These a... #493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions RestSharp/Http.Sync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,35 @@ partial void AddSyncHeaderActions()
_restrictedHeaderActions.Add("User-Agent", (r, v) => r.UserAgent = v);
}

private HttpResponse GetResponse(HttpWebRequest request)
private void ExtractErrorResponse(HttpResponse httpResponse, Exception ex)
{
var response = new HttpResponse();
response.ResponseStatus = ResponseStatus.None;
var webException = ex as WebException;

if (webException != null && webException.Status == WebExceptionStatus.Timeout)
{
httpResponse.ResponseStatus = ResponseStatus.TimedOut;
httpResponse.ErrorMessage = ex.Message;
httpResponse.ErrorException = webException;
return;
}

httpResponse.ErrorMessage = ex.Message;
httpResponse.ErrorException = ex;
httpResponse.ResponseStatus = ResponseStatus.Error;
}

private HttpResponse GetResponse(HttpWebRequest request)
{
var response = new HttpResponse { ResponseStatus = ResponseStatus.None };

try
{
var webResponse = GetRawResponse(request);
ExtractResponseData(response, webResponse);
}
catch (Exception ex)
{
response.ErrorMessage = ex.Message;
response.ErrorException = ex;
response.ResponseStatus = ResponseStatus.Error;
ExtractErrorResponse(response, ex);
}

return response;
Expand Down