Merge branch 'v4.1'

Conflicts:
	src/DotNetOpenAuth.OAuth2.ResourceServer/OAuth2/StandardAccessTokenAnalyzer.cs
	src/DotNetOpenAuth.Test/OAuth2/OAuth2TestBase.cs
	src/version.txt

1 files changed, 14 insertions, 0 deletions

diff --git a/src/DotNetOpenAuth.OAuth2.AuthorizationServer/OAuth2/AuthorizationServer.cs b/src/DotNetOpenAuth.OAuth2.AuthorizationServer/OAuth2/AuthorizationServer.cs
index 7d829c5..050a4ab 100644
--- a/src/DotNetOpenAuth.OAuth2.AuthorizationServer/OAuth2/AuthorizationServer.cs
+++ b/src/DotNetOpenAuth.OAuth2.AuthorizationServer/OAuth2/AuthorizationServer.cs
@@ -10,6 +10,9 @@ namespace DotNetOpenAuth.OAuth2 {
 	using System.Diagnostics.CodeAnalysis;
 	using System.Diagnostics.Contracts;
 	using System.Linq;
+#if CLR4
+	using System.Net.Http;
+#endif
 	using System.Security.Cryptography;
 	using System.Text;
 	using System.Web;
@@ -129,6 +132,17 @@ namespace DotNetOpenAuth.OAuth2 {
 			this.Channel.Respond(response);
 		}
 
+#if CLR4
+		/// <summary>
+		/// Handles an incoming request to the authorization server's token endpoint.
+		/// </summary>
+		/// <param name="request">The HTTP request.</param>
+		/// <returns>The HTTP response to send to the client.</returns>
+		public OutgoingWebResponse HandleTokenRequest(HttpRequestMessage request) {
+			return this.HandleTokenRequest(new HttpRequestInfo(request));
+		}
+#endif
+
 		/// <summary>
 		/// Handles an incoming request to the authorization server's token endpoint.
 		/// </summary>