Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -212,21 +212,18 @@ namespace System.Web.Security
strCookiePath = cookiePath;
DateTime now = DateTime.Now;
DateTime then;
if (createPersistentCookie)
then = now.AddMinutes(timeout);
else
then = DateTime.MinValue;
DateTime ticketExpiry = now.AddMinutes(timeout);
DateTime cookieExpiry = createPersistentCookie ? ticketExpiry : DateTime.MinValue;
FormsAuthenticationTicket ticket = new FormsAuthenticationTicket (1,
userName,
now,
createPersistentCookie?then:now.AddYears (50),
ticketExpiry,
createPersistentCookie,
String.Empty,
cookiePath);
HttpCookie cookie = new HttpCookie (cookieName, Encrypt (ticket), strCookiePath, then);
HttpCookie cookie = new HttpCookie (cookieName, Encrypt (ticket), strCookiePath, cookieExpiry);
if (requireSSL)
cookie.Secure = true;
if (!String.IsNullOrEmpty (cookie_domain))