diff options
Diffstat (limited to 'mcs/class/System')
7 files changed, 264 insertions, 59 deletions
diff --git a/mcs/class/System/System.Net.Configuration/SmtpSection.cs b/mcs/class/System/System.Net.Configuration/SmtpSection.cs index 9d5f74bd0c1..705dc920d57 100644 --- a/mcs/class/System/System.Net.Configuration/SmtpSection.cs +++ b/mcs/class/System/System.Net.Configuration/SmtpSection.cs @@ -44,6 +44,12 @@ namespace System.Net.Configuration { set { base ["deliveryMethod"] = value; } } + [ConfigurationProperty ("deliveryFormat", DefaultValue = SmtpDeliveryFormat.SevenBit)] + public SmtpDeliveryFormat DeliveryFormat { + get { return (SmtpDeliveryFormat) base ["deliveryFormat"]; } + set { base ["deliveryFormat"] = value; } + } + [ConfigurationProperty ("from")] public string From { get { return (string) base ["from"]; } diff --git a/mcs/class/System/System.Net/HttpConnection.cs b/mcs/class/System/System.Net/HttpConnection.cs index 2be693f5b16..885eaf3ea3d 100644 --- a/mcs/class/System/System.Net/HttpConnection.cs +++ b/mcs/class/System/System.Net/HttpConnection.cs @@ -397,7 +397,7 @@ namespace System.Net { HttpListenerResponse response = context.Response; response.StatusCode = status; response.ContentType = "text/html"; - string description = HttpListenerResponse.GetStatusDescription (status); + string description = HttpListenerResponseHelper.GetStatusDescription (status); string str; if (msg != null) str = String.Format ("<h1>{0} ({1})</h1>", description, msg); diff --git a/mcs/class/System/System.Net/HttpListenerResponse.cs b/mcs/class/System/System.Net/HttpListenerResponse.cs index dcc553036e1..807c9dd393a 100644 --- a/mcs/class/System/System.Net/HttpListenerResponse.cs +++ b/mcs/class/System/System.Net/HttpListenerResponse.cs @@ -218,63 +218,10 @@ namespace System.Net { if (value < 100 || value > 999) throw new ProtocolViolationException ("StatusCode must be between 100 and 999."); status_code = value; - status_description = GetStatusDescription (value); + status_description = HttpListenerResponseHelper.GetStatusDescription (value); } } - internal static string GetStatusDescription (int code) - { - switch (code){ - case 100: return "Continue"; - case 101: return "Switching Protocols"; - case 102: return "Processing"; - case 200: return "OK"; - case 201: return "Created"; - case 202: return "Accepted"; - case 203: return "Non-Authoritative Information"; - case 204: return "No Content"; - case 205: return "Reset Content"; - case 206: return "Partial Content"; - case 207: return "Multi-Status"; - case 300: return "Multiple Choices"; - case 301: return "Moved Permanently"; - case 302: return "Found"; - case 303: return "See Other"; - case 304: return "Not Modified"; - case 305: return "Use Proxy"; - case 307: return "Temporary Redirect"; - case 400: return "Bad Request"; - case 401: return "Unauthorized"; - case 402: return "Payment Required"; - case 403: return "Forbidden"; - case 404: return "Not Found"; - case 405: return "Method Not Allowed"; - case 406: return "Not Acceptable"; - case 407: return "Proxy Authentication Required"; - case 408: return "Request Timeout"; - case 409: return "Conflict"; - case 410: return "Gone"; - case 411: return "Length Required"; - case 412: return "Precondition Failed"; - case 413: return "Request Entity Too Large"; - case 414: return "Request-Uri Too Long"; - case 415: return "Unsupported Media Type"; - case 416: return "Requested Range Not Satisfiable"; - case 417: return "Expectation Failed"; - case 422: return "Unprocessable Entity"; - case 423: return "Locked"; - case 424: return "Failed Dependency"; - case 500: return "Internal Server Error"; - case 501: return "Not Implemented"; - case 502: return "Bad Gateway"; - case 503: return "Service Unavailable"; - case 504: return "Gateway Timeout"; - case 505: return "Http Version Not Supported"; - case 507: return "Insufficient Storage"; - } - return ""; - } - public string StatusDescription { get { return status_description; } set { @@ -552,6 +499,64 @@ namespace System.Net { cookies.Add (cookie); } } + + // do not inline into HttpListenerResponse as this recursively brings everything that's + // reachable by IDisposable.Dispose (and that's quite a lot in this case). + static class HttpListenerResponseHelper { + + internal static string GetStatusDescription (int code) + { + switch (code){ + case 100: return "Continue"; + case 101: return "Switching Protocols"; + case 102: return "Processing"; + case 200: return "OK"; + case 201: return "Created"; + case 202: return "Accepted"; + case 203: return "Non-Authoritative Information"; + case 204: return "No Content"; + case 205: return "Reset Content"; + case 206: return "Partial Content"; + case 207: return "Multi-Status"; + case 300: return "Multiple Choices"; + case 301: return "Moved Permanently"; + case 302: return "Found"; + case 303: return "See Other"; + case 304: return "Not Modified"; + case 305: return "Use Proxy"; + case 307: return "Temporary Redirect"; + case 400: return "Bad Request"; + case 401: return "Unauthorized"; + case 402: return "Payment Required"; + case 403: return "Forbidden"; + case 404: return "Not Found"; + case 405: return "Method Not Allowed"; + case 406: return "Not Acceptable"; + case 407: return "Proxy Authentication Required"; + case 408: return "Request Timeout"; + case 409: return "Conflict"; + case 410: return "Gone"; + case 411: return "Length Required"; + case 412: return "Precondition Failed"; + case 413: return "Request Entity Too Large"; + case 414: return "Request-Uri Too Long"; + case 415: return "Unsupported Media Type"; + case 416: return "Requested Range Not Satisfiable"; + case 417: return "Expectation Failed"; + case 422: return "Unprocessable Entity"; + case 423: return "Locked"; + case 424: return "Failed Dependency"; + case 500: return "Internal Server Error"; + case 501: return "Not Implemented"; + case 502: return "Bad Gateway"; + case 503: return "Service Unavailable"; + case 504: return "Gateway Timeout"; + case 505: return "Http Version Not Supported"; + case 507: return "Insufficient Storage"; + } + return ""; + } + } } #endif diff --git a/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs b/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs index 7842d5c3fe8..7b0b3ac8152 100644 --- a/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs +++ b/mcs/class/System/Test/System.Configuration/ApplicationSettingsBaseTest.cs @@ -284,7 +284,7 @@ namespace MonoTests.System.Configuration { [Test] public void TestSettings2_Properties () { - string expected = "MonoTests.System.Configuration.ProviderPoker, System_test_net_4_x, Version=0.0.0.0"; + string expected = "MonoTests.System.Configuration.ProviderPoker, net_4_x_System_test, Version=0.0.0.0"; Assert.AreEqual (expected, new SettingsProviderAttribute (typeof (ProviderPoker)).ProviderTypeName.Substring (0, expected.Length), "#1"); TestSettings2 settings = new TestSettings2 (); diff --git a/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs b/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs index c6ca3ef5b2d..a0e19d4f2d1 100755 --- a/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs +++ b/mcs/class/System/Test/System.Net.Sockets/SocketTest.cs @@ -4361,16 +4361,19 @@ namespace MonoTests.System.Net.Sockets var ep = server.LocalEndPoint as IPEndPoint; + BCCalledBack.Reset (); var ar1 = client.BeginConnect (ep, BCCallback, client); - client.EndConnect (ar1); + Assert.IsTrue (BCCalledBack.WaitOne (10000), "#1"); client.Disconnect (true); + BCCalledBack.Reset (); var ar2 = client.BeginConnect (IPAddress.Loopback, ep.Port, BCCallback, client); - client.EndConnect (ar2); + Assert.IsTrue (BCCalledBack.WaitOne (10000), "#2"); client.Disconnect (true); + BCCalledBack.Reset (); var ar3 = client.BeginConnect (new [] {IPAddress.Loopback}, ep.Port, BCCallback, client); - client.EndConnect (ar3); + Assert.IsTrue (BCCalledBack.WaitOne (10000), "#2"); client.Disconnect (true); } } diff --git a/mcs/class/System/mobile_static_System_test.dll.excludes b/mcs/class/System/mobile_static_System_test.dll.excludes new file mode 100644 index 00000000000..8f84347cde9 --- /dev/null +++ b/mcs/class/System/mobile_static_System_test.dll.excludes @@ -0,0 +1,190 @@ +Microsoft.CSharp/CodeGeneratorFromCompileUnitTest.cs +Microsoft.CSharp/CodeGeneratorFromExpressionTest.cs +Microsoft.CSharp/CodeGeneratorFromNamespaceTest.cs +Microsoft.CSharp/CodeGeneratorFromStatementTest.cs +Microsoft.CSharp/CodeGeneratorFromTypeTest.cs +Microsoft.CSharp/CodeGeneratorIdentifierTest.cs +Microsoft.CSharp/CodeGeneratorTestBase.cs +Microsoft.CSharp/CodeGeneratorTypeOutputTest.cs +Microsoft.CSharp/CSharpCodeProviderCas.cs +Microsoft.CSharp/CSharpCodeProviderTest.cs +Microsoft.VisualBasic/CodeGeneratorFromBinaryOperatorTest.cs +Microsoft.VisualBasic/CodeGeneratorFromCompileUnitTest.cs +Microsoft.VisualBasic/CodeGeneratorFromExpressionTest.cs +Microsoft.VisualBasic/CodeGeneratorFromNamespaceTest.cs +Microsoft.VisualBasic/CodeGeneratorFromStatementTest.cs +Microsoft.VisualBasic/CodeGeneratorFromTypeTest.cs +Microsoft.VisualBasic/CodeGeneratorTestBase.cs +Microsoft.VisualBasic/VBCodeProviderCas.cs +Microsoft.VisualBasic/VBCodeProviderTest.cs +System.CodeDom/CodeArgumentReferenceExpressionCas.cs +System.CodeDom/CodeArgumentReferenceExpressionTest.cs +System.CodeDom/CodeArrayCreateExpressionCas.cs +System.CodeDom/CodeArrayCreateExpressionTest.cs +System.CodeDom/CodeArrayIndexerExpressionCas.cs +System.CodeDom/CodeAssignStatementCas.cs +System.CodeDom/CodeAttachEventStatementCas.cs +System.CodeDom/CodeAttachEventStatementTest.cs +System.CodeDom/CodeAttributeArgumentCas.cs +System.CodeDom/CodeAttributeArgumentCollectionCas.cs +System.CodeDom/CodeAttributeArgumentCollectionTest.cs +System.CodeDom/CodeAttributeArgumentTest.cs +System.CodeDom/CodeAttributeDeclarationCas.cs +System.CodeDom/CodeAttributeDeclarationCollectionCas.cs +System.CodeDom/CodeAttributeDeclarationCollectionTest.cs +System.CodeDom/CodeAttributeDeclarationTest.cs +System.CodeDom/CodeBaseReferenceExpressionCas.cs +System.CodeDom/CodeBinaryOperatorExpressionCas.cs +System.CodeDom/CodeCastExpressionCas.cs +System.CodeDom/CodeCastExpressionTest.cs +System.CodeDom/CodeCatchClauseCas.cs +System.CodeDom/CodeCatchClauseCollectionCas.cs +System.CodeDom/CodeCatchClauseCollectionTest.cs +System.CodeDom/CodeCatchClauseTest.cs +System.CodeDom/CodeChecksumPragmaCas.cs +System.CodeDom/CodeChecksumPragmaTest.cs +System.CodeDom/CodeCommentStatementCas.cs +System.CodeDom/CodeCommentStatementCollectionCas.cs +System.CodeDom/CodeCommentStatementCollectionTest.cs +System.CodeDom/CodeCompileUnitCas.cs +System.CodeDom/CodeConditionStatementCas.cs +System.CodeDom/CodeConstructorCas.cs +System.CodeDom/CodeConstructorTest.cs +System.CodeDom/CodeDefaultValueExpressionCas.cs +System.CodeDom/CodeDefaultValueExpressionTest.cs +System.CodeDom/CodeDelegateCreateExpressionCas.cs +System.CodeDom/CodeDelegateCreateExpressionTest.cs +System.CodeDom/CodeDelegateInvokeExpressionCas.cs +System.CodeDom/CodeDirectionExpressionCas.cs +System.CodeDom/CodeDirectiveCas.cs +System.CodeDom/CodeDirectiveCollectionCas.cs +System.CodeDom/CodeDirectiveCollectionTest.cs +System.CodeDom/CodeEntryPointMethodCas.cs +System.CodeDom/CodeEventReferenceExpressionCas.cs +System.CodeDom/CodeEventReferenceExpressionTest.cs +System.CodeDom/CodeExpressionCas.cs +System.CodeDom/CodeExpressionCollectionCas.cs +System.CodeDom/CodeExpressionCollectionTest.cs +System.CodeDom/CodeExpressionStatementCas.cs +System.CodeDom/CodeFieldReferenceExpressionCas.cs +System.CodeDom/CodeGotoStatementCas.cs +System.CodeDom/CodeGotoStatementTest.cs +System.CodeDom/CodeIndexerExpressionCas.cs +System.CodeDom/CodeIterationStatementCas.cs +System.CodeDom/CodeLabeledStatementTest.cs +System.CodeDom/CodeLinePragmaCas.cs +System.CodeDom/CodeLinePragmaTest.cs +System.CodeDom/CodeMemberEventCas.cs +System.CodeDom/CodeMemberFieldCas.cs +System.CodeDom/CodeMemberFieldTest.cs +System.CodeDom/CodeMemberMethodCas.cs +System.CodeDom/CodeMemberMethodTest.cs +System.CodeDom/CodeMemberPropertyCas.cs +System.CodeDom/CodeMemberPropertyTest.cs +System.CodeDom/CodeMethodInvokeExpressionCas.cs +System.CodeDom/CodeMethodInvokeExpressionTest.cs +System.CodeDom/CodeMethodReferenceExpressionCas.cs +System.CodeDom/CodeMethodReferenceExpressionTest.cs +System.CodeDom/CodeMethodReturnStatementCas.cs +System.CodeDom/CodeNamespaceCas.cs +System.CodeDom/CodeNamespaceCollectionCas.cs +System.CodeDom/CodeNamespaceCollectionTest.cs +System.CodeDom/CodeNamespaceImportCas.cs +System.CodeDom/CodeNamespaceImportCollectionCas.cs +System.CodeDom/CodeNamespaceImportCollectionTest.cs +System.CodeDom/CodeNamespaceImportTest.cs +System.CodeDom/CodeNamespaceTest.cs +System.CodeDom/CodeObjectCas.cs +System.CodeDom/CodeObjectCreateExpressionCas.cs +System.CodeDom/CodeObjectCreateExpressionTest.cs +System.CodeDom/CodeParameterDeclarationExpressionCas.cs +System.CodeDom/CodeParameterDeclarationExpressionCollectionCas.cs +System.CodeDom/CodeParameterDeclarationExpressionCollectionTest.cs +System.CodeDom/CodeParameterDeclarationExpressionTest.cs +System.CodeDom/CodePrimitiveExpressionCas.cs +System.CodeDom/CodePropertyReferenceExpressionCas.cs +System.CodeDom/CodePropertyReferenceExpressionTest.cs +System.CodeDom/CodePropertySetValueReferenceExpressionCas.cs +System.CodeDom/CodeRegionDirectiveCas.cs +System.CodeDom/CodeRegionDirectiveTest.cs +System.CodeDom/CodeRemoveEventStatementCas.cs +System.CodeDom/CodeRemoveEventStatementTest.cs +System.CodeDom/CodeSnippetCompileUnitCas.cs +System.CodeDom/CodeSnippetCompileUnitTest.cs +System.CodeDom/CodeSnippetExpressionCas.cs +System.CodeDom/CodeSnippetExpressionTest.cs +System.CodeDom/CodeSnippetStatementCas.cs +System.CodeDom/CodeSnippetStatementTest.cs +System.CodeDom/CodeSnippetTypeMemberCas.cs +System.CodeDom/CodeSnippetTypeMemberTest.cs +System.CodeDom/CodeStatementCas.cs +System.CodeDom/CodeStatementCollectionCas.cs +System.CodeDom/CodeStatementCollectionTest.cs +System.CodeDom/CodeThisReferenceExpressionCas.cs +System.CodeDom/CodeThrowExceptionStatementCas.cs +System.CodeDom/CodeTryCatchFinallyStatementCas.cs +System.CodeDom/CodeTypeConstructorCas.cs +System.CodeDom/CodeTypeConstructorTest.cs +System.CodeDom/CodeTypeDeclarationCas.cs +System.CodeDom/CodeTypeDeclarationCollectionCas.cs +System.CodeDom/CodeTypeDeclarationCollectionTest.cs +System.CodeDom/CodeTypeDelegateCas.cs +System.CodeDom/CodeTypeDelegateTest.cs +System.CodeDom/CodeTypeMemberCas.cs +System.CodeDom/CodeTypeMemberCollectionCas.cs +System.CodeDom/CodeTypeMemberCollectionTest.cs +System.CodeDom/CodeTypeOfExpressionCas.cs +System.CodeDom/CodeTypeOfExpressionTest.cs +System.CodeDom/CodeTypeParameterCas.cs +System.CodeDom/CodeTypeParameterCollectionTest.cs +System.CodeDom/CodeTypeParameterTest.cs +System.CodeDom/CodeTypeReferenceCas.cs +System.CodeDom/CodeTypeReferenceCollectionCas.cs +System.CodeDom/CodeTypeReferenceCollectionTest.cs +System.CodeDom/CodeTypeReferenceExpressionCas.cs +System.CodeDom/CodeTypeReferenceExpressionTest.cs +System.CodeDom/CodeTypeReferenceTest.cs +System.CodeDom/CodeVariableDeclarationStatementCas.cs +System.CodeDom/CodeVariableDeclarationStatementTest.cs +System.CodeDom/CodeVariableReferenceExpressionCas.cs +System.CodeDom/CodeVariableReferenceExpressionTest.cs +System.CodeDom.Compiler/CodeCompilerCas.cs +System.CodeDom.Compiler/CodeDomProviderCas.cs +System.CodeDom.Compiler/CodeGeneratorCas.cs +System.CodeDom.Compiler/CodeGeneratorFromTypeTestBase.cs +System.CodeDom.Compiler/CodeGeneratorGenerateFromCompileUnitTest.cs +System.CodeDom.Compiler/CodeGeneratorOptionsCas.cs +System.CodeDom.Compiler/CodeGeneratorOptionsTest.cs +System.CodeDom.Compiler/CodeGeneratorTest.cs +System.CodeDom.Compiler/CodeGeneratorTestBase.cs +System.CodeDom.Compiler/CodeParserCas.cs +System.CodeDom.Compiler/CompilerErrorCas.cs +System.CodeDom.Compiler/CompilerErrorCollectionCas.cs +System.CodeDom.Compiler/CompilerInfoCas.cs +System.CodeDom.Compiler/CompilerParametersCas.cs +System.CodeDom.Compiler/CompilerResultsCas.cs +System.CodeDom.Compiler/ExecutorCas.cs +System.CodeDom.Compiler/ExecutorTest.cs +System.CodeDom.Compiler/GeneratedCodeAttributeCas.cs +System.CodeDom.Compiler/GeneratedCodeAttributeTest.cs +System.CodeDom.Compiler/IndentedTextWriterCas.cs +System.CodeDom.Compiler/IndentedTextWriterTest.cs +System.CodeDom.Compiler/TempFileCollectionCas.cs +System.CodeDom.Compiler/TempFileCollectionTest.cs +System.Configuration/ApplicationSettingsBaseTest.cs +System.Configuration/ConfigurationExceptionTest.cs +System.Configuration/ConfigXmlDocumentTest.cs +System.Configuration/LocalFileSettingsProviderTest.cs +System.Configuration/SettingElementTest.cs +System.Configuration/SettingsBaseTest.cs +System.Configuration/SettingsPropertyCollectionTest.cs +System.Configuration/SettingsPropertyTest.cs +System.Configuration/SettingsPropertyValueCollectionTest.cs +System.Configuration/SettingsPropertyValueTest.cs +System.Configuration.Provider +System.Configuration.Provider/ProviderBaseTest.cs +System.IO.Ports/SerialPortTest.cs +System.Web/AspNetHostingPermissionAttributeCas.cs +System.Web/AspNetHostingPermissionAttributeTest.cs +System.Web/AspNetHostingPermissionCas.cs +System.Web/AspNetHostingPermissionTest.cs diff --git a/mcs/class/System/mobile_static_System_test.dll.sources b/mcs/class/System/mobile_static_System_test.dll.sources new file mode 100644 index 00000000000..3944a95be6a --- /dev/null +++ b/mcs/class/System/mobile_static_System_test.dll.sources @@ -0,0 +1 @@ +#include System_test.dll.sources |