Imported Upstream version 6.6.0.124
Former-commit-id: 4972203499aaaca002bdc1753d2aa65dc5f58e09
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
dfcb8ecdef
commit
159f424ee6
@ -1 +1 @@
|
||||
f8b9aae84d66abdcff1d925684d1228e216c7cbf
|
||||
0b12585952795777d353a3f1bcc5eb1bf0666b0c
|
||||
@ -1 +1 @@
|
||||
0f989de83e5558b7e9b97d44265e5d10dde97788
|
||||
0468b2f0e00886a85a06a997960487ccc9d39497
|
||||
@ -8,7 +8,7 @@ namespace System.Net.Test.Common
|
||||
{
|
||||
public static partial class Http
|
||||
{
|
||||
private static readonly string DefaultAzureServer = "corefx-net.cloudapp.net";
|
||||
private static readonly string DefaultAzureServer = "corefx-net-http11.azurewebsites.net";
|
||||
|
||||
public static string Host => GetValue("COREFX_HTTPHOST", DefaultAzureServer);
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ namespace System.Net.Test.Common
|
||||
{
|
||||
public static partial class Security
|
||||
{
|
||||
private static readonly string DefaultAzureServer = "corefx-net.cloudapp.net";
|
||||
private static readonly string DefaultAzureServer = "corefx-net-http11.azurewebsites.net";
|
||||
|
||||
public static string ActiveDirectoryName => GetValue("COREFX_NET_AD_DOMAINNAME");
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ namespace System.Net.Test.Common
|
||||
public static partial class Configuration
|
||||
{
|
||||
#pragma warning disable 414
|
||||
private static readonly string DefaultAzureServer = "corefx-net.cloudapp.net";
|
||||
private static readonly string DefaultAzureServer = "corefx-net-http11.azurewebsites.net";
|
||||
#pragma warning restore 414
|
||||
|
||||
private static string GetValue(string envName, string defaultValue=null)
|
||||
|
||||
@ -311,6 +311,7 @@ namespace System.Net.Http.Functional.Tests
|
||||
}
|
||||
}
|
||||
|
||||
[ActiveIssue(41108)]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.Uap, "UAP doesn't allow revocation checking to be turned off")]
|
||||
[OuterLoop] // TODO: Issue #11345
|
||||
[ConditionalFact(nameof(ClientSupportsDHECipherSuites), nameof(BackendSupportsX509Chain))]
|
||||
|
||||
@ -1 +1 @@
|
||||
cc1cfeb44a4adae22fa22fc188bb8c257b167b20
|
||||
032cfaa560174c072bd4bc0f83345039e97fdeb9
|
||||
@ -456,31 +456,35 @@ namespace System.Net.Tests
|
||||
[InlineData(false)]
|
||||
[InlineData(true)]
|
||||
[SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "dotnet/corefx #19225")]
|
||||
public void KeepAlive_CorrectConnectionHeaderSent(bool? keepAlive)
|
||||
public async Task KeepAlive_CorrectConnectionHeaderSent(bool? keepAlive)
|
||||
{
|
||||
HttpWebRequest request = WebRequest.CreateHttp(Test.Common.Configuration.Http.RemoteEchoServer);
|
||||
|
||||
if (keepAlive.HasValue)
|
||||
await LoopbackServer.CreateServerAsync(async (server, url) =>
|
||||
{
|
||||
request.KeepAlive = keepAlive.Value;
|
||||
}
|
||||
HttpWebRequest request = WebRequest.CreateHttp(url);
|
||||
request.Proxy = null; // Don't use a proxy since it might interfere with the Connection: headers.
|
||||
if (keepAlive.HasValue)
|
||||
{
|
||||
request.KeepAlive = keepAlive.Value;
|
||||
}
|
||||
|
||||
using (var response = (HttpWebResponse)request.GetResponse())
|
||||
using (var body = new StreamReader(response.GetResponseStream()))
|
||||
{
|
||||
string content = body.ReadToEnd();
|
||||
Task<WebResponse> getResponseTask = request.GetResponseAsync();
|
||||
Task<List<string>> serverTask = server.AcceptConnectionSendResponseAndCloseAsync();
|
||||
|
||||
await TaskTimeoutExtensions.WhenAllOrAnyFailed(new Task[] { getResponseTask, serverTask });
|
||||
|
||||
List<string> requestLines = await serverTask;
|
||||
if (!keepAlive.HasValue || keepAlive.Value)
|
||||
{
|
||||
// Validate that the request doesn't contain Connection: "close", but we can't validate
|
||||
// that it does contain Connection: "keep-alive", as that's optional as of HTTP 1.1.
|
||||
Assert.DoesNotContain("\"Connection\": \"close\"", content, StringComparison.OrdinalIgnoreCase);
|
||||
// Validate that the request doesn't contain "Connection: close", but we can't validate
|
||||
// that it does contain "Connection: Keep-Alive", as that's optional as of HTTP 1.1.
|
||||
Assert.DoesNotContain("Connection: close", requestLines, StringComparer.OrdinalIgnoreCase);
|
||||
}
|
||||
else
|
||||
{
|
||||
Assert.Contains("\"Connection\": \"close\"", content, StringComparison.OrdinalIgnoreCase);
|
||||
Assert.DoesNotContain("\"Keep-Alive\"", content, StringComparison.OrdinalIgnoreCase);
|
||||
Assert.Contains("Connection: close", requestLines, StringComparer.OrdinalIgnoreCase);
|
||||
Assert.DoesNotContain("Keep-Alive", requestLines, StringComparer.OrdinalIgnoreCase);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
[Theory, MemberData(nameof(EchoServers))]
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
// See the LICENSE file in the project root for more information.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Specialized;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
@ -15,6 +16,8 @@ using Xunit;
|
||||
|
||||
namespace System.Net.Tests
|
||||
{
|
||||
using Configuration = System.Net.Test.Common.Configuration;
|
||||
|
||||
public class WebClientTest
|
||||
{
|
||||
[Fact]
|
||||
@ -393,21 +396,26 @@ namespace System.Net.Tests
|
||||
await Assert.ThrowsAsync<WebException>(() => wc.DownloadStringTaskAsync(System.Net.Test.Common.Configuration.Http.RemoteEchoServer));
|
||||
}
|
||||
|
||||
[OuterLoop("Networking test talking to remote server: issue #11345")]
|
||||
public static IEnumerable<object[]> RequestHeaders_AddHostHeaderAndSendRequest_ExpectedResult_MemberData()
|
||||
{
|
||||
yield return new object[] { $"http://{Configuration.Http.Host}", true };
|
||||
yield return new object[] { Configuration.Http.Host, false };
|
||||
}
|
||||
|
||||
[OuterLoop("Uses external servers")]
|
||||
[Theory]
|
||||
[InlineData("http://localhost", true)]
|
||||
[InlineData("localhost", false)]
|
||||
[MemberData(nameof(RequestHeaders_AddHostHeaderAndSendRequest_ExpectedResult_MemberData))]
|
||||
public static async Task RequestHeaders_AddHostHeaderAndSendRequest_ExpectedResult(string hostHeaderValue, bool throwsWebException)
|
||||
{
|
||||
var wc = new WebClient();
|
||||
wc.Headers["Host"] = hostHeaderValue;
|
||||
if (throwsWebException)
|
||||
{
|
||||
await Assert.ThrowsAsync<WebException>(() => wc.DownloadStringTaskAsync(System.Net.Test.Common.Configuration.Http.RemoteEchoServer));
|
||||
await Assert.ThrowsAsync<WebException>(() => wc.DownloadStringTaskAsync(Configuration.Http.RemoteEchoServer));
|
||||
}
|
||||
else
|
||||
{
|
||||
await wc.DownloadStringTaskAsync(System.Net.Test.Common.Configuration.Http.RemoteEchoServer);
|
||||
await wc.DownloadStringTaskAsync(Configuration.Http.RemoteEchoServer);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -17,6 +17,7 @@ namespace System.Net.WebSockets.Client.Tests
|
||||
{
|
||||
public CloseTest(ITestOutputHelper output) : base(output) { }
|
||||
|
||||
[ActiveIssue(36016)]
|
||||
[OuterLoop] // TODO: Issue #11345
|
||||
[ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
|
||||
public async Task CloseAsync_ServerInitiatedClose_Success(Uri server)
|
||||
@ -194,6 +195,7 @@ namespace System.Net.WebSockets.Client.Tests
|
||||
}
|
||||
}
|
||||
|
||||
[ActiveIssue(36016)]
|
||||
[OuterLoop] // TODO: Issue #11345
|
||||
[ConditionalTheory(nameof(WebSocketsSupported)), MemberData(nameof(EchoServers))]
|
||||
public async Task CloseOutputAsync_ServerInitiated_CanSend(Uri server)
|
||||
|
||||
@ -92,9 +92,9 @@ namespace System.Net.WebSockets.Client.Tests
|
||||
{
|
||||
Uri server = System.Net.Test.Common.Configuration.WebSockets.RemoteEchoServer;
|
||||
|
||||
// Send via the physical address such as "corefx-net.cloudapp.net"
|
||||
// Set the Host header to logical address like "subdomain.corefx-net.cloudapp.net"
|
||||
// Verify the scenario works and the remote server received "Host: subdomain.corefx-net.cloudapp.net"
|
||||
// Send via the physical address such as "corefx-net-http11.azurewebsites.net"
|
||||
// Set the Host header to logical address like "subdomain.corefx-net-http11.azurewebsites.net"
|
||||
// Verify the scenario works and the remote server received "Host: subdomain.corefx-net-http11.azurewebsites.net"
|
||||
string logicalHost = "subdomain." + server.Host;
|
||||
|
||||
using (var cws = new ClientWebSocket())
|
||||
|
||||
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.6.0.123";
|
||||
public const string MonoVersion = "6.6.0.124";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -16,7 +16,7 @@ namespace MonoTests.System.Net.WebSockets
|
||||
[TestFixture]
|
||||
public class ClientWebSocketTest
|
||||
{
|
||||
const string EchoServerUrl = "ws://corefx-net.cloudapp.net/WebSocket/EchoWebSocket.ashx";
|
||||
const string EchoServerUrl = "ws://corefx-net-http11.azurewebsites.net/WebSocket/EchoWebSocket.ashx";
|
||||
|
||||
ClientWebSocket socket;
|
||||
MethodInfo headerSetMethod;
|
||||
|
||||
@ -1 +1 @@
|
||||
d59938ae4c7fb78071fddd308fafede5a7759365
|
||||
32279be59671a2d8894b50f1c9bf871ce208a826
|
||||
@ -1 +1 @@
|
||||
5ba2e0e748a09592a0600ef20116faf8258b2118
|
||||
1824dec6cbe57ebd1353918d0a794121b96d35aa
|
||||
@ -1 +1 @@
|
||||
3811921ca6055d6d02525834df85e1b2495d1b07
|
||||
4c311ef32211567818577811d1b918edcda76ddc
|
||||
@ -1 +1 @@
|
||||
1ac474df12181d5acd1cf7d11f27390046057634
|
||||
3c52b649ccf7888fd2be06d237849c2fe24e6832
|
||||
@ -1 +1 @@
|
||||
7e0980369bff5d3ac0c02eface7aa7fb87353d4d
|
||||
30d7fa7f3c4e5437124cd5d8d58c472a1a26754f
|
||||
@ -1 +1 @@
|
||||
107b463b2adb5356e895b7a720851db33a86c6df
|
||||
353dbf8ea935d24c00ff1eef8f22cbb12a0725cd
|
||||
@ -1 +1 @@
|
||||
ba129c1550a2f772601ff3a5fd92d47722a06a11
|
||||
2eb8da0a2919ff5e2b160b4561c43feaea856e2b
|
||||
@ -1 +1 @@
|
||||
d59938ae4c7fb78071fddd308fafede5a7759365
|
||||
32279be59671a2d8894b50f1c9bf871ce208a826
|
||||
@ -1 +1 @@
|
||||
5ba2e0e748a09592a0600ef20116faf8258b2118
|
||||
1824dec6cbe57ebd1353918d0a794121b96d35aa
|
||||
@ -1 +1 @@
|
||||
3811921ca6055d6d02525834df85e1b2495d1b07
|
||||
4c311ef32211567818577811d1b918edcda76ddc
|
||||
@ -1 +1 @@
|
||||
1ac474df12181d5acd1cf7d11f27390046057634
|
||||
3c52b649ccf7888fd2be06d237849c2fe24e6832
|
||||
@ -1 +1 @@
|
||||
7e0980369bff5d3ac0c02eface7aa7fb87353d4d
|
||||
30d7fa7f3c4e5437124cd5d8d58c472a1a26754f
|
||||
@ -1 +1 @@
|
||||
107b463b2adb5356e895b7a720851db33a86c6df
|
||||
353dbf8ea935d24c00ff1eef8f22cbb12a0725cd
|
||||
@ -1 +1 @@
|
||||
9ccb57c3c41dcacffdfcf7b5f9fa0784369d5bcb
|
||||
4254bddb8d7b8a3ca9afaead03ded2396e253969
|
||||
@ -1 +1 @@
|
||||
ba129c1550a2f772601ff3a5fd92d47722a06a11
|
||||
2eb8da0a2919ff5e2b160b4561c43feaea856e2b
|
||||
@ -1 +1 @@
|
||||
d59938ae4c7fb78071fddd308fafede5a7759365
|
||||
32279be59671a2d8894b50f1c9bf871ce208a826
|
||||
@ -1 +1 @@
|
||||
5ba2e0e748a09592a0600ef20116faf8258b2118
|
||||
1824dec6cbe57ebd1353918d0a794121b96d35aa
|
||||
@ -1 +1 @@
|
||||
3811921ca6055d6d02525834df85e1b2495d1b07
|
||||
4c311ef32211567818577811d1b918edcda76ddc
|
||||
@ -1 +1 @@
|
||||
1ac474df12181d5acd1cf7d11f27390046057634
|
||||
3c52b649ccf7888fd2be06d237849c2fe24e6832
|
||||
@ -1 +1 @@
|
||||
7e0980369bff5d3ac0c02eface7aa7fb87353d4d
|
||||
30d7fa7f3c4e5437124cd5d8d58c472a1a26754f
|
||||
@ -1 +1 @@
|
||||
107b463b2adb5356e895b7a720851db33a86c6df
|
||||
353dbf8ea935d24c00ff1eef8f22cbb12a0725cd
|
||||
@ -1 +1 @@
|
||||
9ccb57c3c41dcacffdfcf7b5f9fa0784369d5bcb
|
||||
4254bddb8d7b8a3ca9afaead03ded2396e253969
|
||||
@ -1 +1 @@
|
||||
ba129c1550a2f772601ff3a5fd92d47722a06a11
|
||||
2eb8da0a2919ff5e2b160b4561c43feaea856e2b
|
||||
@ -1 +1 @@
|
||||
d59938ae4c7fb78071fddd308fafede5a7759365
|
||||
32279be59671a2d8894b50f1c9bf871ce208a826
|
||||
@ -1 +1 @@
|
||||
5ba2e0e748a09592a0600ef20116faf8258b2118
|
||||
1824dec6cbe57ebd1353918d0a794121b96d35aa
|
||||
@ -1 +1 @@
|
||||
53bfedd7e6c66dfc7c02e17c96be722880dc2c85
|
||||
a902f74deb1c7f47b844ff162bcb8d0abf0f3697
|
||||
@ -1 +1 @@
|
||||
1ac474df12181d5acd1cf7d11f27390046057634
|
||||
3c52b649ccf7888fd2be06d237849c2fe24e6832
|
||||
@ -1 +1 @@
|
||||
7e0980369bff5d3ac0c02eface7aa7fb87353d4d
|
||||
30d7fa7f3c4e5437124cd5d8d58c472a1a26754f
|
||||
@ -1 +1 @@
|
||||
107b463b2adb5356e895b7a720851db33a86c6df
|
||||
353dbf8ea935d24c00ff1eef8f22cbb12a0725cd
|
||||
@ -1 +1 @@
|
||||
9ccb57c3c41dcacffdfcf7b5f9fa0784369d5bcb
|
||||
4254bddb8d7b8a3ca9afaead03ded2396e253969
|
||||
@ -1 +1 @@
|
||||
4de1547d6cd759c83e3b0583a488f1b15c399121
|
||||
1dd01785ca665f4caf62298a657b2b12a44ffe30
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/11e1499"
|
||||
#define FULL_VERSION "explicit/df5e13f"
|
||||
|
||||
@ -1496,10 +1496,10 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
735fdd69a36f0602ee03a8e4e28b65dbfb174488
|
||||
c8766c4d4829f6bda19ce3b7651f8b644f3cda21
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
fc1cc35d4017c43733665195c297bb68a9f81c36
|
||||
5355bf4477d766a4b3007570cf9a8266d1d88899
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
a8e3dc735a98f21265d993a4fcc630c92cb38916
|
||||
579d79dd0ef3a8b223f81c73f2dc8aad79385b54
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.6.0.123\n"
|
||||
"Project-Id-Version: mono 6.6.0.124\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-10-11 08:30+0000\n"
|
||||
"POT-Creation-Date: 2019-10-12 08:33+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
fbf44231cabe005a0292afafc6226fec65638ec7
|
||||
22f3dcce951544f7107d2aebfce5e7287d5886fe
|
||||
Loading…
x
Reference in New Issue
Block a user