--- a/src/server/safs/cgiutils.c Sun Oct 30 10:22:00 2016 +0100 +++ b/src/server/safs/cgiutils.c Sun Oct 30 11:44:04 2016 +0100 @@ -273,7 +273,7 @@ env[x++] = util_env_str("SCRIPT_NAME", t); } - if (t = pblock_findval("path", rq->vars)) + if ((t = pblock_findval("path", rq->vars))) env[x++] = util_env_str("SCRIPT_FILENAME", t); } @@ -341,10 +341,10 @@ // Handle Apache ErrorDocument-style variables from the send-error SAF if (rq->orig_rq != rq) { - if (t = pblock_findval("uri", rq->orig_rq->reqpb)) { + if ((t = pblock_findval("uri", rq->orig_rq->reqpb))) { env[x++] = util_env_str("REDIRECT_URL", t); } - if (t = pblock_findval("status", rq->orig_rq->srvhdrs)) { + if ((t = pblock_findval("status", rq->orig_rq->srvhdrs))) { env[x++] = util_env_str("REDIRECT_STATUS", t); } }