Make managed http opt-in on non-Linux OSes

bording · bording · commit 9ee00e44450b · 2020-04-06T23:01:43.000-04:00
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -206,7 +206,7 @@ private static void InitializeNativeLibrary()
 
 #if !NET46
             // Configure the .NET HTTP(S) mechanism on the first initialization of the library in the current process.
-            if (initCounter == 1)
+            if (initCounter == 1 && GlobalSettings.ManagedHttpSmartSubtransportEnabled)
             {
                 httpSubtransportRegistration = GlobalSettings.RegisterDefaultSmartSubtransport<ManagedHttpSmartSubtransport>("http");
                 httpsSubtransportRegistration = GlobalSettings.RegisterDefaultSmartSubtransport<ManagedHttpSmartSubtransport>("https");
diff --git a/LibGit2Sharp/GlobalSettings.cs b/LibGit2Sharp/GlobalSettings.cs
@@ -22,6 +22,10 @@ public static class GlobalSettings
         private static bool nativeLibraryPathLocked;
         private static string nativeLibraryDefaultPath;
 
+#if !NET46
+        private static bool useManagedHttpSmartSubtransport;
+#endif
+
         internal class SmartSubtransportData
         {
             internal bool isCustom;
@@ -79,13 +83,11 @@ private static string GetExecutingAssemblyDirectory()
         /// Returns information related to the current LibGit2Sharp
         /// library.
         /// </summary>
-        public static Version Version
-        {
-            get
-            {
-                return version.Value;
-            }
-        }
+        public static Version Version => version.Value;
+
+#if !NET46
+        internal static bool ManagedHttpSmartSubtransportEnabled => RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || useManagedHttpSmartSubtransport;
+#endif
 
         private static SmartSubtransportData GetOrCreateSmartSubtransportData(string scheme)
         {
@@ -541,5 +543,15 @@ public static string GetUserAgent()
         {
             return Proxy.git_libgit2_opts_get_user_agent();
         }
+
+#if !NET46
+        /// <summary>
+        /// Enables the managed http implementation. This is enabled autmatically on Linux, so this method is only needed when running on Windows or macOS.
+        /// </summary>
+        public static void UseManagedHttpSmartSubtransport()
+        {
+            useManagedHttpSmartSubtransport = true;
+        }
+#endif
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ private static void InitializeNativeLibrary()`
`206`	`206`
`207`	`207`	`#if !NET46`
`208`	`208`	`// Configure the .NET HTTP(S) mechanism on the first initialization of the library in the current process.`
`209`		`- if (initCounter == 1)`
	`209`	`+ if (initCounter == 1 && GlobalSettings.ManagedHttpSmartSubtransportEnabled)`
`210`	`210`	`{`
`211`	`211`	`httpSubtransportRegistration = GlobalSettings.RegisterDefaultSmartSubtransport<ManagedHttpSmartSubtransport>("http");`
`212`	`212`	`httpsSubtransportRegistration = GlobalSettings.RegisterDefaultSmartSubtransport<ManagedHttpSmartSubtransport>("https");`