From 34046a43d076fa49e479da00c6b4c85cc7f55830 Mon Sep 17 00:00:00 2001
From: Natale Patriciello <natale.patriciello@gmail.com>
Date: Thu, 3 Sep 2015 21:12:22 -0700
Subject: [PATCH] bug 2165: server replies to SYN (with option TS) with a
 SYNACK (with option TS) also if the attribute Timestamp is false

---
 src/internet/model/tcp-socket-base.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc
index b8b180ad7..869f45a39 100644
--- a/src/internet/model/tcp-socket-base.cc
+++ b/src/internet/model/tcp-socket-base.cc
@@ -2575,9 +2575,10 @@ TcpSocketBase::ReadOptions (const TcpHeader& header)
         }
     }
 
+  bool timestampAttribute = m_timestampEnabled;
   m_timestampEnabled = false;
 
-  if (header.HasOption (TcpOption::TS))
+  if (header.HasOption (TcpOption::TS) && timestampAttribute)
     {
       m_timestampEnabled = true;
       ProcessOptionTimestamp (header.GetOption (TcpOption::TS));