summaryrefslogtreecommitdiffstats
path: root/modules/http
diff options
context:
space:
mode:
authorRyan Bloom <rbb@apache.org>2002-04-05 23:24:13 +0200
committerRyan Bloom <rbb@apache.org>2002-04-05 23:24:13 +0200
commitc3d4e4787ad771786f128c1cc54900c884469a86 (patch)
treef7babad7447ff6dfd9e53ebab72547394e6f1c6f /modules/http
parentIf we are doing a fast_redirect, and we don't have a main request, then (diff)
downloadapache2-c3d4e4787ad771786f128c1cc54900c884469a86.tar.xz
apache2-c3d4e4787ad771786f128c1cc54900c884469a86.zip
Fix a segfault. Only try to set this if the sub_Request has a c-t.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94471 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http')
-rw-r--r--modules/http/http_request.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index 88e1434511..ae52cd95d7 100644
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -422,7 +422,9 @@ 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(r, rr->content_type);
+ if (rr->content_type) {
+ ap_set_content_type(r, rr->content_type);
+ }
r->content_encoding = rr->content_encoding;
r->content_languages = rr->content_languages;
r->per_dir_config = rr->per_dir_config;