From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 22 Jun 2015 13:02:49 +0000 (+0000)
Subject: mod_alias: follow up to r1686853.
X-Git-Tag: 2.5.0-alpha~3053
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1291e3c8bdb6f03f07b3677d3b29033649b0c665;p=apache

mod_alias: follow up to r1686853.
Factorize code (no functional change).

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

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index 2c679bbca5..22a90aa80c 100644
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -282,15 +282,16 @@ static const char *add_redirect_internal(cmd_parms *cmd,
         /* <Location> context only for now */
         ;
     }
-    else if (grokarg1 > 0 && arg2 && !arg3) {
+    else if ((grokarg1 > 0 && arg2 && !arg3) || (!grokarg1 && !arg2)) {
         const char *expr_err = NULL;
 
+        url = grokarg1 ? arg2 : arg1;
         dirconf->redirect =
-                ap_expr_parse_cmd(cmd, arg2, AP_EXPR_FLAG_STRING_RESULT,
+                ap_expr_parse_cmd(cmd, url, AP_EXPR_FLAG_STRING_RESULT,
                         &expr_err, NULL);
         if (expr_err) {
             return apr_pstrcat(cmd->temp_pool,
-                    "Cannot parse redirect expression '", arg2, "': ", expr_err,
+                    "Cannot parse redirect expression '", url, "': ", expr_err,
                     NULL);
         }
 
@@ -307,24 +308,6 @@ static const char *add_redirect_internal(cmd_parms *cmd,
 
         return NULL;
 
-    }
-    else if (!grokarg1 && !arg2) {
-        const char *expr_err = NULL;
-
-        dirconf->redirect =
-                ap_expr_parse_cmd(cmd, arg1, AP_EXPR_FLAG_STRING_RESULT,
-                        &expr_err, NULL);
-        if (expr_err) {
-            return apr_pstrcat(cmd->temp_pool,
-                    "Cannot parse redirect expression '", arg1, "': ", expr_err,
-                    NULL);
-        }
-
-        dirconf->redirect_status = status;
-        dirconf->redirect_set = 1;
-
-        return NULL;
-
     }
 
     /*