Merge pull request #1865 from dotnet-bot/from-tfs

ellismg · ellismg · commit a6f4984d0f96 · 2015-05-28T14:46:31.000-07:00
Merge changes from TFS
diff --git a/src/System.Net.Http/src/System/Net/HttpRequestMessage.cs b/src/System.Net.Http/src/System/Net/HttpRequestMessage.cs
@@ -189,7 +189,7 @@ private void InitializeValues(HttpMethod method, Uri requestUri)
 
             _method = method;
             _requestUri = requestUri;
-            _version = HttpUtilities.DefaultVersion;
+            _version = HttpUtilities.DefaultRequestVersion;
         }
 
         internal bool MarkAsSent()
diff --git a/src/System.Net.Http/src/System/Net/HttpResponseMessage.cs b/src/System.Net.Http/src/System/Net/HttpResponseMessage.cs
@@ -139,7 +139,7 @@ public HttpResponseMessage(HttpStatusCode statusCode)
             }
 
             _statusCode = statusCode;
-            _version = HttpUtilities.DefaultVersion;
+            _version = HttpUtilities.DefaultResponseVersion;
 
             if (Logging.On) Logging.Exit(Logging.Http, this, ".ctor", null);
         }
diff --git a/src/System.Net.Http/src/System/Net/HttpUtilities.cs b/src/System.Net.Http/src/System/Net/HttpUtilities.cs
@@ -14,7 +14,12 @@ namespace System.Net.Http
 {
     internal static class HttpUtilities
     {
-        internal static readonly Version DefaultVersion = HttpVersion.Version11;
+#if NETNative
+        internal static readonly Version DefaultRequestVersion = HttpVersion.Version20;
+#else
+        internal static readonly Version DefaultRequestVersion = HttpVersion.Version11;
+#endif
+        internal static readonly Version DefaultResponseVersion = HttpVersion.Version11;
 
         internal static bool IsHttpUri(Uri uri)
         {

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ private void InitializeValues(HttpMethod method, Uri requestUri)`
`189`	`189`
`190`	`190`	`_method = method;`
`191`	`191`	`_requestUri = requestUri;`
`192`		`- _version = HttpUtilities.DefaultVersion;`
	`192`	`+ _version = HttpUtilities.DefaultRequestVersion;`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`internal bool MarkAsSent()`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public HttpResponseMessage(HttpStatusCode statusCode)`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`_statusCode = statusCode;`
`142`		`- _version = HttpUtilities.DefaultVersion;`
	`142`	`+ _version = HttpUtilities.DefaultResponseVersion;`
`143`	`143`
`144`	`144`	`if (Logging.On) Logging.Exit(Logging.Http, this, ".ctor", null);`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,12 @@ namespace System.Net.Http`
`14`	`14`	`{`
`15`	`15`	`internal static class HttpUtilities`
`16`	`16`	`{`
`17`		`- internal static readonly Version DefaultVersion = HttpVersion.Version11;`
	`17`	`+#if NETNative`
	`18`	`+ internal static readonly Version DefaultRequestVersion = HttpVersion.Version20;`
	`19`	`+#else`
	`20`	`+ internal static readonly Version DefaultRequestVersion = HttpVersion.Version11;`
	`21`	`+#endif`
	`22`	`+ internal static readonly Version DefaultResponseVersion = HttpVersion.Version11;`
`18`	`23`
`19`	`24`	`internal static bool IsHttpUri(Uri uri)`
`20`	`25`	`{`