Skip to content

Add ability to set Host and Date when built for .NET 4.0 #280

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
Jun 29, 2012
Merged

Add ability to set Host and Date when built for .NET 4.0 #280

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2ba8af
Add ability to set Host and Date when built for .NET 4.0
lukebakken May 17, 2012
057bd85
Move within correct preprocessor directive.
lukebakken May 17, 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
28 changes: 20 additions & 8 deletions RestSharp/Http.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,20 @@ private void AddSharedHeaderActions()
{
_restrictedHeaderActions.Add("Accept", (r, v) => r.Accept = v);
_restrictedHeaderActions.Add("Content-Type", (r, v) => r.ContentType = v);
#if NET4
_restrictedHeaderActions.Add("Date", (r, v) =>
{
DateTime parsed;
if (DateTime.TryParse(v, out parsed))
{
r.Date = parsed;
}
});
_restrictedHeaderActions.Add("Host", (r, v) => r.Host = v);
#else
_restrictedHeaderActions.Add("Date", (r, v) => { /* Set by system */ });
_restrictedHeaderActions.Add("Host", (r, v) => { /* Set by system */ });
#endif
#if FRAMEWORK
_restrictedHeaderActions.Add("Range", (r, v) => { AddRange(r, v); });
#endif
Expand Down Expand Up @@ -239,23 +251,23 @@ private void AppendCookies(HttpWebRequest webRequest)
foreach (var httpCookie in Cookies)
{
#if FRAMEWORK
var cookie = new Cookie
var cookie = new Cookie
{
Name = httpCookie.Name,
Value = httpCookie.Value,
Domain = webRequest.RequestUri.Host
};
webRequest.CookieContainer.Add(cookie);
#else
var cookie = new Cookie
var cookie = new Cookie
{
Name = httpCookie.Name,
Value = httpCookie.Value
};
var uri = webRequest.RequestUri;
webRequest.CookieContainer.Add(new Uri(string.Format("{0}://{1}", uri.Scheme, uri.Host)), cookie);
#endif
}
}
}

private string EncodeParameters()
Expand Down Expand Up @@ -325,12 +337,12 @@ private static void ExtractResponseData(HttpResponse response, HttpWebResponse w
response.ContentType = webResponse.ContentType;
response.ContentLength = webResponse.ContentLength;
#if WINDOWS_PHONE
if (string.Equals(webResponse.Headers[HttpRequestHeader.ContentEncoding], "gzip", StringComparison.OrdinalIgnoreCase))
response.RawBytes = new GZipStream(webResponse.GetResponseStream()).ReadAsBytes();
else
response.RawBytes = webResponse.GetResponseStream().ReadAsBytes();
if (string.Equals(webResponse.Headers[HttpRequestHeader.ContentEncoding], "gzip", StringComparison.OrdinalIgnoreCase))
response.RawBytes = new GZipStream(webResponse.GetResponseStream()).ReadAsBytes();
else
response.RawBytes = webResponse.GetResponseStream().ReadAsBytes();
#else
response.RawBytes = webResponse.GetResponseStream().ReadAsBytes();
response.RawBytes = webResponse.GetResponseStream().ReadAsBytes();
#endif
//response.Content = GetString(response.RawBytes);
response.StatusCode = webResponse.StatusCode;
Expand Down