Commit 65fe9ad8 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Don't modify req after we freed it.

Fixes	#1147 and #1148
parent dc5b18b8
...@@ -120,6 +120,8 @@ cnt_wait(struct sess *sp, struct worker *wrk, struct req *req) ...@@ -120,6 +120,8 @@ cnt_wait(struct sess *sp, struct worker *wrk, struct req *req)
HTC_Init(req->htc, req->ws, sp->fd, sp->req->vsl, HTC_Init(req->htc, req->ws, sp->fd, sp->req->vsl,
cache_param->http_req_size, cache_param->http_req_size,
cache_param->http_req_hdr_len); cache_param->http_req_hdr_len);
} else {
assert(req->sp == sp);
} }
AZ(req->vcl); AZ(req->vcl);
...@@ -943,6 +945,7 @@ cnt_first(struct sess *sp, struct worker *wrk) ...@@ -943,6 +945,7 @@ cnt_first(struct sess *sp, struct worker *wrk)
CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC); CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
/* Allocate a request already now, so we can VSL to it */ /* Allocate a request already now, so we can VSL to it */
AZ(sp->req);
SES_GetReq(sp); SES_GetReq(sp);
req = sp->req; req = sp->req;
CHECK_OBJ_NOTNULL(req, REQ_MAGIC); CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
...@@ -1493,6 +1496,7 @@ cnt_start(struct sess *sp, struct worker *wrk, struct req *req) ...@@ -1493,6 +1496,7 @@ cnt_start(struct sess *sp, struct worker *wrk, struct req *req)
AZ(req->vcl); AZ(req->vcl);
AZ(req->esi_level); AZ(req->esi_level);
assert(!isnan(sp->t_req)); assert(!isnan(sp->t_req));
assert(req->sp == sp);
/* Update stats of various sorts */ /* Update stats of various sorts */
wrk->stats.client_req++; wrk->stats.client_req++;
......
...@@ -356,8 +356,8 @@ SES_ReleaseReq(struct sess *sp) ...@@ -356,8 +356,8 @@ SES_ReleaseReq(struct sess *sp)
assert(sp->req->sp == sp); assert(sp->req->sp == sp);
MPL_AssertSane(sp->req); MPL_AssertSane(sp->req);
VSL_Flush(sp->req->vsl, 0); VSL_Flush(sp->req->vsl, 0);
MPL_Free(pp->mpl_req, sp->req);
sp->req->sp = NULL; sp->req->sp = NULL;
MPL_Free(pp->mpl_req, sp->req);
sp->req = NULL; sp->req = NULL;
} }
......
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