diff options
| author | monojenkins <jo.shields+jenkins@xamarin.com> | 2015-12-16 16:55:04 +0300 |
|---|---|---|
| committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2015-12-16 16:55:04 +0300 |
| commit | ac432e4ba2f187bf6606a2a07bb87607306647b4 (patch) | |
| tree | 1c2f40371ca4bf913c2a43348badacc8836d0455 /mcs | |
| parent | 431334491983b99f9390b1ccb9ee11322365b548 (diff) | |
| parent | d6ff307ec6da3737ef9b4d4f3aac688fc5860454 (diff) | |
Merge pull request #2353 from ludovic-henry/fix-servicemodel-15153
Add test and merge #1879
@monojenkins merge
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/System.ServiceModel/System.ServiceModel/NetTcpBinding.cs | 3 | ||||
| -rw-r--r-- | mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/NetTcpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/NetTcpBinding.cs index 4e1d5c4dfd0..794445155d8 100644 --- a/mcs/class/System.ServiceModel/System.ServiceModel/NetTcpBinding.cs +++ b/mcs/class/System.ServiceModel/System.ServiceModel/NetTcpBinding.cs @@ -43,7 +43,8 @@ namespace System.ServiceModel int max_conn; OptionalReliableSession reliable_session; NetTcpSecurity security; - XmlDictionaryReaderQuotas reader_quotas; + XmlDictionaryReaderQuotas reader_quotas + = new XmlDictionaryReaderQuotas (); bool transaction_flow; TransactionProtocol transaction_protocol; TcpTransportBindingElement transport; diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs index 633b776aeac..cb78fe2be1e 100644 --- a/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs +++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel/NetTcpBindingTest.cs @@ -213,6 +213,13 @@ namespace MonoTests.System.ServiceModel Assert.IsTrue (Foo.JoinCalled, "#2"); } + [Test] + public void ReaderQuotasDefault_Bug15153 () + { + NetTcpBinding binding = new NetTcpBinding(SecurityMode.None); + binding.ReaderQuotas.MaxStringContentLength = 8192; + } + [ServiceContract] public interface IFoo { |