Skip to content

Fix problem with overriding request defaults #309

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 2 commits into from
Aug 6, 2012
Merged

Fix problem with overriding request defaults #309

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e5282b
Fix problem with setting request timeout
haacked Aug 5, 2012
1912f1c
Don't overwrite http user agent with default
haacked Aug 5, 2012
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
21 changes: 10 additions & 11 deletions RestSharp/RestClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ namespace RestSharp
/// </summary>
public partial class RestClient : IRestClient
{
// silverlight friendly way to get current version
static readonly Version version = new AssemblyName(Assembly.GetExecutingAssembly().FullName).Version;

public IHttpFactory HttpFactory = new SimpleFactory<Http>();

/// <summary>
Expand All @@ -57,12 +60,6 @@ public RestClient()
AddHandler("text/xml", new XmlDeserializer());
AddHandler("*", new XmlDeserializer());

// silverlight friendly way to get current version
var assembly = Assembly.GetExecutingAssembly();
AssemblyName assemblyName = new AssemblyName(assembly.FullName);
var version = assemblyName.Version;

UserAgent = "RestSharp " + version.ToString();
FollowRedirects = true;
}

Expand Down Expand Up @@ -363,14 +360,16 @@ private void ConfigureHttp(IRestRequest request, IHttp http)
}

http.Url = BuildUri(request);

if(UserAgent.HasValue())

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

var timeout = request.Timeout > 0 ? request.Timeout : Timeout;
if (timeout > 0)
{
http.UserAgent = UserAgent;
http.Timeout = timeout;
}

http.Timeout = request.Timeout == 0 ? Timeout : request.Timeout;

#if !SILVERLIGHT
http.FollowRedirects = FollowRedirects;
#endif
Expand Down