From b3335522de28b8c9d122edeff64ed5a5bb008931 Mon Sep 17 00:00:00 2001
From: rb304g <rb304g@att.com>
Date: Fri, 23 Sep 2016 17:56:37 +0000
Subject: [PATCH] TS-4888: Modified collapsed_forwarding plugin to return
 TSREMAP_NO_REMAP.

(cherry picked from commit 86aa59447ae2cf8f331d2fc63e4a2758ca1f3c38)
---
 .../collapsed_forwarding/collapsed_forwarding.cc          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc b/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
index 00c56de58d2..fb2c5dc5d55 100644
--- a/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
+++ b/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
@@ -309,5 +309,11 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
   TSHttpTxnHookAdd(rh, TS_HTTP_READ_RESPONSE_HDR_HOOK, cont);
   TSHttpTxnHookAdd(rh, TS_HTTP_OS_DNS_HOOK, cont);
 
-  return TSREMAP_DID_REMAP;
+  return TSREMAP_NO_REMAP;
+}
+
+void
+TSRemapDeleteInstance(void *ih)
+{
+  // To resolve run time error
 }