summaryrefslogtreecommitdiffstats
path: root/modules/generators/mod_cgid.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-12 08:32:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-12 08:32:24 +0000
commit8391c6f3fe27e58aee67a1863284ab160ab430e9 (patch)
treed18e002a9dc765264e15ab64cc7c7a665bb45f76 /modules/generators/mod_cgid.c
parentReleasing progress-linux version 2.4.58-1~progress7.99u1. (diff)
downloadapache2-8391c6f3fe27e58aee67a1863284ab160ab430e9.tar.xz
apache2-8391c6f3fe27e58aee67a1863284ab160ab430e9.zip
Merging upstream version 2.4.59.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'modules/generators/mod_cgid.c')
-rw-r--r--modules/generators/mod_cgid.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 2258a68..4bab59f 100644
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1616,9 +1616,18 @@ static int cgid_handler(request_rec *r)
b = apr_bucket_eos_create(c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(bb, b);
- if ((ret = ap_scan_script_header_err_brigade_ex(r, bb, sbuf,
- APLOG_MODULE_INDEX)))
- {
+ ret = ap_scan_script_header_err_brigade_ex(r, bb, sbuf,
+ APLOG_MODULE_INDEX);
+
+ /* xCGI has its own body framing mechanism which we don't
+ * match against any provided Content-Length, so let the
+ * core determine C-L vs T-E based on what's actually sent.
+ */
+ if (!apr_table_get(r->subprocess_env, AP_TRUST_CGILIKE_CL_ENVVAR))
+ apr_table_unset(r->headers_out, "Content-Length");
+ apr_table_unset(r->headers_out, "Transfer-Encoding");
+
+ if (ret != OK) {
ret = log_script(r, conf, ret, dbuf, sbuf, bb, NULL);
/*