Imported Upstream version 6.12.0.86

Former-commit-id: 7a84ce7d08c42c458ac8e74b27186ca863315d79
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-07-10 08:44:59 +00:00
parent 92747312ea
commit 0b380204a4
812 changed files with 26901 additions and 9053 deletions

View File

@@ -295,13 +295,13 @@ namespace System.Net {
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static bool GetHostByName_internal(string host, out string h_name, out string[] h_aliases, out string[] h_addr_list, int hint);
private extern static bool GetHostByName_icall (string host, out string h_name, out string[] h_aliases, out string[] h_addr_list, int hint);
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static bool GetHostByAddr_internal(string addr, out string h_name, out string[] h_aliases, out string[] h_addr_list, int hint);
private extern static bool GetHostByAddr_icall (string addr, out string h_name, out string[] h_aliases, out string[] h_addr_list, int hint);
[MethodImplAttribute(MethodImplOptions.InternalCall)]
private extern static bool GetHostName_internal(out string h_name);
private extern static bool GetHostName_icall (out string h_name);
static void Error_11001 (string hostName)
{
@@ -372,7 +372,7 @@ namespace System.Net {
string h_name;
string[] h_aliases, h_addrlist;
bool ret = GetHostByAddr_internal(address, out h_name, out h_aliases, out h_addrlist, Socket.FamilyHint);
bool ret = GetHostByAddr_icall (address, out h_name, out h_aliases, out h_addrlist, Socket.FamilyHint);
if (!ret)
Error_11001 (address);
return (hostent_to_IPHostEntry (address, h_name, h_aliases, h_addrlist));
@@ -436,7 +436,7 @@ namespace System.Net {
string h_name;
string[] h_aliases, h_addrlist;
bool ret = GetHostByName_internal(hostName, out h_name, out h_aliases, out h_addrlist, Socket.FamilyHint);
bool ret = GetHostByName_icall (hostName, out h_name, out h_aliases, out h_addrlist, Socket.FamilyHint);
if (ret == false)
Error_11001 (hostName);
@@ -447,7 +447,7 @@ namespace System.Net {
{
string hostName;
bool ret = GetHostName_internal(out hostName);
bool ret = GetHostName_icall (out hostName);
if (ret == false)
Error_11001 (hostName);

View File

@@ -237,8 +237,12 @@ namespace System.Net {
}
if (ProcessInput (ms)) {
if (!context.HaveError)
context.Request.FinishInitialization ();
if (!context.HaveError) {
if (!context.Request.FinishInitialization()) {
Close (true);
return;
}
}
if (context.HaveError) {
SendError ();

View File

@@ -192,12 +192,12 @@ namespace System.Net {
return false;
}
internal void FinishInitialization ()
internal bool FinishInitialization ()
{
string host = UserHostName;
if (version > HttpVersion.Version10 && (host == null || host.Length == 0)) {
context.ErrorMessage = "Invalid host name";
return;
return true;
}
string path;
@@ -223,7 +223,7 @@ namespace System.Net {
if (!Uri.TryCreate (base_uri + path, UriKind.Absolute, out url)){
context.ErrorMessage = WebUtility.HtmlEncode ("Invalid url: " + base_uri + path);
return;
return true;
}
CreateQueryString (url.Query);
@@ -239,7 +239,7 @@ namespace System.Net {
// 'identity' is not valid!
if (t_encoding != null && !is_chunked) {
context.Connection.SendError (null, 501);
return;
return false;
}
}
@@ -247,7 +247,7 @@ namespace System.Net {
if (String.Compare (method, "POST", StringComparison.OrdinalIgnoreCase) == 0 ||
String.Compare (method, "PUT", StringComparison.OrdinalIgnoreCase) == 0) {
context.Connection.SendError (null, 411);
return;
return false;
}
}
@@ -255,6 +255,8 @@ namespace System.Net {
ResponseStream output = context.Connection.GetResponseStream ();
output.InternalWrite (_100continue, 0, _100continue.Length);
}
return true;
}
internal static string Unquote (String str) {