mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.16.0.100

Browse Source 
Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mcs/class/System/System.Net/MacProxy.cs
View File

@ -335,6 +335,14 @@ namespace Mono.Net
return (int) CFStringGetLength (Handle);
}
}
[DllImport (CoreFoundationLibrary)]
extern static int CFStringCompare (IntPtr theString1, IntPtr theString2, int compareOptions);
public static int Compare (IntPtr string1, IntPtr string2, int compareOptions = 0)
{
return CFStringCompare (string1, string2, compareOptions);
}
[DllImport (CoreFoundationLibrary)]
extern static IntPtr CFStringGetCharactersPtr (IntPtr handle);
@ -688,6 +696,25 @@ namespace Mono.Net
if (type == kCFProxyTypeSOCKS)
return CFProxyType.SOCKS;
//in OSX 10.13 pointer comparison didn't work for kCFProxyTypeAutoConfigurationURL
if (CFString.Compare (type, kCFProxyTypeAutoConfigurationJavaScript) == 0)
return CFProxyType.AutoConfigurationJavaScript;
if (CFString.Compare (type, kCFProxyTypeAutoConfigurationURL) == 0)
return CFProxyType.AutoConfigurationUrl;
if (CFString.Compare (type, kCFProxyTypeFTP) == 0)
return CFProxyType.FTP;
if (CFString.Compare (type, kCFProxyTypeHTTP) == 0)
return CFProxyType.HTTP;
if (CFString.Compare (type, kCFProxyTypeHTTPS) == 0)
return CFProxyType.HTTPS;
if (CFString.Compare (type, kCFProxyTypeSOCKS) == 0)
return CFProxyType.SOCKS;
return CFProxyType.None;
}