trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject git commit: TS-3006: Always build TSConfig, don't require WCCP.
Date Wed, 24 Sep 2014 02:17:51 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 982cca2ff -> a8521d39d


TS-3006: Always build TSConfig, don't require WCCP.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a8521d39
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a8521d39
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a8521d39

Branch: refs/heads/master
Commit: a8521d39dc1d962bbbe07c001a3a890f9a6e3c30
Parents: 982cca2
Author: Alan M. Carroll <amc@network-geographics.com>
Authored: Tue Sep 23 21:16:15 2014 -0500
Committer: Alan M. Carroll <amc@network-geographics.com>
Committed: Tue Sep 23 21:16:15 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a8521d39/lib/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 77e36d6..fce72aa 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

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a8521d39/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 293a168..ef0ffd5 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:


Mime
View raw message