Merge branch 'v4.1' into v4.2

AArnott · AArnott · commit 5f99dec3f56d · 2013-04-11T22:57:03.000-07:00
diff --git a/src/DotNetOpenAuth.Core/Messaging/OutgoingWebResponse.cs b/src/DotNetOpenAuth.Core/Messaging/OutgoingWebResponse.cs
@@ -9,6 +9,7 @@ namespace DotNetOpenAuth.Messaging {
 	using System.ComponentModel;
 	using System.Diagnostics.CodeAnalysis;
 	using System.Diagnostics.Contracts;
+	using System.Globalization;
 	using System.IO;
 	using System.Net;
 	using System.Net.Mime;
@@ -318,6 +319,7 @@ internal void SetResponse(string body, ContentType contentType) {
 			writer.Write(body);
 			writer.Flush();
 			this.ResponseStream.Seek(0, SeekOrigin.Begin);
+			this.Headers[HttpResponseHeader.ContentLength] = this.ResponseStream.Length.ToString(CultureInfo.InvariantCulture);
 		}
 
 		/// <summary>
diff --git a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/BearerTokenHttpMessageHandler.cs b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/BearerTokenHttpMessageHandler.cs
@@ -75,7 +75,7 @@ public BearerTokenHttpMessageHandler(ClientBase client, IAuthorizationState auth
 		protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) {
 			string bearerToken = this.BearerToken;
 			if (bearerToken == null) {
-				ErrorUtilities.VerifyProtocol(!this.Authorization.AccessTokenExpirationUtc.HasValue || this.Authorization.AccessTokenExpirationUtc < DateTime.UtcNow || this.Authorization.RefreshToken != null, ClientStrings.AuthorizationExpired);
+				ErrorUtilities.VerifyProtocol(!this.Authorization.AccessTokenExpirationUtc.HasValue || this.Authorization.AccessTokenExpirationUtc >= DateTime.UtcNow || this.Authorization.RefreshToken != null, ClientStrings.AuthorizationExpired);
 
 				if (this.Authorization.AccessTokenExpirationUtc.HasValue && this.Authorization.AccessTokenExpirationUtc.Value < DateTime.UtcNow) {
 					ErrorUtilities.VerifyProtocol(this.Authorization.RefreshToken != null, ClientStrings.AccessTokenRefreshFailed);
diff --git a/src/DotNetOpenAuth.OpenId/OpenId/Extensions/SimpleRegistration/ClaimsResponse.cs b/src/DotNetOpenAuth.OpenId/OpenId/Extensions/SimpleRegistration/ClaimsResponse.cs
@@ -192,7 +192,7 @@ public MailAddress MailAddress {
 		}
 
 		/// <summary>
-		/// Gets or sets a combination o the language and country of the user.
+		/// Gets or sets a combination of the language and country of the user.
 		/// </summary>
 		[XmlIgnore]
 		public CultureInfo Culture {
@@ -203,7 +203,16 @@ public CultureInfo Culture {
 					if (!string.IsNullOrEmpty(this.Country)) {
 						cultureString += "-" + this.Country;
 					}
-					this.culture = CultureInfo.GetCultureInfo(cultureString);
+
+					// language-country may not always form a recongized valid culture.
+					// For instance, a Google OpenID Provider can return a random combination
+					// of language and country based on user settings.
+					try {
+						this.culture = CultureInfo.GetCultureInfo(cultureString);
+					} catch (CultureNotFoundException) {
+						// Fallback to just reporting a culture based on language.
+						this.culture = CultureInfo.GetCultureInfo(this.Language);
+					}
 				}
 
 				return this.culture;
