diff options
author | 2017-03-24 00:54:47 +0100 | |
---|---|---|
committer | 2017-03-24 00:54:47 +0100 | |
commit | e44a50ffd740e576938f2d6892350cc337051924 (patch) | |
tree | 19dff6f774731c6c40f229a8373585e32f98c94c /src/csharp/Grpc.Core | |
parent | 6f1e443a519cd28d97be78c5ca2ca72a45f6b598 (diff) | |
parent | d0432ff5af7f6af26d441bc05454f9f511843628 (diff) |
Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0
Diffstat (limited to 'src/csharp/Grpc.Core')
-rw-r--r-- | src/csharp/Grpc.Core/ChannelOptions.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core/ChannelOptions.cs b/src/csharp/Grpc.Core/ChannelOptions.cs index b6eeceabc4..46a2c6695f 100644 --- a/src/csharp/Grpc.Core/ChannelOptions.cs +++ b/src/csharp/Grpc.Core/ChannelOptions.cs @@ -151,7 +151,14 @@ namespace Grpc.Core public const string MaxConcurrentStreams = "grpc.max_concurrent_streams"; /// <summary>Maximum message length that the channel can receive</summary> - public const string MaxMessageLength = "grpc.max_message_length"; + public const string MaxReceiveMessageLength = "grpc.max_receive_message_length"; + + /// <summary>Maximum message length that the channel can send</summary> + public const string MaxSendMessageLength = "grpc.max_send_message_length"; + + /// <summary>Obsolete, for backward compatibility only.</summary> + [Obsolete("Use MaxReceiveMessageLength instead.")] + public const string MaxMessageLength = MaxReceiveMessageLength; /// <summary>Initial sequence number for http2 transports</summary> public const string Http2InitialSequenceNumber = "grpc.http2.initial_sequence_number"; |