A few more fixes.

AArnott · AArnott · commit 9c7bd4ad8a4d · 2013-03-04T14:32:02.000-08:00
diff --git a/projecttemplates/WebFormsRelyingParty/Members/OAuthAuthorize.aspx.cs b/projecttemplates/WebFormsRelyingParty/Members/OAuthAuthorize.aspx.cs
@@ -40,6 +40,7 @@ protected async void Page_Load(object sender, EventArgs e) {
 					var response = OAuthServiceProvider.AuthorizationServer.PrepareApproveAuthorizationRequest(this.pendingRequest, HttpContext.Current.User.Identity.Name);
 					var responseMessage = await OAuthServiceProvider.AuthorizationServer.Channel.PrepareResponseAsync(response, Response.ClientDisconnectedToken);
 					await responseMessage.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);
+					this.Context.Response.End();
 				}
 				this.ViewState["AuthRequest"] = this.pendingRequest;
 			} else {
@@ -60,12 +61,14 @@ protected async void yesButton_Click(object sender, EventArgs e) {
 			var response = OAuthServiceProvider.AuthorizationServer.PrepareApproveAuthorizationRequest(this.pendingRequest, HttpContext.Current.User.Identity.Name);
 			var responseMessage = await OAuthServiceProvider.AuthorizationServer.Channel.PrepareResponseAsync(response, Response.ClientDisconnectedToken);
 			await responseMessage.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);
+			this.Context.Response.End();
 		}
 
 		protected async void noButton_Click(object sender, EventArgs e) {
 			var response = OAuthServiceProvider.AuthorizationServer.PrepareRejectAuthorizationRequest(this.pendingRequest);
 			var responseMessage = await OAuthServiceProvider.AuthorizationServer.Channel.PrepareResponseAsync(response, Response.ClientDisconnectedToken);
 			await responseMessage.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);
+			this.Context.Response.End();
 		}
 	}
 }
diff --git a/samples/OAuthClient/Facebook.aspx.cs b/samples/OAuthClient/Facebook.aspx.cs
@@ -20,6 +20,7 @@ protected async void Page_Load(object sender, EventArgs e) {
 				// Kick off authorization request
 				var request = await client.PrepareRequestUserAuthorizationAsync(cancellationToken: Response.ClientDisconnectedToken);
 				await request.SendAsync(new HttpContextWrapper(Context), Response.ClientDisconnectedToken);
+				this.Context.Response.End();
 			} else {
 				var request = WebRequest.Create("https://graph.facebook.com/me?access_token=" + Uri.EscapeDataString(authorization.AccessToken));
 				using (var response = request.GetResponse()) {
diff --git a/samples/OAuthClient/SampleWcf2.aspx.cs b/samples/OAuthClient/SampleWcf2.aspx.cs
@@ -83,6 +83,7 @@ where item.Selected
 
 			var request = await Client.PrepareRequestUserAuthorizationAsync(scopes, cancellationToken: Response.ClientDisconnectedToken);
 			await request.SendAsync();
+			this.Context.Response.End();
 		}
 
 		protected async void getNameButton_Click(object sender, EventArgs e) {
diff --git a/samples/OAuthClient/WindowsLive.aspx.cs b/samples/OAuthClient/WindowsLive.aspx.cs
@@ -31,6 +31,7 @@ protected async void Page_Load(object sender, EventArgs e) {
 					// Kick off authorization request
 					var request = await client.PrepareRequestUserAuthorizationAsync(scopes: new[] { WindowsLiveClient.Scopes.Basic }); // this scope isn't even required just to log in
 					await request.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);
+					this.Context.Response.End();
 				} else {
 					var request =
 						WebRequest.Create("https://apis.live.net/v5.0/me?access_token=" + Uri.EscapeDataString(authorization.AccessToken));
diff --git a/samples/OAuthServiceProvider/Members/Authorize.aspx.cs b/samples/OAuthServiceProvider/Members/Authorize.aspx.cs
@@ -60,6 +60,7 @@ protected async void allowAccessButton_Click(object sender, EventArgs e) {
 			if (response != null) {
 				var responseMessage = await sp.Channel.PrepareResponseAsync(response, Response.ClientDisconnectedToken);
 				await responseMessage.SendAsync();
+				this.Context.Response.End();
 			} else {
 				if (pending.IsUnsafeRequest) {
 					this.verifierMultiView.ActiveViewIndex = 1;
diff --git a/samples/OpenIdProviderWebForms/Default.aspx.cs b/samples/OpenIdProviderWebForms/Default.aspx.cs
@@ -40,6 +40,7 @@ private async Task SendAssertionAsync(string relyingPartyRealm) {
 				string rpSite = Identifier.Parse(relyingPartyRealm);
 				var response = await op.PrepareUnsolicitedAssertionAsync(providerEndpoint, rpSite, Util.BuildIdentityUrl(), Util.BuildIdentityUrl());
 				await response.SendAsync();
+				this.Context.Response.End();
 			} catch (ProtocolException ex) {
 				Label errorLabel = (Label)this.loginView.FindControl("errorLabel");
 				errorLabel.Visible = true;
diff --git a/samples/OpenIdWebRingSsoProvider/Default.aspx.cs b/samples/OpenIdWebRingSsoProvider/Default.aspx.cs
@@ -18,6 +18,7 @@ protected async void Page_Load(object sender, EventArgs e) {
 					var providerEndpoint = new ProviderEndpoint();
 					var responseMessage = await providerEndpoint.PrepareResponseAsync(this.Response.ClientDisconnectedToken);
 					await responseMessage.SendAsync(new HttpContextWrapper(this.Context), this.Response.ClientDisconnectedToken);
+					this.Context.Response.End();
 				}
 			}
 		}
diff --git a/samples/OpenIdWebRingSsoProvider/Login.aspx.cs b/samples/OpenIdWebRingSsoProvider/Login.aspx.cs
@@ -42,6 +42,7 @@ protected async void cancelButton_Click(object sender, EventArgs e) {
 				var providerEndpoint = new ProviderEndpoint();
 				var response = await providerEndpoint.PrepareResponseAsync(Response.ClientDisconnectedToken);
 				await response.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);
+				this.Context.Response.End();
 			}
 		}
 	}
diff --git a/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs b/src/DotNetOpenAuth.Core/Messaging/MessagingUtilities.cs
@@ -470,11 +470,6 @@ public static HttpRequestMessage AsHttpRequestMessage(this HttpRequestBase reque
 			if (response.Content != null) {
 				await response.Content.CopyToAsync(responseContext.OutputStream).ConfigureAwait(false);
 			}
-
-			// This prevents a hosting ASP.NET web forms page from rendering HTML after a control
-			// has taken control of the response stream.
-			context.ApplicationInstance.CompleteRequest();
-			context.Response.End();
 		}
 
 		/// <summary>
@@ -1226,7 +1221,6 @@ internal static void ApplyHeaders(this HttpRequestBase request, HttpRequestMessa
 					case "Proxy-Connection": break; // we don't care
 					case "Referer": message.Headers.Referrer = request.UrlReferrer; break;
 					case "Transfer-Encoding": message.Headers.TransferEncoding.Add(new TransferCodingHeaderValue(request.Headers[headerName])); break;
-					case "User-Agent": message.Headers.UserAgent.Add(new ProductInfoHeaderValue(request.UserAgent)); break;
 					default:
 						HttpHeaders headers = headerName.StartsWith("Content-", StringComparison.Ordinal) && message.Content != null
 							? (HttpHeaders)message.Content.Headers
diff --git a/src/DotNetOpenAuth.OpenId.Provider.UI/OpenId/Provider/ProviderEndpoint.cs b/src/DotNetOpenAuth.OpenId.Provider.UI/OpenId/Provider/ProviderEndpoint.cs
@@ -225,6 +225,7 @@ protected override void OnLoad(EventArgs e) {
 							PendingAuthenticationRequest = null;
 							var response = await Provider.PrepareResponseAsync(request, cancellationToken);
 							await response.SendAsync(new HttpContextWrapper(this.Context), cancellationToken);
+							this.Context.Response.End();
 						}
 					}
 				}
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
@@ -447,6 +447,7 @@ protected override async Task ScriptClosingPopupOrIFrameAsync(CancellationToken
 				cancellationToken);
 
 			await response.SendAsync(new HttpContextWrapper(this.Context), cancellationToken);
+			this.Context.Response.End();
 		}
 
 		/// <summary>

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ protected async void Page_Load(object sender, EventArgs e) {`
`40`	`40`	`var response = OAuthServiceProvider.AuthorizationServer.PrepareApproveAuthorizationRequest(this.pendingRequest, HttpContext.Current.User.Identity.Name);`
`41`	`41`	`var responseMessage = await OAuthServiceProvider.AuthorizationServer.Channel.PrepareResponseAsync(response, Response.ClientDisconnectedToken);`
`42`	`42`	`await responseMessage.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);`
	`43`	`+ this.Context.Response.End();`
`43`	`44`	`}`
`44`	`45`	`this.ViewState["AuthRequest"] = this.pendingRequest;`
`45`	`46`	`} else {`
`@@ -60,12 +61,14 @@ protected async void yesButton_Click(object sender, EventArgs e) {`
`60`	`61`	`var response = OAuthServiceProvider.AuthorizationServer.PrepareApproveAuthorizationRequest(this.pendingRequest, HttpContext.Current.User.Identity.Name);`
`61`	`62`	`var responseMessage = await OAuthServiceProvider.AuthorizationServer.Channel.PrepareResponseAsync(response, Response.ClientDisconnectedToken);`
`62`	`63`	`await responseMessage.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);`
	`64`	`+ this.Context.Response.End();`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`protected async void noButton_Click(object sender, EventArgs e) {`
`66`	`68`	`var response = OAuthServiceProvider.AuthorizationServer.PrepareRejectAuthorizationRequest(this.pendingRequest);`
`67`	`69`	`var responseMessage = await OAuthServiceProvider.AuthorizationServer.Channel.PrepareResponseAsync(response, Response.ClientDisconnectedToken);`
`68`	`70`	`await responseMessage.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);`
	`71`	`+ this.Context.Response.End();`
`69`	`72`	`}`
`70`	`73`	`}`
`71`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ where item.Selected`
`83`	`83`
`84`	`84`	`var request = await Client.PrepareRequestUserAuthorizationAsync(scopes, cancellationToken: Response.ClientDisconnectedToken);`
`85`	`85`	`await request.SendAsync();`
	`86`	`+ this.Context.Response.End();`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`protected async void getNameButton_Click(object sender, EventArgs e) {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ protected async void Page_Load(object sender, EventArgs e) {`
`18`	`18`	`var providerEndpoint = new ProviderEndpoint();`
`19`	`19`	`var responseMessage = await providerEndpoint.PrepareResponseAsync(this.Response.ClientDisconnectedToken);`
`20`	`20`	`await responseMessage.SendAsync(new HttpContextWrapper(this.Context), this.Response.ClientDisconnectedToken);`
	`21`	`+ this.Context.Response.End();`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ protected async void cancelButton_Click(object sender, EventArgs e) {`
`42`	`42`	`var providerEndpoint = new ProviderEndpoint();`
`43`	`43`	`var response = await providerEndpoint.PrepareResponseAsync(Response.ClientDisconnectedToken);`
`44`	`44`	`await response.SendAsync(new HttpContextWrapper(this.Context), Response.ClientDisconnectedToken);`
	`45`	`+ this.Context.Response.End();`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@ protected override void OnLoad(EventArgs e) {`
`225`	`225`	`PendingAuthenticationRequest = null;`
`226`	`226`	`var response = await Provider.PrepareResponseAsync(request, cancellationToken);`
`227`	`227`	`await response.SendAsync(new HttpContextWrapper(this.Context), cancellationToken);`
	`228`	`+ this.Context.Response.End();`
`228`	`229`	`}`
`229`	`230`	`}`
`230`	`231`	`}`