Module Name: src
Committed By: martin
Date: Fri Mar 29 14:46:44 UTC 2019
Modified Files:
src/libexec/httpd: cgi-bozo.c
Log Message:
Account for cgihandler being set when counting the number of CGI environment
headers we are about to set. Avoids an assertion failure (and overruninng
the array) later.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/libexec/httpd/cgi-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/cgi-bozo.c
diff -u src/libexec/httpd/cgi-bozo.c:1.47 src/libexec/httpd/cgi-bozo.c:1.48
--- src/libexec/httpd/cgi-bozo.c:1.47 Thu Jan 17 07:46:16 2019
+++ src/libexec/httpd/cgi-bozo.c Fri Mar 29 14:46:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cgi-bozo.c,v 1.47 2019/01/17 07:46:16 mrg Exp $ */
+/* $NetBSD: cgi-bozo.c,v 1.48 2019/03/29 14:46:44 martin Exp $ */
/* $eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $ */
@@ -493,6 +493,7 @@ bozo_process_cgi(bozo_httpreq_t *request
(clen && *clen ? 1 : 0) +
(request->hr_remotehost && *request->hr_remotehost ? 1 : 0) +
(request->hr_remoteaddr && *request->hr_remoteaddr ? 1 : 0) +
+ (cgihandler ? 1 : 0) +
bozo_auth_cgi_count(request) +
(request->hr_serverport && *request->hr_serverport ? 1 : 0);
