Finish forward-porting #1224 to main

Author: lukebakken

projects/RabbitMQ.Client/client/api/AmqpTcpEndpoint.cs

@@ -86,7 +86,7 @@ public AmqpTcpEndpoint(string hostName, int portOrMinusOne, SslOption ssl, uint
         /// <param name="portOrMinusOne"> Port number. If the port number is -1, the default port number will be used.</param>
         /// <param name="ssl">Ssl option.</param>
         public AmqpTcpEndpoint(string hostName, int portOrMinusOne, SslOption ssl) :
-            this(hostName, portOrMinusOne, ssl, 0)
+            this(hostName, portOrMinusOne, ssl, ConnectionFactory.DefaultMaxMessageSize)
         {
         }
 
@@ -193,7 +193,7 @@ public IProtocol Protocol
         public SslOption Ssl { get; set; }
 
         /// <summary>
-        /// Get the maximum size for a message in bytes. The default value is 0 (unlimited)
+        /// Get the maximum size for a message in bytes. The default value is 128MiB to match RabbitMQ's default
         /// </summary>
         public uint MaxMessageSize
         {

projects/RabbitMQ.Client/client/impl/Connection.Receive.cs

@@ -149,7 +149,10 @@ private void HardProtocolExceptionHandler(HardProtocolException hpe)
                 {
                     var cmd = new ConnectionClose(hpe.ShutdownReason.ReplyCode, hpe.ShutdownReason.ReplyText, 0, 0);
                     _session0.Transmit(ref cmd);
-                    ClosingLoop();
+                    if (hpe.CanShutdownCleanly)
+                    {
+                        ClosingLoop();
+                    }
                 }
                 catch (IOException ioe)
                 {

projects/RabbitMQ.Client/client/impl/Frame.cs

@@ -278,7 +278,7 @@ internal static InboundFrame ReadFrom(Stream reader, byte[] frameHeaderBuffer, u
             var frameHeaderSpan = new ReadOnlySpan<byte>(frameHeaderBuffer, 1, 6);
             int channel = NetworkOrderDeserializer.ReadUInt16(frameHeaderSpan);
             int payloadSize = NetworkOrderDeserializer.ReadInt32(frameHeaderSpan.Slice(2, 4));
-            if (payloadSize > maxMessageSize)
+            if ((maxMessageSize > 0) && (payloadSize > maxMessageSize))
             {
                 string msg = $"Frame payload size '{payloadSize}' exceeds maximum of '{maxMessageSize}' bytes";
                 throw new MalformedFrameException(message: msg, canShutdownCleanly: false);

projects/Unit/APIApproval.Approve.verified.txt

@@ -152,7 +152,7 @@ namespace RabbitMQ.Client
     {
         public const ushort DefaultChannelMax = 2047;
         public const uint DefaultFrameMax = 0u;
-        public const uint DefaultMaxMessageSize = 0u;
+        public const uint DefaultMaxMessageSize = 134217728u;
         public const string DefaultPass = "guest";
         public const string DefaultUser = "guest";
         public const string DefaultVHost = "/";
@@ -211,7 +211,6 @@ namespace RabbitMQ.Client
         public const int CommandInvalid = 503;
         public const int ConnectionForced = 320;
         public const int ContentTooLarge = 311;
-        public const uint DefaultMaxMessageSizeInBytes = 134217728u;
         public const int FrameBody = 3;
         public const int FrameEnd = 206;
         public const int FrameError = 501;
@@ -945,4 +944,4 @@ namespace RabbitMQ.Client.Logging
         public string Type { get; }
         public override string ToString() { }
     }
-}
+}