Skip to content

Default user agent should be name/version #460

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
Nov 8, 2013
Merged

Default user agent should be name/version #460

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
60 changes: 30 additions & 30 deletions RestSharp/RestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,14 @@ public Uri BuildUri(IRestRequest request)
// build and attach querystring
if (parameters != null && parameters.Any())
{
var data = EncodeParameters(request, parameters);
var data = EncodeParameters(parameters);
assembled = string.Format("{0}?{1}", assembled, data);
}

return new Uri(assembled);
}

private string EncodeParameters(IRestRequest request, IEnumerable<Parameter> parameters)
private static string EncodeParameters(IEnumerable<Parameter> parameters)
{
var querystring = new StringBuilder();
foreach (var p in parameters)
Expand Down Expand Up @@ -312,7 +312,7 @@ private void ConfigureHttp(IRestRequest request, IHttp http)
}

// Add Accept header based on registered deserializers if none has been set by the caller.
if (!request.Parameters.Any(p2 => p2.Name.ToLowerInvariant() == "accept"))
if (request.Parameters.All(p2 => p2.Name.ToLowerInvariant() != "accept"))
{
var accepts = string.Join(", ", AcceptTypes.ToArray());
request.AddParameter("Accept", accepts, ParameterType.HttpHeader);
Expand All @@ -321,7 +321,7 @@ private void ConfigureHttp(IRestRequest request, IHttp http)
http.Url = BuildUri(request);

var userAgent = UserAgent ?? http.UserAgent;
http.UserAgent = userAgent.HasValue() ? userAgent : "RestSharp " + version.ToString();
http.UserAgent = userAgent.HasValue() ? userAgent : "RestSharp/" + version;

var timeout = request.Timeout > 0 ? request.Timeout : Timeout;
if (timeout > 0)
Expand Down Expand Up @@ -469,32 +469,32 @@ private IRestResponse<T> Deserialize<T>(IRestRequest request, IRestResponse raw)
{
request.OnBeforeDeserialization(raw);

IRestResponse<T> response = new RestResponse<T>();
try
{
response = raw.toAsyncResponse<T>();
response.Request = request;

// Only attempt to deserialize if the request has not errored due
// to a transport or framework exception. HTTP errors should attempt to
// be deserialized

if (response.ErrorException==null)
{
IDeserializer handler = GetHandler(raw.ContentType);
handler.RootElement = request.RootElement;
handler.DateFormat = request.DateFormat;
handler.Namespace = request.XmlNamespace;

response.Data = handler.Deserialize<T>(raw);
}
}
catch (Exception ex)
{
response.ResponseStatus = ResponseStatus.Error;
response.ErrorMessage = ex.Message;
response.ErrorException = ex;
}
IRestResponse<T> response = new RestResponse<T>();
try
{
response = raw.toAsyncResponse<T>();
response.Request = request;

// Only attempt to deserialize if the request has not errored due
// to a transport or framework exception. HTTP errors should attempt to
// be deserialized

if (response.ErrorException==null)
{
IDeserializer handler = GetHandler(raw.ContentType);
handler.RootElement = request.RootElement;
handler.DateFormat = request.DateFormat;
handler.Namespace = request.XmlNamespace;

response.Data = handler.Deserialize<T>(raw);
}
}
catch (Exception ex)
{
response.ResponseStatus = ResponseStatus.Error;
response.ErrorMessage = ex.Message;
response.ErrorException = ex;
}

return response;
}
Expand Down