{"Age", HDR_AGE, ftInt},
{"Allow", HDR_ALLOW, ftStr},
{"Alternate-Protocol", HDR_ALTERNATE_PROTOCOL, ftStr},
- {"Authorization", HDR_AUTHORIZATION, ftStr}, /* for now */
+ {"Authorization", HDR_AUTHORIZATION, ftStr}, /* for now */
{"Cache-Control", HDR_CACHE_CONTROL, ftPCc},
{"Connection", HDR_CONNECTION, ftStr},
{"Content-Base", HDR_CONTENT_BASE, ftStr},
{"Content-Language", HDR_CONTENT_LANGUAGE, ftStr},
{"Content-Length", HDR_CONTENT_LENGTH, ftInt64},
{"Content-Location", HDR_CONTENT_LOCATION, ftStr},
- {"Content-MD5", HDR_CONTENT_MD5, ftStr}, /* for now */
+ {"Content-MD5", HDR_CONTENT_MD5, ftStr}, /* for now */
{"Content-Range", HDR_CONTENT_RANGE, ftPContRange},
{"Content-Type", HDR_CONTENT_TYPE, ftStr},
{"Cookie", HDR_COOKIE, ftStr},
{"From", HDR_FROM, ftStr},
{"Host", HDR_HOST, ftStr},
{"HTTP2-Settings", HDR_HTTP2_SETTINGS, ftStr}, /* for now */
- {"If-Match", HDR_IF_MATCH, ftStr}, /* for now */
+ {"If-Match", HDR_IF_MATCH, ftStr}, /* for now */
{"If-Modified-Since", HDR_IF_MODIFIED_SINCE, ftDate_1123},
- {"If-None-Match", HDR_IF_NONE_MATCH, ftStr}, /* for now */
+ {"If-None-Match", HDR_IF_NONE_MATCH, ftStr}, /* for now */
{"If-Range", HDR_IF_RANGE, ftDate_1123_or_ETag},
{"If-Unmodified-Since", HDR_IF_UNMODIFIED_SINCE, ftDate_1123},
{"Keep-Alive", HDR_KEEP_ALIVE, ftStr},
{"Link", HDR_LINK, ftStr},
{"Location", HDR_LOCATION, ftStr},
{"Max-Forwards", HDR_MAX_FORWARDS, ftInt64},
- {"Mime-Version", HDR_MIME_VERSION, ftStr}, /* for now */
+ {"Mime-Version", HDR_MIME_VERSION, ftStr}, /* for now */
{"Negotiate", HDR_NEGOTIATE, ftStr},
{"Origin", HDR_ORIGIN, ftStr},
{"Pragma", HDR_PRAGMA, ftStr},
{"Public", HDR_PUBLIC, ftStr},
{"Range", HDR_RANGE, ftPRange},
{"Referer", HDR_REFERER, ftStr},
- {"Request-Range", HDR_REQUEST_RANGE, ftPRange}, /* usually matches HDR_RANGE */
- {"Retry-After", HDR_RETRY_AFTER, ftStr}, /* for now (ftDate_1123 or ftInt!) */
+ {"Request-Range", HDR_REQUEST_RANGE, ftPRange}, /* usually matches HDR_RANGE */
+ {"Retry-After", HDR_RETRY_AFTER, ftStr}, /* for now (ftDate_1123 or ftInt!) */
{"Server", HDR_SERVER, ftStr},
{"Set-Cookie", HDR_SET_COOKIE, ftStr},
{"Set-Cookie2", HDR_SET_COOKIE2, ftStr},
{"Title", HDR_TITLE, ftStr},
{"Trailer", HDR_TRAILER, ftStr},
{"Transfer-Encoding", HDR_TRANSFER_ENCODING, ftStr},
- {"Translate", HDR_TRANSLATE, ftStr}, /* for now. may need to crop */
+ {"Translate", HDR_TRANSLATE, ftStr}, /* for now. may need to crop */
{"Unless-Modified-Since", HDR_UNLESS_MODIFIED_SINCE, ftStr}, /* for now ignore. may need to crop */
- {"Upgrade", HDR_UPGRADE, ftStr}, /* for now */
+ {"Upgrade", HDR_UPGRADE, ftStr}, /* for now */
{"User-Agent", HDR_USER_AGENT, ftStr},
- {"Vary", HDR_VARY, ftStr}, /* for now */
- {"Via", HDR_VIA, ftStr}, /* for now */
- {"Warning", HDR_WARNING, ftStr}, /* for now */
+ {"Vary", HDR_VARY, ftStr}, /* for now */
+ {"Via", HDR_VIA, ftStr}, /* for now */
+ {"Warning", HDR_WARNING, ftStr}, /* for now */
{"WWW-Authenticate", HDR_WWW_AUTHENTICATE, ftStr},
{"Authentication-Info", HDR_AUTHENTICATION_INFO, ftStr},
{"X-Cache", HDR_X_CACHE, ftStr},
{"FTP-Pre", HDR_FTP_PRE, ftStr},
{"FTP-Status", HDR_FTP_STATUS, ftInt},
{"FTP-Reason", HDR_FTP_REASON, ftStr},
- {"Other:", HDR_OTHER, ftStr} /* ':' will not allow matches */
+ {"Other:", HDR_OTHER, ftStr} /* ':' will not allow matches */
};
static HttpHeaderFieldInfo *Headers = NULL;
* headers with field values defined as #(values) in HTTP/1.1
* Headers that are currently not recognized, are commented out.
*/
-static HttpHeaderMask ListHeadersMask; /* set run-time using ListHeadersArr */
+static HttpHeaderMask ListHeadersMask; /* set run-time using ListHeadersArr */
static http_hdr_type ListHeadersArr[] = {
HDR_ACCEPT,
HDR_ACCEPT_CHARSET,
};
/* request-only headers */
-static HttpHeaderMask RequestHeadersMask; /* set run-time using RequestHeaders */
+static HttpHeaderMask RequestHeadersMask; /* set run-time using RequestHeaders */
static http_hdr_type RequestHeadersArr[] = {
HDR_ACCEPT,
HDR_ACCEPT_CHARSET,
};
/* reply-only headers */
-static HttpHeaderMask ReplyHeadersMask; /* set run-time using ReplyHeaders */
+static HttpHeaderMask ReplyHeadersMask; /* set run-time using ReplyHeaders */
static http_hdr_type ReplyHeadersArr[] = {
HDR_ACCEPT_ENCODING,
HDR_ACCEPT_RANGES,
assert(label);
memset(hs, 0, sizeof(HttpHeaderStat));
hs->label = label;
- hs->hdrUCountDistr.enumInit(32); /* not a real enum */
+ hs->hdrUCountDistr.enumInit(32); /* not a real enum */
hs->fieldTypeDistr.enumInit(HDR_ENUM_END);
hs->ccTypeDistr.enumInit(CC_ENUM_END);
hs->scTypeDistr.enumInit(SC_ENUM_END);
field_end = field_ptr;
- ++field_ptr; /* Move to next line */
+ ++field_ptr; /* Move to next line */
if (field_end > this_line && field_end[-1] == '\r') {
- --field_end; /* Ignore CR LF */
+ --field_end; /* Ignore CR LF */
if (owner == hoRequest && field_end > this_line) {
bool cr_only = true;
getStringPrefix(field_start, field_end-field_start) << "}");
if (Config.onoff.relaxed_header_parser) {
- char *p = (char *) this_line; /* XXX Warning! This destroys original header content and violates specifications somewhat */
+ char *p = (char *) this_line; /* XXX Warning! This destroys original header content and violates specifications somewhat */
while ((p = (char *)memchr(p, '\r', field_end - p)) != NULL) {
*p = ' ';
return reset();
}
- break; /* terminating blank line */
+ break; /* terminating blank line */
}
if ((e = HttpHeaderEntry::parse(field_start, field_end)) == NULL) {
}
PROF_stop(HttpHeaderParse);
- return 1; /* even if no fields where found, it is a valid header */
+ return 1; /* even if no fields where found, it is a valid header */
}
/* packs all the entries using supplied packer */
/* hm.. we thought it was there, but it was not found */
assert(0);
- return NULL; /* not reached */
+ return NULL; /* not reached */
}
/*
result = e;
}
- assert(result); /* must be there! */
+ assert(result); /* must be there! */
return result;
}
int count = 0;
HttpHeaderPos pos = HttpHeaderInitPos;
HttpHeaderEntry *e;
- httpHeaderMaskInit(&mask, 0); /* temporal inconsistency */
+ httpHeaderMaskInit(&mask, 0); /* temporal inconsistency */
debugs(55, 9, "deleting '" << name << "' fields in hdr " << this);
while ((e = getEntry(&pos))) {
HttpHeaderEntry *e;
debugs(55, 8, this << " del-by-id " << id);
assert_eid(id);
- assert(id != HDR_OTHER); /* does not make sense */
+ assert(id != HDR_OTHER); /* does not make sense */
if (!CBIT_TEST(mask, id))
return 0;
HttpHeader::putInt(http_hdr_type id, int number)
{
assert_eid(id);
- assert(Headers[id].type == ftInt); /* must be of an appropriate type */
+ assert(Headers[id].type == ftInt); /* must be of an appropriate type */
assert(number >= 0);
addEntry(new HttpHeaderEntry(id, NULL, xitoa(number)));
}
HttpHeader::putInt64(http_hdr_type id, int64_t number)
{
assert_eid(id);
- assert(Headers[id].type == ftInt64); /* must be of an appropriate type */
+ assert(Headers[id].type == ftInt64); /* must be of an appropriate type */
assert(number >= 0);
addEntry(new HttpHeaderEntry(id, NULL, xint64toa(number)));
}
HttpHeader::putTime(http_hdr_type id, time_t htime)
{
assert_eid(id);
- assert(Headers[id].type == ftDate_1123); /* must be of an appropriate type */
+ assert(Headers[id].type == ftDate_1123); /* must be of an appropriate type */
assert(htime >= 0);
addEntry(new HttpHeaderEntry(id, NULL, mkrfc1123(htime)));
}
HttpHeader::insertTime(http_hdr_type id, time_t htime)
{
assert_eid(id);
- assert(Headers[id].type == ftDate_1123); /* must be of an appropriate type */
+ assert(Headers[id].type == ftDate_1123); /* must be of an appropriate type */
assert(htime >= 0);
insertEntry(new HttpHeaderEntry(id, NULL, mkrfc1123(htime)));
}
HttpHeader::putStr(http_hdr_type id, const char *str)
{
assert_eid(id);
- assert(Headers[id].type == ftStr); /* must be of an appropriate type */
+ assert(Headers[id].type == ftStr); /* must be of an appropriate type */
assert(str);
addEntry(new HttpHeaderEntry(id, NULL, str));
}
HttpHeader::getInt(http_hdr_type id) const
{
assert_eid(id);
- assert(Headers[id].type == ftInt); /* must be of an appropriate type */
+ assert(Headers[id].type == ftInt); /* must be of an appropriate type */
HttpHeaderEntry *e;
if ((e = findEntry(id)))
HttpHeader::getInt64(http_hdr_type id) const
{
assert_eid(id);
- assert(Headers[id].type == ftInt64); /* must be of an appropriate type */
+ assert(Headers[id].type == ftInt64); /* must be of an appropriate type */
HttpHeaderEntry *e;
if ((e = findEntry(id)))
HttpHeaderEntry *e;
time_t value = -1;
assert_eid(id);
- assert(Headers[id].type == ftDate_1123); /* must be of an appropriate type */
+ assert(Headers[id].type == ftDate_1123); /* must be of an appropriate type */
if ((e = findEntry(id))) {
value = parse_rfc1123(e->value.termedBuf());
{
HttpHeaderEntry *e;
assert_eid(id);
- assert(Headers[id].type == ftStr); /* must be of an appropriate type */
+ assert(Headers[id].type == ftStr); /* must be of an appropriate type */
if ((e = findEntry(id))) {
- httpHeaderNoteParsedEntry(e->id, e->value, 0); /* no errors are possible */
+ httpHeaderNoteParsedEntry(e->id, e->value, 0); /* no errors are possible */
return e->value.termedBuf();
}
{
HttpHeaderEntry *e;
assert_eid(id);
- assert(Headers[id].type == ftStr); /* must be of an appropriate type */
+ assert(Headers[id].type == ftStr); /* must be of an appropriate type */
if ((e = findLastEntry(id))) {
- httpHeaderNoteParsedEntry(e->id, e->value, 0); /* no errors are possible */
+ httpHeaderNoteParsedEntry(e->id, e->value, 0); /* no errors are possible */
return e->value.termedBuf();
}
assert(auth_scheme);
field = getStr(id);
- if (!field) /* no authorization field */
+ if (!field) /* no authorization field */
return NULL;
l = strlen(auth_scheme);
- if (!l || strncasecmp(field, auth_scheme, l)) /* wrong scheme */
+ if (!l || strncasecmp(field, auth_scheme, l)) /* wrong scheme */
return NULL;
field += l;
- if (!xisspace(*field)) /* wrong scheme */
+ if (!xisspace(*field)) /* wrong scheme */
return NULL;
/* skip white space */
for (; field && xisspace(*field); ++field);
- if (!*field) /* no authorization cookie */
+ if (!*field) /* no authorization cookie */
return NULL;
static char decodedAuthToken[8192];
{
ETag etag = {NULL, -1};
HttpHeaderEntry *e;
- assert(Headers[id].type == ftETag); /* must be of an appropriate type */
+ assert(Headers[id].type == ftETag); /* must be of an appropriate type */
if ((e = findEntry(id)))
etagParseInit(&etag, e->value.termedBuf());
{
TimeOrTag tot;
HttpHeaderEntry *e;
- assert(Headers[id].type == ftDate_1123_or_ETag); /* must be of an appropriate type */
+ assert(Headers[id].type == ftDate_1123_or_ETag); /* must be of an appropriate type */
memset(&tot, 0, sizeof(tot));
if ((e = findEntry(id))) {
}
}
- assert(tot.time < 0 || !tot.tag.str); /* paranoid */
+ assert(tot.time < 0 || !tot.tag.str); /* paranoid */
return tot;
}
/* note: name_start == field_start */
const char *name_end = (const char *)memchr(field_start, ':', field_end - field_start);
int name_len = name_end ? name_end - field_start :0;
- const char *value_start = field_start + name_len + 1; /* skip ':' */
+ const char *value_start = field_start + name_len + 1; /* skip ':' */
/* note: value_end == field_end */
++ HeaderEntryParsedCount;
*/
/* tmp variable used to pass stat info to dumpers */
-extern const HttpHeaderStat *dump_stat; /* argh! */
+extern const HttpHeaderStat *dump_stat; /* argh! */
const HttpHeaderStat *dump_stat = NULL;
void
refreshMask();
}
}
+
projects / thirdparty / squid.git / blobdiff