Merge branch 'v4.0'

Conflicts:
	projecttemplates/projecttemplates.proj

1 files changed, 5 insertions, 4 deletions

diff --git a/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs b/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs
index 96c1701..886917a 100644
--- a/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs
+++ b/src/DotNetOpenAuth.AspNet/Clients/OAuth/TwitterClient.cs
@@ -92,7 +92,7 @@ namespace DotNetOpenAuth.AspNet.Clients {
 			string userId = response.ExtraData["user_id"];
 			string userName = response.ExtraData["screen_name"];
 
-			var profileRequestUrl = new Uri("http://api.twitter.com/1/users/show.xml?user_id="
+			var profileRequestUrl = new Uri("https://api.twitter.com/1/users/show.xml?user_id="
 									   + MessagingUtilities.EscapeUriDataStringRfc3986(userId));
 			var profileEndpoint = new MessageReceivingEndpoint(profileRequestUrl, HttpDeliveryMethods.GetRequest);
 			HttpWebRequest request = this.WebWorker.PrepareAuthorizedRequest(profileEndpoint, accessToken);
@@ -102,14 +102,15 @@ namespace DotNetOpenAuth.AspNet.Clients {
 			try {
 				using (WebResponse profileResponse = request.GetResponse()) {
 					using (Stream responseStream = profileResponse.GetResponseStream()) {
-						XDocument document = XDocument.Load(responseStream);
+						XDocument document = LoadXDocumentFromStream(responseStream);
 						extraData.AddDataIfNotEmpty(document, "name");
 						extraData.AddDataIfNotEmpty(document, "location");
 						extraData.AddDataIfNotEmpty(document, "description");
 						extraData.AddDataIfNotEmpty(document, "url");
 					}
 				}
-			} catch (Exception) {
+			}
+			catch (Exception) {
 				// At this point, the authentication is already successful.
 				// Here we are just trying to get additional data if we can.
 				// If it fails, no problem.
@@ -121,4 +122,4 @@ namespace DotNetOpenAuth.AspNet.Clients {
 
 		#endregion
 	}
-}
+}
\ No newline at end of file