You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2025/12/01 12:05:20 UTC
svn commit: r1930165 - in httpd/httpd/branches/2.4.x: . modules/generators
Author: covener
Date: Mon Dec 1 12:05:19 2025
New Revision: 1930165
Log:
Merge r1930161 from trunk:
don't pass args for SSI request
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c
Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c Mon Dec 1 12:04:29 2025 (r1930164)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_cgid.c Mon Dec 1 12:05:19 2025 (r1930165)
@@ -239,7 +239,7 @@ static char **create_argv(apr_pool_t *p,
char *w;
int idx = 0;
- if (!(*args) || ap_strchr_c(args, '=')) {
+ if (!args || !(*args) || ap_strchr_c(args, '=')) {
numwords = 0;
}
else {
@@ -932,7 +932,10 @@ static int cgid_server(void *data)
apr_pool_userdata_set(r, ERRFN_USERDATA_KEY, apr_pool_cleanup_null, ptrans);
}
- argv = (const char * const *)create_argv(r->pool, NULL, NULL, NULL, argv0, r->args);
+ /* Do not pass args in case of SSI requests */
+ argv = (const char * const *)create_argv(r->pool, NULL, NULL, NULL,
+ argv0,
+ cgid_req.req_type == SSI_REQ ? NULL : r->args);
/* We want to close sd2 for the new CGI process too.
* If it is left open it'll make ap_pass_brigade() block