renamed field_type to Http::HdrFieldType

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index bde87aba704231b7856248a4beb77e58a6cb2545..8a650e3ee89241f673fd5cd0547abd4bcb2681f2 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -1087,7 +1087,7 @@ void
 HttpHeader::putInt(Http::HdrType id, int number)
 {
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftInt);  /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftInt);  /* must be of an appropriate type */
     assert(number >= 0);
     addEntry(new HttpHeaderEntry(id, NULL, xitoa(number)));
 }
@@ -1096,7 +1096,7 @@ void
 HttpHeader::putInt64(Http::HdrType id, int64_t number)
 {
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftInt64);    /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftInt64);    /* must be of an appropriate type */
     assert(number >= 0);
     addEntry(new HttpHeaderEntry(id, NULL, xint64toa(number)));
 }
@@ -1105,7 +1105,7 @@ void
 HttpHeader::putTime(Http::HdrType id, time_t htime)
 {
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftDate_1123);    /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftDate_1123);    /* must be of an appropriate type */
     assert(htime >= 0);
     addEntry(new HttpHeaderEntry(id, NULL, mkrfc1123(htime)));
 }
@@ -1114,7 +1114,7 @@ void
 HttpHeader::insertTime(Http::HdrType id, time_t htime)
 {
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftDate_1123);    /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftDate_1123);    /* must be of an appropriate type */
     assert(htime >= 0);
     insertEntry(new HttpHeaderEntry(id, NULL, mkrfc1123(htime)));
 }
@@ -1123,7 +1123,7 @@ void
 HttpHeader::putStr(Http::HdrType id, const char *str)
 {
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftStr);  /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftStr);  /* must be of an appropriate type */
     assert(str);
     addEntry(new HttpHeaderEntry(id, NULL, str));
 }
@@ -1220,7 +1220,7 @@ int
 HttpHeader::getInt(Http::HdrType id) const
 {
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftInt);  /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftInt);  /* must be of an appropriate type */
     HttpHeaderEntry *e;
 
     if ((e = findEntry(id)))
@@ -1233,7 +1233,7 @@ int64_t
 HttpHeader::getInt64(Http::HdrType id) const
 {
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftInt64);    /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftInt64);    /* must be of an appropriate type */
     HttpHeaderEntry *e;
 
     if ((e = findEntry(id)))
@@ -1248,7 +1248,7 @@ HttpHeader::getTime(Http::HdrType id) const
     HttpHeaderEntry *e;
     time_t value = -1;
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftDate_1123);    /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftDate_1123);    /* must be of an appropriate type */
 
     if ((e = findEntry(id))) {
         value = parse_rfc1123(e->value.termedBuf());
@@ -1264,7 +1264,7 @@ HttpHeader::getStr(Http::HdrType id) const
 {
     HttpHeaderEntry *e;
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftStr);  /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftStr);  /* must be of an appropriate type */
 
     if ((e = findEntry(id))) {
         httpHeaderNoteParsedEntry(e->id, e->value, 0);  /* no errors are possible */
@@ -1280,7 +1280,7 @@ HttpHeader::getLastStr(Http::HdrType id) const
 {
     HttpHeaderEntry *e;
     assert(any_valid_header(id));
-    assert(headerTable[id].type == field_type::ftStr);  /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftStr);  /* must be of an appropriate type */
 
     if ((e = findLastEntry(id))) {
         httpHeaderNoteParsedEntry(e->id, e->value, 0);  /* no errors are possible */
@@ -1418,7 +1418,7 @@ HttpHeader::getETag(Http::HdrType id) const
 {
     ETag etag = {NULL, -1};
     HttpHeaderEntry *e;
-    assert(headerTable[id].type == field_type::ftETag);     /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftETag);     /* must be of an appropriate type */
 
     if ((e = findEntry(id)))
         etagParseInit(&etag, e->value.termedBuf());
@@ -1431,7 +1431,7 @@ HttpHeader::getTimeOrTag(Http::HdrType id) const
 {
     TimeOrTag tot;
     HttpHeaderEntry *e;
-    assert(headerTable[id].type == field_type::ftDate_1123_or_ETag);    /* must be of an appropriate type */
+    assert(headerTable[id].type == Http::HdrFieldType::ftDate_1123_or_ETag);    /* must be of an appropriate type */
     memset(&tot, 0, sizeof(tot));
 
     if ((e = findEntry(id))) {

diff --git a/src/HttpHeaderFieldInfo.h b/src/HttpHeaderFieldInfo.h
index 4b9a0235a54c0a057763c345b8d09a2cff517c6d..388177c2b74a7255f03eec2375231ac4a041226a 100644 (file)
--- a/src/HttpHeaderFieldInfo.h
+++ b/src/HttpHeaderFieldInfo.h
@@ -17,11 +17,11 @@
 class HttpHeaderFieldInfo
 {
 public:
-    HttpHeaderFieldInfo() : id(Http::HdrType::ACCEPT), type(field_type::ftInvalid) {}
+    HttpHeaderFieldInfo() : id(Http::HdrType::ACCEPT), type(Http::HdrFieldType::ftInvalid) {}
 
     Http::HdrType id;
     String name;
-    field_type type;
+    Http::HdrFieldType type;
     HttpHeaderFieldStat stat;
 };
 

diff --git a/src/http/RegisteredHeaders.cc b/src/http/RegisteredHeaders.cc
index 8217f0a667205b8ed04d3664c2aac2b09a3555cd..edd4e2a359add6b57810efca172ad8ab499fe290 100644 (file)
--- a/src/http/RegisteredHeaders.cc
+++ b/src/http/RegisteredHeaders.cc
@@ -18,99 +18,99 @@
  * for each index in headerTable, (int)headerTable[index] = index
  */
 const HeaderTableRecord headerTable[] = {
-    {"Accept", Http::HdrType::ACCEPT, field_type::ftStr},
-    {"Accept-Charset", Http::HdrType::ACCEPT_CHARSET, field_type::ftStr},
-    {"Accept-Encoding", Http::HdrType::ACCEPT_ENCODING, field_type::ftStr},
-    {"Accept-Language", Http::HdrType::ACCEPT_LANGUAGE, field_type::ftStr},
-    {"Accept-Ranges", Http::HdrType::ACCEPT_RANGES, field_type::ftStr},
-    {"Age", Http::HdrType::AGE, field_type::ftInt},
-    {"Allow", Http::HdrType::ALLOW, field_type::ftStr},
-    {"Alternate-Protocol", Http::HdrType::ALTERNATE_PROTOCOL, field_type::ftStr},
-    {"Authentication-Info", Http::HdrType::AUTHENTICATION_INFO, field_type::ftStr},
-    {"Authorization", Http::HdrType::AUTHORIZATION, field_type::ftStr},    /* for now */
-    {"Cache-Control", Http::HdrType::CACHE_CONTROL, field_type::ftPCc},
-    {"Connection", Http::HdrType::CONNECTION, field_type::ftStr},
-    {"Content-Base", Http::HdrType::CONTENT_BASE, field_type::ftStr},
-    {"Content-Disposition", Http::HdrType::CONTENT_DISPOSITION, field_type::ftStr},  /* for now */
-    {"Content-Encoding", Http::HdrType::CONTENT_ENCODING, field_type::ftStr},
-    {"Content-Language", Http::HdrType::CONTENT_LANGUAGE, field_type::ftStr},
-    {"Content-Length", Http::HdrType::CONTENT_LENGTH, field_type::ftInt64},
-    {"Content-Location", Http::HdrType::CONTENT_LOCATION, field_type::ftStr},
-    {"Content-MD5", Http::HdrType::CONTENT_MD5, field_type::ftStr},    /* for now */
-    {"Content-Range", Http::HdrType::CONTENT_RANGE, field_type::ftPContRange},
-    {"Content-Type", Http::HdrType::CONTENT_TYPE, field_type::ftStr},
-    {"Cookie", Http::HdrType::COOKIE, field_type::ftStr},
-    {"Cookie2", Http::HdrType::COOKIE2, field_type::ftStr},
-    {"Date", Http::HdrType::DATE, field_type::ftDate_1123},
-    {"ETag", Http::HdrType::ETAG, field_type::ftETag},
-    {"Expect", Http::HdrType::EXPECT, field_type::ftStr},
-    {"Expires", Http::HdrType::EXPIRES, field_type::ftDate_1123},
-    {"Forwarded", Http::HdrType::FORWARDED, field_type::ftStr},
-    {"From", Http::HdrType::FROM, field_type::ftStr},
-    {"Host", Http::HdrType::HOST, field_type::ftStr},
-    {"HTTP2-Settings", Http::HdrType::HTTP2_SETTINGS, field_type::ftStr}, /* for now */
-    {"If-Match", Http::HdrType::IF_MATCH, field_type::ftStr},  /* for now */
-    {"If-Modified-Since", Http::HdrType::IF_MODIFIED_SINCE, field_type::ftDate_1123},
-    {"If-None-Match", Http::HdrType::IF_NONE_MATCH, field_type::ftStr},    /* for now */
-    {"If-Range", Http::HdrType::IF_RANGE, field_type::ftDate_1123_or_ETag},
-    {"If-Unmodified-Since", Http::HdrType::IF_UNMODIFIED_SINCE, field_type::ftDate_1123},
-    {"Keep-Alive", Http::HdrType::KEEP_ALIVE, field_type::ftStr},
-    {"Key", Http::HdrType::KEY, field_type::ftStr},
-    {"Last-Modified", Http::HdrType::LAST_MODIFIED, field_type::ftDate_1123},
-    {"Link", Http::HdrType::LINK, field_type::ftStr},
-    {"Location", Http::HdrType::LOCATION, field_type::ftStr},
-    {"Max-Forwards", Http::HdrType::MAX_FORWARDS, field_type::ftInt64},
-    {"Mime-Version", Http::HdrType::MIME_VERSION, field_type::ftStr},  /* for now */
-    {"Negotiate", Http::HdrType::NEGOTIATE, field_type::ftStr},
-    {"Origin", Http::HdrType::ORIGIN, field_type::ftStr},
-    {"Pragma", Http::HdrType::PRAGMA, field_type::ftStr},
-    {"Proxy-Authenticate", Http::HdrType::PROXY_AUTHENTICATE, field_type::ftStr},
-    {"Proxy-Authentication-Info", Http::HdrType::PROXY_AUTHENTICATION_INFO, field_type::ftStr},
-    {"Proxy-Authorization", Http::HdrType::PROXY_AUTHORIZATION, field_type::ftStr},
-    {"Proxy-Connection", Http::HdrType::PROXY_CONNECTION, field_type::ftStr},
-    {"Proxy-support", Http::HdrType::PROXY_SUPPORT, field_type::ftStr},
-    {"Public", Http::HdrType::PUBLIC, field_type::ftStr},
-    {"Range", Http::HdrType::RANGE, field_type::ftPRange},
-    {"Referer", Http::HdrType::REFERER, field_type::ftStr},
-    {"Request-Range", Http::HdrType::REQUEST_RANGE, field_type::ftPRange}, /* usually matches Http::HdrType::RANGE */
-    {"Retry-Afield_type::fter", Http::HdrType::RETRY_AFTER, field_type::ftStr},    /* for now (field_type::ftDate_1123 or field_type::ftInt!} */
-    {"Server", Http::HdrType::SERVER, field_type::ftStr},
-    {"Set-Cookie", Http::HdrType::SET_COOKIE, field_type::ftStr},
-    {"Set-Cookie2", Http::HdrType::SET_COOKIE2, field_type::ftStr},
-    {"TE", Http::HdrType::TE, field_type::ftStr},
-    {"Title", Http::HdrType::TITLE, field_type::ftStr},
-    {"Trailer", Http::HdrType::TRAILER, field_type::ftStr},
-    {"Transfer-Encoding", Http::HdrType::TRANSFER_ENCODING, field_type::ftStr},
-    {"Translate", Http::HdrType::TRANSLATE, field_type::ftStr},    /* for now. may need to crop */
-    {"Unless-Modified-Since", Http::HdrType::UNLESS_MODIFIED_SINCE, field_type::ftStr},  /* for now ignore. may need to crop */
-    {"Upgrade", Http::HdrType::UPGRADE, field_type::ftStr},    /* for now */
-    {"User-Agent", Http::HdrType::USER_AGENT, field_type::ftStr},
-    {"Vary", Http::HdrType::VARY, field_type::ftStr},  /* for now */
-    {"Via", Http::HdrType::VIA, field_type::ftStr},    /* for now */
-    {"Warning", Http::HdrType::WARNING, field_type::ftStr},    /* for now */
-    {"WWW-Authenticate", Http::HdrType::WWW_AUTHENTICATE, field_type::ftStr},
-    {"X-Cache", Http::HdrType::X_CACHE, field_type::ftStr},
-    {"X-Cache-Lookup", Http::HdrType::X_CACHE_LOOKUP, field_type::ftStr},
-    {"X-Forwarded-For", Http::HdrType::X_FORWARDED_FOR, field_type::ftStr},
-    {"X-Request-URI", Http::HdrType::X_REQUEST_URI, field_type::ftStr},
-    {"X-Squid-Error", Http::HdrType::X_SQUID_ERROR, field_type::ftStr},
+    {"Accept", Http::HdrType::ACCEPT, Http::HdrFieldType::ftStr},
+    {"Accept-Charset", Http::HdrType::ACCEPT_CHARSET, Http::HdrFieldType::ftStr},
+    {"Accept-Encoding", Http::HdrType::ACCEPT_ENCODING, Http::HdrFieldType::ftStr},
+    {"Accept-Language", Http::HdrType::ACCEPT_LANGUAGE, Http::HdrFieldType::ftStr},
+    {"Accept-Ranges", Http::HdrType::ACCEPT_RANGES, Http::HdrFieldType::ftStr},
+    {"Age", Http::HdrType::AGE, Http::HdrFieldType::ftInt},
+    {"Allow", Http::HdrType::ALLOW, Http::HdrFieldType::ftStr},
+    {"Alternate-Protocol", Http::HdrType::ALTERNATE_PROTOCOL, Http::HdrFieldType::ftStr},
+    {"Authentication-Info", Http::HdrType::AUTHENTICATION_INFO, Http::HdrFieldType::ftStr},
+    {"Authorization", Http::HdrType::AUTHORIZATION, Http::HdrFieldType::ftStr},    /* for now */
+    {"Cache-Control", Http::HdrType::CACHE_CONTROL, Http::HdrFieldType::ftPCc},
+    {"Connection", Http::HdrType::CONNECTION, Http::HdrFieldType::ftStr},
+    {"Content-Base", Http::HdrType::CONTENT_BASE, Http::HdrFieldType::ftStr},
+    {"Content-Disposition", Http::HdrType::CONTENT_DISPOSITION, Http::HdrFieldType::ftStr},  /* for now */
+    {"Content-Encoding", Http::HdrType::CONTENT_ENCODING, Http::HdrFieldType::ftStr},
+    {"Content-Language", Http::HdrType::CONTENT_LANGUAGE, Http::HdrFieldType::ftStr},
+    {"Content-Length", Http::HdrType::CONTENT_LENGTH, Http::HdrFieldType::ftInt64},
+    {"Content-Location", Http::HdrType::CONTENT_LOCATION, Http::HdrFieldType::ftStr},
+    {"Content-MD5", Http::HdrType::CONTENT_MD5, Http::HdrFieldType::ftStr},    /* for now */
+    {"Content-Range", Http::HdrType::CONTENT_RANGE, Http::HdrFieldType::ftPContRange},
+    {"Content-Type", Http::HdrType::CONTENT_TYPE, Http::HdrFieldType::ftStr},
+    {"Cookie", Http::HdrType::COOKIE, Http::HdrFieldType::ftStr},
+    {"Cookie2", Http::HdrType::COOKIE2, Http::HdrFieldType::ftStr},
+    {"Date", Http::HdrType::DATE, Http::HdrFieldType::ftDate_1123},
+    {"ETag", Http::HdrType::ETAG, Http::HdrFieldType::ftETag},
+    {"Expect", Http::HdrType::EXPECT, Http::HdrFieldType::ftStr},
+    {"Expires", Http::HdrType::EXPIRES, Http::HdrFieldType::ftDate_1123},
+    {"Forwarded", Http::HdrType::FORWARDED, Http::HdrFieldType::ftStr},
+    {"From", Http::HdrType::FROM, Http::HdrFieldType::ftStr},
+    {"Host", Http::HdrType::HOST, Http::HdrFieldType::ftStr},
+    {"HTTP2-Settings", Http::HdrType::HTTP2_SETTINGS, Http::HdrFieldType::ftStr}, /* for now */
+    {"If-Match", Http::HdrType::IF_MATCH, Http::HdrFieldType::ftStr},  /* for now */
+    {"If-Modified-Since", Http::HdrType::IF_MODIFIED_SINCE, Http::HdrFieldType::ftDate_1123},
+    {"If-None-Match", Http::HdrType::IF_NONE_MATCH, Http::HdrFieldType::ftStr},    /* for now */
+    {"If-Range", Http::HdrType::IF_RANGE, Http::HdrFieldType::ftDate_1123_or_ETag},
+    {"If-Unmodified-Since", Http::HdrType::IF_UNMODIFIED_SINCE, Http::HdrFieldType::ftDate_1123},
+    {"Keep-Alive", Http::HdrType::KEEP_ALIVE, Http::HdrFieldType::ftStr},
+    {"Key", Http::HdrType::KEY, Http::HdrFieldType::ftStr},
+    {"Last-Modified", Http::HdrType::LAST_MODIFIED, Http::HdrFieldType::ftDate_1123},
+    {"Link", Http::HdrType::LINK, Http::HdrFieldType::ftStr},
+    {"Location", Http::HdrType::LOCATION, Http::HdrFieldType::ftStr},
+    {"Max-Forwards", Http::HdrType::MAX_FORWARDS, Http::HdrFieldType::ftInt64},
+    {"Mime-Version", Http::HdrType::MIME_VERSION, Http::HdrFieldType::ftStr},  /* for now */
+    {"Negotiate", Http::HdrType::NEGOTIATE, Http::HdrFieldType::ftStr},
+    {"Origin", Http::HdrType::ORIGIN, Http::HdrFieldType::ftStr},
+    {"Pragma", Http::HdrType::PRAGMA, Http::HdrFieldType::ftStr},
+    {"Proxy-Authenticate", Http::HdrType::PROXY_AUTHENTICATE, Http::HdrFieldType::ftStr},
+    {"Proxy-Authentication-Info", Http::HdrType::PROXY_AUTHENTICATION_INFO, Http::HdrFieldType::ftStr},
+    {"Proxy-Authorization", Http::HdrType::PROXY_AUTHORIZATION, Http::HdrFieldType::ftStr},
+    {"Proxy-Connection", Http::HdrType::PROXY_CONNECTION, Http::HdrFieldType::ftStr},
+    {"Proxy-support", Http::HdrType::PROXY_SUPPORT, Http::HdrFieldType::ftStr},
+    {"Public", Http::HdrType::PUBLIC, Http::HdrFieldType::ftStr},
+    {"Range", Http::HdrType::RANGE, Http::HdrFieldType::ftPRange},
+    {"Referer", Http::HdrType::REFERER, Http::HdrFieldType::ftStr},
+    {"Request-Range", Http::HdrType::REQUEST_RANGE, Http::HdrFieldType::ftPRange}, /* usually matches Http::HdrType::RANGE */
+    {"Retry-AHttp::HdrFieldType::fter", Http::HdrType::RETRY_AFTER, Http::HdrFieldType::ftStr},    /* for now (Http::HdrFieldType::ftDate_1123 or Http::HdrFieldType::ftInt!} */
+    {"Server", Http::HdrType::SERVER, Http::HdrFieldType::ftStr},
+    {"Set-Cookie", Http::HdrType::SET_COOKIE, Http::HdrFieldType::ftStr},
+    {"Set-Cookie2", Http::HdrType::SET_COOKIE2, Http::HdrFieldType::ftStr},
+    {"TE", Http::HdrType::TE, Http::HdrFieldType::ftStr},
+    {"Title", Http::HdrType::TITLE, Http::HdrFieldType::ftStr},
+    {"Trailer", Http::HdrType::TRAILER, Http::HdrFieldType::ftStr},
+    {"Transfer-Encoding", Http::HdrType::TRANSFER_ENCODING, Http::HdrFieldType::ftStr},
+    {"Translate", Http::HdrType::TRANSLATE, Http::HdrFieldType::ftStr},    /* for now. may need to crop */
+    {"Unless-Modified-Since", Http::HdrType::UNLESS_MODIFIED_SINCE, Http::HdrFieldType::ftStr},  /* for now ignore. may need to crop */
+    {"Upgrade", Http::HdrType::UPGRADE, Http::HdrFieldType::ftStr},    /* for now */
+    {"User-Agent", Http::HdrType::USER_AGENT, Http::HdrFieldType::ftStr},
+    {"Vary", Http::HdrType::VARY, Http::HdrFieldType::ftStr},  /* for now */
+    {"Via", Http::HdrType::VIA, Http::HdrFieldType::ftStr},    /* for now */
+    {"Warning", Http::HdrType::WARNING, Http::HdrFieldType::ftStr},    /* for now */
+    {"WWW-Authenticate", Http::HdrType::WWW_AUTHENTICATE, Http::HdrFieldType::ftStr},
+    {"X-Cache", Http::HdrType::X_CACHE, Http::HdrFieldType::ftStr},
+    {"X-Cache-Lookup", Http::HdrType::X_CACHE_LOOKUP, Http::HdrFieldType::ftStr},
+    {"X-Forwarded-For", Http::HdrType::X_FORWARDED_FOR, Http::HdrFieldType::ftStr},
+    {"X-Request-URI", Http::HdrType::X_REQUEST_URI, Http::HdrFieldType::ftStr},
+    {"X-Squid-Error", Http::HdrType::X_SQUID_ERROR, Http::HdrFieldType::ftStr},
 #if X_ACCELERATOR_VARY
-    {"X-Accelerator-Vary", Http::HdrType::HDR_X_ACCELERATOR_VARY, field_type::ftStr},
+    {"X-Accelerator-Vary", Http::HdrType::HDR_X_ACCELERATOR_VARY, Http::HdrFieldType::ftStr},
 #endif
 #if USE_ADAPTATION
-    {"X-Next-Services", Http::HdrType::X_NEXT_SERVICES, field_type::ftStr},
+    {"X-Next-Services", Http::HdrType::X_NEXT_SERVICES, Http::HdrFieldType::ftStr},
 #endif
-    {"Surrogate-Capability", Http::HdrType::SURROGATE_CAPABILITY, field_type::ftStr},
-    {"Surrogate-Control", Http::HdrType::SURROGATE_CONTROL, field_type::ftPSc},
-    {"Front-End-Https", Http::HdrType::FRONT_END_HTTPS, field_type::ftStr},
-    {"FTP-Command", Http::HdrType::FTP_COMMAND, field_type::ftStr},
-    {"FTP-Arguments", Http::HdrType::FTP_ARGUMENTS, field_type::ftStr},
-    {"FTP-Pre", Http::HdrType::FTP_PRE, field_type::ftStr},
-    {"FTP-Status", Http::HdrType::FTP_STATUS, field_type::ftInt},
-    {"FTP-Reason", Http::HdrType::FTP_REASON, field_type::ftStr},
-    {"Other:", Http::HdrType::OTHER, field_type::ftStr},    /* ':' will not allow matches */
-    {nullptr, Http::HdrType::ENUM_END, field_type::ftInvalid},    /* end of table */
-    {nullptr, Http::HdrType::BAD_HDR, field_type::ftInvalid}
+    {"Surrogate-Capability", Http::HdrType::SURROGATE_CAPABILITY, Http::HdrFieldType::ftStr},
+    {"Surrogate-Control", Http::HdrType::SURROGATE_CONTROL, Http::HdrFieldType::ftPSc},
+    {"Front-End-Https", Http::HdrType::FRONT_END_HTTPS, Http::HdrFieldType::ftStr},
+    {"FTP-Command", Http::HdrType::FTP_COMMAND, Http::HdrFieldType::ftStr},
+    {"FTP-Arguments", Http::HdrType::FTP_ARGUMENTS, Http::HdrFieldType::ftStr},
+    {"FTP-Pre", Http::HdrType::FTP_PRE, Http::HdrFieldType::ftStr},
+    {"FTP-Status", Http::HdrType::FTP_STATUS, Http::HdrFieldType::ftInt},
+    {"FTP-Reason", Http::HdrType::FTP_REASON, Http::HdrFieldType::ftStr},
+    {"Other:", Http::HdrType::OTHER, Http::HdrFieldType::ftStr},    /* ':' will not allow matches */
+    {nullptr, Http::HdrType::ENUM_END, Http::HdrFieldType::ftInvalid},    /* end of table */
+    {nullptr, Http::HdrType::BAD_HDR, Http::HdrFieldType::ftInvalid}
 };
 
 const LookupTable<Http::HdrType, HeaderTableRecord> HeaderLookupTable(Http::HdrType::BAD_HDR, headerTable);

diff --git a/src/http/RegisteredHeaders.h b/src/http/RegisteredHeaders.h
index 74e9122e2c45beefcf9937807b926cbc1286771e..db2c022457936ff05f6333833084e995c4f6f072 100644 (file)
--- a/src/http/RegisteredHeaders.h
+++ b/src/http/RegisteredHeaders.h
@@ -124,11 +124,9 @@ enum HdrType {
     BAD_HDR                         /**< Invalid header. Must be after ENUM_END */
 };
 
-}; /* namespace Http */
-
 /** possible types for http header fields */
-enum class field_type {
-    ftInvalid,// = ENUM_END,   /**< to catch nasty errors with hdr_id<->fld_type clashes */
+enum class HdrFieldType {
+    ftInvalid,  /**< to catch nasty errors with hdr_id<->fld_type clashes */
     ftInt,
     ftInt64,
     ftStr,
@@ -141,12 +139,14 @@ enum class field_type {
     ftDate_1123_or_ETag
 };
 
+}; /* namespace Http */
+
 /* POD for headerTable */
 class HeaderTableRecord {
 public:
     const char *name;
     Http::HdrType id;
-    field_type type;
+    Http::HdrFieldType type;
 };
 
 /// header ID->namelookup table.