30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From a7d24b4ea9a6ea35878fd33075365328caafcf91 Mon Sep 17 00:00:00 2001
|
|
From: Eric Covener <covener@apache.org>
|
|
Date: Mon, 15 Jul 2024 12:08:30 +0000
|
|
Subject: [PATCH] Merge r1919247 from trunk:
|
|
|
|
copy the trusted flag from the subrequest
|
|
|
|
Submitted By: covener
|
|
Reviewed By: covener, ylavic, gbechis
|
|
|
|
|
|
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1919249 13f79535-47bb-0310-9956-ffa450edef68
|
|
---
|
|
modules/http/http_request.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
|
|
index 71ecc2bbab1..7e9477be1f1 100644
|
|
--- a/modules/http/http_request.c
|
|
+++ b/modules/http/http_request.c
|
|
@@ -708,7 +708,7 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)
|
|
r->args = rr->args;
|
|
r->finfo = rr->finfo;
|
|
r->handler = rr->handler;
|
|
- ap_set_content_type_ex(r, rr->content_type, AP_REQUEST_IS_TRUSTED_CT(r));
|
|
+ ap_set_content_type_ex(r, rr->content_type, AP_REQUEST_IS_TRUSTED_CT(rr));
|
|
r->content_encoding = rr->content_encoding;
|
|
r->content_languages = rr->content_languages;
|
|
r->per_dir_config = rr->per_dir_config;
|