Merge pull request #1260 from stebet/headerfix

Author: michaelklishin

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

@@ -149,7 +149,7 @@ private bool ParseHeaderFrame(in InboundFrame frame)
             }
             _rentedHeaderArray = totalBodyBytes != 0 ? frame.TakeoverPayload() : Array.Empty<byte>();
 
-            _headerBytes = frame.Payload;
+            _headerBytes = frame.Payload.Slice(12);
 
             _remainingBodyBytes = (int)totalBodyBytes;
             UpdateContentBodyState();

projects/Unit/TestBasicProperties.cs

@@ -30,6 +30,13 @@
 //---------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using RabbitMQ.Client.Events;
 
 using Xunit;
 
@@ -188,5 +195,44 @@ public void TestProperties_ReplyTo(string replyTo)
             Assert.Equal(isReplyToPresent, basicProperties.IsReplyToPresent());
             Assert.Equal(replyToAddress, basicProperties.ReplyToAddress?.ToString());
         }
+
+        [Fact]
+        public void TestPropertiesRountrip_Headers()
+        {
+            // Arrange
+            var subject = new BasicProperties
+            {
+                Headers = new Dictionary<string, object?>()
+            };
+
+            var cf = new ConnectionFactory();
+            using (IConnection c = cf.CreateConnection())
+            using (IModel m = c.CreateModel())
+            {
+                QueueDeclareOk q = m.QueueDeclare();
+                var bp = new BasicProperties() { Headers = new Dictionary<string, object>() };
+                bp.Headers["Hello"] = "World";
+                byte[] sendBody = Encoding.UTF8.GetBytes("hi");
+                byte[] consumeBody = null;
+                var consumer = new EventingBasicConsumer(m);
+                var are = new AutoResetEvent(false);
+                string response = null;
+                consumer.Received += async (o, a) =>
+                {
+                    response = Encoding.UTF8.GetString(a.BasicProperties.Headers["Hello"] as byte[]);
+                    consumeBody = a.Body.ToArray();
+                    are.Set();
+                    await Task.Yield();
+                };
+
+                string tag = m.BasicConsume(q.QueueName, true, consumer);
+                m.BasicPublish("", q.QueueName, bp, sendBody);
+                bool waitResFalse = are.WaitOne(5000);
+                m.BasicCancel(tag);
+                Assert.True(waitResFalse);
+                Assert.Equal(sendBody, consumeBody);
+                Assert.Equal("World", response);
+            }
+        }
     }
 }