summaryrefslogtreecommitdiffstats
path: root/src/DotNetOpenAuth.Core/Messaging
diff options
context:
space:
mode:
authorAndrew Arnott <andrewarnott@gmail.com>2013-01-01 07:50:22 -0800
committerAndrew Arnott <andrewarnott@gmail.com>2013-01-01 07:50:22 -0800
commit6e9889a61aa3fac1331d14ef18c95718c198c831 (patch)
tree05eba3233336d6e3703f5c632571cc5048aefc85 /src/DotNetOpenAuth.Core/Messaging
parenta72f4df236e67f9c965863b6c43954b085cf8f6b (diff)
downloadDotNetOpenAuth-6e9889a61aa3fac1331d14ef18c95718c198c831.zip
DotNetOpenAuth-6e9889a61aa3fac1331d14ef18c95718c198c831.tar.gz
DotNetOpenAuth-6e9889a61aa3fac1331d14ef18c95718c198c831.tar.bz2
OpenID RP login actually works now.
Diffstat (limited to 'src/DotNetOpenAuth.Core/Messaging')
-rw-r--r--src/DotNetOpenAuth.Core/Messaging/Bindings/StandardExpirationBindingElement.cs2
-rw-r--r--src/DotNetOpenAuth.Core/Messaging/Channel.cs2
-rw-r--r--src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/DotNetOpenAuth.Core/Messaging/Bindings/StandardExpirationBindingElement.cs b/src/DotNetOpenAuth.Core/Messaging/Bindings/StandardExpirationBindingElement.cs
index ace4cf5..3cb4500 100644
--- a/src/DotNetOpenAuth.Core/Messaging/Bindings/StandardExpirationBindingElement.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/Bindings/StandardExpirationBindingElement.cs
@@ -104,7 +104,7 @@ namespace DotNetOpenAuth.Messaging.Bindings {
return CompletedExpirationTask;
}
- return null;
+ return NullTask;
}
#endregion
diff --git a/src/DotNetOpenAuth.Core/Messaging/Channel.cs b/src/DotNetOpenAuth.Core/Messaging/Channel.cs
index 4d35c90..9d55e78 100644
--- a/src/DotNetOpenAuth.Core/Messaging/Channel.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/Channel.cs
@@ -813,7 +813,7 @@ namespace DotNetOpenAuth.Messaging {
};
response.Headers.Location = builder.Uri;
- response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/html; charset=utf-8");
+ response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/html") { CharSet = "utf-8" };
return response;
}
diff --git a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
index 9aee0e3..4f4eb66 100644
--- a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
@@ -1978,7 +1978,7 @@ namespace DotNetOpenAuth.Messaging {
public override void ExecuteResult(ControllerContext context) {
context.HttpContext.Response.StatusCode = (int)this.response.StatusCode;
- context.HttpContext.Response.Status = this.response.ReasonPhrase;
+ context.HttpContext.Response.StatusDescription = this.response.ReasonPhrase;
foreach (var header in this.response.Headers) {
foreach (var value in header.Value) {
context.HttpContext.Response.AddHeader(header.Key, value);