[4.1] 9690462 req->task members must be set in case we get onto the waitinglist

[Lasse Karstensen]

commit 96904623e6f91052a8676df148eedde719f8aaf4
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Apr 28 12:51:50 2016 +0200

    req->task members must be set in case we get onto the waitinglist
    
    Fixes #1928
    
    Conflicts:
    	bin/varnishd/http1/cache_http1_fsm.c

diff --git a/bin/varnishd/http1/cache_http1_fsm.c b/bin/varnishd/http1/cache_http1_fsm.c
index 210be90..ad9b069 100644
--- a/bin/varnishd/http1/cache_http1_fsm.c
+++ b/bin/varnishd/http1/cache_http1_fsm.c
@@ -264,11 +264,15 @@ HTTP1_Session(struct worker *wrk, struct req *req)
 			break;
 		case S_STP_H1PROC:
 			req->transport = &http1_transport;
+			req->task.func = SES_Proto_Req;
+			req->task.priv = req;
 			if (CNT_Request(wrk, req) == REQ_FSM_DISEMBARK) {
 				sp->sess_step = S_STP_H1BUSY;
 				return;
 			}
 			req->transport = NULL;
+			req->task.func = NULL;
+			req->task.priv = NULL;
 			sp->sess_step = S_STP_H1CLEANUP;
 			break;
 		case S_STP_H1CLEANUP: