Moved some users of httpHeaderIdByNameDef to the SBuf variant

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 568625e4311d91fc5a2b7a6f30e9a6fb16a5515e..009972bf25e77e732a50a7447d9b0f0fcab46bbf 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -1111,7 +1111,7 @@ HttpHeader::getByNameIfPresent(const char *name, String &result) const
     assert(name);
 
     /* First try the quick path */
-    id = httpHeaderIdByNameDef(name, strlen(name));
+    id = httpHeaderIdByNameDef(SBuf(name));
 
     if (id != -1) {
         if (!has(id))
@@ -1841,6 +1841,7 @@ httpHeaderStoreReport(StoreEntry * e)
     storeAppendPrintf(e, "Hdr Fields Parsed: %d\n", HeaderEntryParsedCount);
 }
 
+// (ab)used by other modules.
 http_hdr_type
 httpHeaderIdByName(const char *name, size_t name_len, const HttpHeaderFieldInfo * info, int end)
 {

diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index fccf202e5c55197f182503d294c07cd9c43edd5f..0f39f64030827fe21324448e14b6fead92ab3381 100644 (file)
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -456,7 +456,7 @@ HeaderManglers::dumpReplacement(StoreEntry * entry, const char *name) const
 headerMangler *
 HeaderManglers::track(const char *name)
 {
-    int id = httpHeaderIdByNameDef(name, strlen(name));
+    int id = httpHeaderIdByNameDef(SBuf(name));
 
     if (id == HDR_BAD_HDR) { // special keyword or a custom header
         if (strcmp(name, "All") == 0)

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 59cb9a41b974d653ea9e2e660c53fa55afea7648..93a35b2097fc6e909e8b63a549a51238bf0a7347 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -4608,7 +4608,7 @@ static void parse_HeaderWithAclList(HeaderWithAclList **headers)
     }
     HeaderWithAcl hwa;
     hwa.fieldName = fn;
-    hwa.fieldId = httpHeaderIdByNameDef(fn, strlen(fn));
+    hwa.fieldId = httpHeaderIdByNameDef(SBuf(fn));
     if (hwa.fieldId == HDR_BAD_HDR)
         hwa.fieldId = HDR_OTHER;
 

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 1dc0c5b9adc38f5de002156f58ee5ca64b6db6b9..23aee92b9d7d877f5185eb1c99fc63d8ae15806f 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -244,7 +244,7 @@ parse_header_token(external_acl_format::Pointer format, char *header, const Form
     }
 
     format->header = xstrdup(header);
-    format->header_id = httpHeaderIdByNameDef(header, strlen(header));
+    format->header_id = httpHeaderIdByNameDef(SBuf(header));
 }
 
 void