From: Eric Covener <covener@apache.org>
Date: Tue, 18 Jun 2019 11:04:50 +0000 (+0000)
Subject: followup to r1861542: return early from error path
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2026
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c1c4ff4ec9e5bf0cb72823816a74d9a2a00bab2;p=thirdparty%2Fapache%2Fhttpd.git

followup to r1861542: return early from error path

avoid setting a location: header of a non-URL 500 error path



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1861569 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index 3297a975f62..569d331e7f4 100644
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -612,11 +612,11 @@ static int translate_alias_redir(request_rec *r)
                                   orig_target, r->uri, ret);
                 }
                 if (!ap_is_url(ret)) {
-                    status = HTTP_INTERNAL_SERVER_ERROR;
                     ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00674)
                                   "cannot redirect '%s' to '%s'; "
                                   "target is not a valid absoluteURI or abs_path",
                                   r->uri, ret);
+                    return HTTP_INTERNAL_SERVER_ERROR;
                 }
             }
             /* append requested query only, if the config didn't
@@ -667,11 +667,11 @@ static int fixup_redir(request_rec *r)
                                   orig_target, r->uri, ret);
                 }
                 if (!ap_is_url(ret)) {
-                    status = HTTP_INTERNAL_SERVER_ERROR;
                     ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(00676)
                                   "cannot redirect '%s' to '%s'; "
                                   "target is not a valid absoluteURI or abs_path",
                                   r->uri, ret);
+                    return HTTP_INTERNAL_SERVER_ERROR;
                 }
             }
             /* append requested query only, if the config didn't