You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2015/07/14 15:42:08 UTC

trafficserver git commit: TS-2150: Fix broken string compare function.

Repository: trafficserver
Updated Branches:
  refs/heads/master b7ee24627 -> 3b1040e97


TS-2150: Fix broken string compare function.


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

Branch: refs/heads/master
Commit: 3b1040e97a96fea1f779c82078fe0ada8878190e
Parents: b7ee246
Author: Alan M. Carroll <am...@apache.org>
Authored: Tue Jul 14 08:23:56 2015 -0500
Committer: Alan M. Carroll <am...@apache.org>
Committed: Tue Jul 14 08:23:56 2015 -0500

----------------------------------------------------------------------
 proxy/logging/LogField.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3b1040e9/proxy/logging/LogField.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogField.cc b/proxy/logging/LogField.cc
index 6ddfe79..34468a6 100644
--- a/proxy/logging/LogField.cc
+++ b/proxy/logging/LogField.cc
@@ -119,9 +119,11 @@ LogSlice::toStrOffset(int strlen, int *offset)
   LogField::LogField
   -------------------------------------------------------------------------*/
 
-struct cmp_str {
-  bool operator()(ts::ConstBuffer a, ts::ConstBuffer b) const { return memcmp(a._ptr, b._ptr, MAX(a._size, b._size)) < 0; }
-};
+namespace {
+  struct cmp_str {
+    bool operator()(ts::ConstBuffer a, ts::ConstBuffer b) const { return ptr_len_casecmp(a._ptr, a._size, b._ptr, b._size) == 0; }
+  };
+}
 
 typedef std::map<ts::ConstBuffer, TSMilestonesType, cmp_str> milestone_map;
 static milestone_map m_milestone_map;