From a8521d39dc1d962bbbe07c001a3a890f9a6e3c30 Mon Sep 17 00:00:00 2001
From: "Alan M. Carroll" <amc@network-geographics.com>
Date: Tue, 23 Sep 2014 21:16:15 -0500
Subject: [PATCH] TS-3006: Always build TSConfig, don't require WCCP.

---
 lib/Makefile.am            | 5 ++---
 proxy/http/HttpTransact.cc | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 77e36d6fd3f..fce72aa60a0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,15 +16,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SUBDIRS = ts records
+SUBDIRS = ts records tsconfig
 
 if BUILD_PERL_LIB
 SUBDIRS += perl
 endif
 
-# TsConfig is only built for WCCP until the bugs are worked out.
 if BUILD_WCCP
-SUBDIRS += tsconfig wccp
+SUBDIRS += wccp
 endif
 
 if ENABLE_CPPAPI
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 293a1687763..ef0ffd54d31 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -4383,11 +4383,11 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State* s)
           resp->set_expires(exp_time);
         }
       } else if (is_request_conditional(&s->hdr_info.client_request) && server_response_code == HTTP_STATUS_OK) {
-        DebugTxn("http_trans", "[hcoofsr] conditional request, 200 " "response, send back 304 if possible");
         client_response_code =
           HttpTransactCache::match_response_to_request_conditionals(&s->hdr_info.client_request,
                                                                     &s->hdr_info.server_response);
 
+        DebugTxn("http_trans", "[hcoofsr] conditional request, 200 " "response, send back 304 if possible [crc=%d]", client_response_code);
         if ((client_response_code == HTTP_STATUS_NOT_MODIFIED) || (client_response_code == HTTP_STATUS_PRECONDITION_FAILED)) {
           switch (s->cache_info.action) {
           case CACHE_DO_WRITE: