trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1213300 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES example/protocol/TxnSM.c iocore/cluster/ClusterVConnection.cc proxy/InkAPITest.cc proxy/Main.cc proxy/http/HttpTransact.cc
Date Mon, 12 Dec 2011 16:35:55 GMT
Author: igalic
Date: Mon Dec 12 16:35:55 2011
New Revision: 1213300

URL: http://svn.apache.org/viewvc?rev=1213300&view=rev
Log:
Backport r1213184: n.b.: This merge contains no functional changes
TS-1047: Fix lots of spelling mistakes
Author: Arno Töll
Review/Backport: igalic

Modified:
    trafficserver/traffic/branches/3.0.x/   (props changed)
    trafficserver/traffic/branches/3.0.x/CHANGES
    trafficserver/traffic/branches/3.0.x/example/protocol/TxnSM.c
    trafficserver/traffic/branches/3.0.x/iocore/cluster/ClusterVConnection.cc
    trafficserver/traffic/branches/3.0.x/proxy/InkAPITest.cc
    trafficserver/traffic/branches/3.0.x/proxy/Main.cc
    trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc

Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 12 16:35:55 2011
@@ -1,4 +1,4 @@
 /incubator/trafficserver/traffic/branches/dev:891823-915885
 /trafficserver/traffic/branches/ts-291:965529-991993
 /trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1153236,1154744,1155125,1171365,1175914,1196822,1196922,1209291
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1152536,1153236,1154744,1155125,1171365,1175914,1196822,1196922,1209291,1213184

Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1213300&r1=1213299&r2=1213300&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Mon Dec 12 16:35:55 2011
@@ -1,4 +1,8 @@
                                                          -*- coding: utf-8 -*-
+Changes with Apache Traffic Server 3.0.3
+  *) [TS-1047] fix lots of spelling mistakes
+   Author: Arno Töll
+
 Changes with Apache Traffic Server 3.0.2
   *) [TS-1030] Improve hashing mechanism on WKS.
 

Modified: trafficserver/traffic/branches/3.0.x/example/protocol/TxnSM.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/example/protocol/TxnSM.c?rev=1213300&r1=1213299&r2=1213300&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/example/protocol/TxnSM.c (original)
+++ trafficserver/traffic/branches/3.0.x/example/protocol/TxnSM.c Mon Dec 12 16:35:55 2011
@@ -677,7 +677,7 @@ state_write_to_cache(TSCont contp, TSEve
 
     /* If not all data have been read in, we have to reenable the read_vio */
     if (txn_sm->q_server_vc != NULL) {
-      TSDebug("protocol", "reenable server_read_vio");
+      TSDebug("protocol", "re-enable server_read_vio");
       TSVIOReenable(txn_sm->q_server_read_vio);
       return TS_SUCCESS;
     }
@@ -696,7 +696,7 @@ state_write_to_cache(TSCont contp, TSEve
       txn_sm->q_pending_action = TSCacheRead(contp, txn_sm->q_key);
     } else {                    /* not done with writing into cache */
 
-      TSDebug("protocol", "reenable cache_write_vio");
+      TSDebug("protocol", "re-enable cache_write_vio");
       TSVIOReenable(txn_sm->q_cache_write_vio);
     }
     return TS_SUCCESS;

Modified: trafficserver/traffic/branches/3.0.x/iocore/cluster/ClusterVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/iocore/cluster/ClusterVConnection.cc?rev=1213300&r1=1213299&r2=1213300&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/iocore/cluster/ClusterVConnection.cc (original)
+++ trafficserver/traffic/branches/3.0.x/iocore/cluster/ClusterVConnection.cc Mon Dec 12 16:35:55
2011
@@ -166,13 +166,13 @@ ClusterVConnectionBase::reenable(VIO * v
     read.enabled = 1;
 #ifdef DEBUG
     if (enable_debug_trace && (vio->buffer.mbuf && !vio->buffer.writer()->write_avail()))
-      printf("NetVConnection reenabled for read when full\n");
+      printf("NetVConnection re-enabled for read when full\n");
 #endif
   } else if (vio == &write.vio) {
     write.enabled = 1;
 #ifdef DEBUG
     if (enable_debug_trace && (vio->buffer.mbuf && !vio->buffer.reader()->read_avail()))
-      printf("NetVConnection reenabled for write when empty\n");
+      printf("NetVConnection re-enabled for write when empty\n");
 #endif
   } else {
     ink_assert(!"bad vio");

Modified: trafficserver/traffic/branches/3.0.x/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/proxy/InkAPITest.cc?rev=1213300&r1=1213299&r2=1213300&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/branches/3.0.x/proxy/InkAPITest.cc Mon Dec 12 16:35:55 2011
@@ -2544,7 +2544,7 @@ mytest_handler(TSCont contp, TSEvent eve
 
       } else {
         *(test->pstatus) = REGRESSION_TEST_FAILED;
-        SDK_RPRINT(test->regtest, "TSHttpTxnReenable", "TestCase1", TC_FAIL, "Txn not
reenabled properly");
+        SDK_RPRINT(test->regtest, "TSHttpTxnReenable", "TestCase1", TC_FAIL, "Txn not
re-enabled properly");
 
       }
 
@@ -4191,7 +4191,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField) 
           SDK_RPRINT(test, "TSMimeHdrFieldsCount", "TestCase1", TC_PASS, "ok");
           test_passed_Mime_Hdr_Fields_Count = true;
         } else {
-          SDK_RPRINT(test, "TSMimeHdrFieldsCount", "TestCase1", TC_FAIL, "Value's Dont match");
+          SDK_RPRINT(test, "TSMimeHdrFieldsCount", "TestCase1", TC_FAIL, "Values don't match");
         }
       }
     }

Modified: trafficserver/traffic/branches/3.0.x/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/proxy/Main.cc?rev=1213300&r1=1213299&r2=1213300&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/proxy/Main.cc (original)
+++ trafficserver/traffic/branches/3.0.x/proxy/Main.cc Mon Dec 12 16:35:55 2011
@@ -1645,7 +1645,7 @@ main(int argc, char **argv)
     if (0 != mlockall(MCL_CURRENT | MCL_FUTURE))
       Warning("Unable to mlockall() on startup");
     else
-      Debug("server", "Succesfully called mlockall()");
+      Debug("server", "Successfully called mlockall()");
   }
 #endif
 

Modified: trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc?rev=1213300&r1=1213299&r2=1213300&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc (original)
+++ trafficserver/traffic/branches/3.0.x/proxy/http/HttpTransact.cc Mon Dec 12 16:35:55 2011
@@ -3612,7 +3612,7 @@ HttpTransact::delete_srv_entry(State* s,
 
         /* no hosts DON'T match -- max out retries and return */
         if (still_ok_hosts.empty()) {
-          Debug("dns_srv", "No more SRV hosts to try that dont contain a host we just tried
-- giving up");
+          Debug("dns_srv", "No more SRV hosts to try that don't contain a host we just tried
-- giving up");
           s->current.attempts = max_retries;
           TRANSACT_RETURN(OS_RR_MARK_DOWN, ReDNSRoundRobin);
         }
@@ -6228,7 +6228,7 @@ HttpTransact::is_response_cacheable(Stat
     // If a ttl is set, allow caching even if response contains
     // Cache-Control headers to prevent caching
     if (s->cache_control.ttl_in_cache > 0) {
-      Debug("http_trans", "[is_response_cacheable] Cache-control header directives in response
overriden by ttl in cache.config");
+      Debug("http_trans", "[is_response_cacheable] Cache-control header directives in response
overridden by ttl in cache.config");
     } else if (!s->cache_control.ignore_server_no_cache) {
       Debug("http_trans", "[is_response_cacheable] NO by response cache control");
       return false;



Mime
View raw message