Skip to content

V
varnish-cache
Commit 156c72e8 authored by Federico G. Schwindt's avatar Federico G. Schwindt
Browse files
Options

Further cleanup

parent 865cb36d
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 13 deletions
bin/varnishncsa/varnishncsa.c
View file @ 156c72e8
...@@ -1018,8 +1018,6 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[], ...@@ -1018,8 +1018,6 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[],
frag_line(0, p, e, frag_line(0, p, e,
&CTX.frag[F_host]); &CTX.frag[F_host]);
break; break;
case (SLT_VCL_call + BACKEND_MARKER):
break;
case SLT_VCL_call: case SLT_VCL_call:
if (!strcasecmp(b, "recv")) { if (!strcasecmp(b, "recv")) {
CTX.hitmiss = "-"; CTX.hitmiss = "-";
...@@ -1041,8 +1039,6 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[], ...@@ -1041,8 +1039,6 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[],
CTX.handling = "synth"; CTX.handling = "synth";
} }
break; break;
case (SLT_VCL_return + BACKEND_MARKER):
break;
case SLT_VCL_return: case SLT_VCL_return:
if (!strcasecmp(b, "pipe")) { if (!strcasecmp(b, "pipe")) {
CTX.hitmiss = "miss"; CTX.hitmiss = "miss";
...@@ -1050,14 +1046,12 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[], ...@@ -1050,14 +1046,12 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[],
} else if (!strcasecmp(b, "restart")) } else if (!strcasecmp(b, "restart"))
skip = 1; skip = 1;
break; break;
default: case (SLT_VCL_Log + BACKEND_MARKER):
break; case SLT_VCL_Log:
}
if (tag == SLT_VCL_Log) {
VTAILQ_FOREACH(w, &CTX.watch_vcl_log, list) { VTAILQ_FOREACH(w, &CTX.watch_vcl_log, list) {
CHECK_OBJ_NOTNULL(w, WATCH_MAGIC); CHECK_OBJ_NOTNULL(w, WATCH_MAGIC);
if (strncmp(b, w->key, w->keylen)) if (e - b <= w->keylen ||
strncmp(b, w->key, w->keylen))
continue; continue;
p = b + w->keylen; p = b + w->keylen;
if (*p != ':') if (*p != ':')
...@@ -1067,10 +1061,15 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[], ...@@ -1067,10 +1061,15 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[],
continue; continue;
frag_line(0, p, e, &w->frag); frag_line(0, p, e, &w->frag);
} }
} else if ((tag == SLT_ReqHeader && CTX.c_opt) || break;
(tag == SLT_BereqHeader && CTX.b_opt)) { default:
break;
}
if ((tag == SLT_ReqHeader && CTX.c_opt) ||
(tag == SLT_BereqHeader && CTX.b_opt))
process_hdr(&CTX.watch_reqhdr, b, e); process_hdr(&CTX.watch_reqhdr, b, e);
} else if ((tag == SLT_RespHeader && CTX.c_opt) || else if ((tag == SLT_RespHeader && CTX.c_opt) ||
(tag == SLT_BerespHeader && CTX.b_opt)) (tag == SLT_BerespHeader && CTX.b_opt))
process_hdr(&CTX.watch_resphdr, b, e); process_hdr(&CTX.watch_resphdr, b, e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment