Refactor HttpHeader::entries

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index f0f3e454ea8d25bbaa1dd7fdc72ec88be583b838..571072a9d30afd6d88811d2742c09a1d6e506f81 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -50,6 +50,8 @@
 #include "StrList.h"
 #include "TimeOrTag.h"
 
+#include <algorithm>
+
 /*
  * On naming conventions:
  *
@@ -887,7 +889,7 @@ HttpHeader::delAt(HttpHeaderPos pos, int &headers_deleted)
 void
 HttpHeader::compact()
 {
-    entries.prune(NULL);
+    std::remove(entries.begin(), entries.end(), static_cast<HttpHeaderEntry *>(NULL));
 }
 
 /*
@@ -943,7 +945,7 @@ HttpHeader::insertEntry(HttpHeaderEntry * e)
     else
         CBIT_SET(mask, e->id);
 
-    entries.insert(e);
+    entries.insert(entries.begin(),e);
 
     /* increment header length, allow for ": " and crlf */
     len += e->name.size() + 2 + e->value.size() + 2;

diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index 8681d1aaca020564d88cb977ca5d44a9c2d693e4..ea1d37f1a45b580bbc393ff71498162caa01b0e1 100644 (file)
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -283,7 +283,7 @@ public:
     inline bool chunked() const; ///< whether message uses chunked Transfer-Encoding
 
     /* protected, do not use these, use interface functions instead */
-    Vector<HttpHeaderEntry *> entries;         /**< parsed fields in raw format */
+    std::vector<HttpHeaderEntry *> entries;            /**< parsed fields in raw format */
     HttpHeaderMask mask;       /**< bit set <=> entry present */
     http_hdr_owner_type owner; /**< request or reply */
     int len;                   /**< length when packed, not counting terminating null-byte */