[master] 42fb7e9 Move req's vfp_ctx into struct req
Poul-Henning Kamp
phk at FreeBSD.org
Fri Jan 27 13:45:06 CET 2017
commit 42fb7e9646f486b74b1f2ca1c9195bfb712b6535
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Fri Jan 27 12:26:00 2017 +0000
Move req's vfp_ctx into struct req
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index a1564e5..add792c 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -227,7 +227,6 @@ struct http_conn {
char *pipeline_b;
char *pipeline_e;
ssize_t content_length;
- struct vfp_ctx vfc[1];
void *priv;
/* Timeouts */
@@ -567,6 +566,7 @@ struct req {
double t_req; /* Headers complete */
struct http_conn htc[1];
+ struct vfp_ctx vfc[1];
const char *client_identity;
/* HTTP request */
diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c
index 865b667..275260f 100644
--- a/bin/varnishd/cache/cache_req_body.c
+++ b/bin/varnishd/cache/cache_req_body.c
@@ -57,8 +57,8 @@ vrb_pull(struct req *req, ssize_t maxsize, objiterate_f *func, void *priv)
CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
CHECK_OBJ_NOTNULL(req->htc, HTTP_CONN_MAGIC);
- CHECK_OBJ_NOTNULL(req->htc->vfc, VFP_CTX_MAGIC);
- vfc = req->htc->vfc;
+ CHECK_OBJ_NOTNULL(req->vfc, VFP_CTX_MAGIC);
+ vfc = req->vfc;
req->body_oc = HSH_Private(req->wrk);
AN(req->body_oc);
@@ -291,8 +291,7 @@ VRB_Cache(struct req *req, ssize_t maxsize)
if (req->htc->content_length > maxsize) {
req->req_body_status = REQ_BODY_FAIL;
- (void)VFP_Error(req->htc->vfc,
- "Request body too big to cache");
+ (void)VFP_Error(req->vfc, "Request body too big to cache");
return (-1);
}
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index e6a18b6..e70fec3 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -678,9 +678,9 @@ cnt_recv(struct worker *wrk, struct req *req)
http_CollectHdr(req->http, H_Cache_Control);
- VFP_Setup(req->htc->vfc);
- req->htc->vfc->http = req->http;
- req->htc->vfc->wrk = wrk;
+ VFP_Setup(req->vfc);
+ req->vfc->http = req->http;
+ req->vfc->wrk = wrk;
if (req->transport->req_body != NULL) {
req->transport->req_body(req);
diff --git a/bin/varnishd/http1/cache_http1_fsm.c b/bin/varnishd/http1/cache_http1_fsm.c
index dc325e0..ed1d3fd 100644
--- a/bin/varnishd/http1/cache_http1_fsm.c
+++ b/bin/varnishd/http1/cache_http1_fsm.c
@@ -146,7 +146,7 @@ http1_req_body(struct req *req)
case BS_EOF:
case BS_LENGTH:
case BS_CHUNKED:
- if (V1F_Setup_Fetch(req->htc->vfc, req->htc) != 0)
+ if (V1F_Setup_Fetch(req->vfc, req->htc) != 0)
req->req_body_status = REQ_BODY_FAIL;
break;
default:
More information about the varnish-commit
mailing list