Merge pull request restsharp#380 from ixkor/FastAbortBug

Fix bug with no setting ResponseStatus.Aborted if the request was aborted just after starting.

Author: haacked

RestSharp/Http.Async.cs

@@ -110,15 +110,26 @@ private HttpWebRequest GetStyleMethodInternalAsync(string method, Action<HttpRes
 			}
 			catch(Exception ex)
 			{
-				var response = new HttpResponse();
-				response.ErrorMessage = ex.Message;
-				response.ErrorException = ex;
-				response.ResponseStatus = ResponseStatus.Error;
-				ExecuteCallback(response, callback);
+				ExecuteCallback(CreateErrorResponse(ex), callback);
 			}
 			return webRequest;
 		}
 
+		private HttpResponse CreateErrorResponse(Exception ex)
+		{
+			var response = new HttpResponse();
+			if (ex is WebException && ((WebException)ex).Status == WebExceptionStatus.RequestCanceled)
+			{
+				response.ResponseStatus = _timeoutState.TimedOut ? ResponseStatus.TimedOut : ResponseStatus.Aborted;
+				return response;
+			}
+
+			response.ErrorMessage = ex.Message;
+			response.ErrorException = ex;
+			response.ResponseStatus = ResponseStatus.Error;
+			return response;
+		}
+
 		private HttpWebRequest PutPostInternalAsync(string method, Action<HttpResponse> callback)
 		{
 			HttpWebRequest webRequest = null;
@@ -130,11 +141,7 @@ private HttpWebRequest PutPostInternalAsync(string method, Action<HttpResponse>
 			}
 			catch(Exception ex)
 			{
-				var response = new HttpResponse();
-				response.ErrorMessage = ex.Message;
-				response.ErrorException = ex;
-				response.ResponseStatus = ResponseStatus.Error;
-				ExecuteCallback(response, callback);
+				ExecuteCallback(CreateErrorResponse(ex), callback);
 			}
 
 			return webRequest;
@@ -221,21 +228,7 @@ private void RequestStreamCallback(IAsyncResult result, Action<HttpResponse> cal
 			}
 			catch (Exception ex)
 			{
-				HttpResponse response;
-				if (ex is WebException && ((WebException)ex).Status == WebExceptionStatus.RequestCanceled)
-				{
-					response = new HttpResponse {ResponseStatus = ResponseStatus.TimedOut};
-					ExecuteCallback (response, callback);
-					return;
-				}
-				
-				response = new HttpResponse
-				{
-					ErrorMessage = ex.Message,
-					ErrorException = ex,
-					ResponseStatus = ResponseStatus.Error
-				};
-				ExecuteCallback(response, callback);
+				ExecuteCallback(CreateErrorResponse(ex), callback);
 				return;
 			}
 
@@ -328,17 +321,7 @@ private void ResponseCallback(IAsyncResult result, Action<HttpResponse> callback
 			}
 			catch(Exception ex)
 			{
-				if(ex is WebException && ((WebException)ex).Status == WebExceptionStatus.RequestCanceled)
-				{
-					response.ResponseStatus = ResponseStatus.Aborted;
-					ExecuteCallback(response, callback);
-					return;
-				}
-
-				response.ErrorMessage = ex.Message;
-				response.ErrorException = ex;
-				response.ResponseStatus = ResponseStatus.Error;
-				ExecuteCallback(response, callback);
+				ExecuteCallback(CreateErrorResponse(ex), callback);
 			}
 		}
 

RestSharp/RestClient.Async.cs

@@ -150,7 +150,7 @@ public virtual RestRequestAsyncHandle ExecuteAsyncPost<T>(IRestRequest request,
 		private void DeserializeResponse<T>(IRestRequest request, Action<IRestResponse<T>, RestRequestAsyncHandle> callback, IRestResponse response, RestRequestAsyncHandle asyncHandle)
 		{
 			IRestResponse<T> restResponse = response as RestResponse<T>;
-			if (response.ResponseStatus != ResponseStatus.Aborted)
+			if (response.ResponseStatus == ResponseStatus.Completed)
 			{
 				restResponse = Deserialize<T>(request, response);
 			}