diff options
| author | Takashi Sato <takashi@apache.org> | 2009-05-19 14:24:31 +0000 |
|---|---|---|
| committer | Takashi Sato <takashi@apache.org> | 2009-05-19 14:24:31 +0000 |
| commit | 769b8833b88415992138ded7858a98ac3214c4f2 (patch) | |
| tree | 4d609b7ed77ca384c3046c02ffc7be72d14b07f1 /modules | |
| parent | a64da7de52febf691c59ac76431bebe5c974c8d3 (diff) | |
| download | httpd-769b8833b88415992138ded7858a98ac3214c4f2.tar.gz | |
Fix the error string returned by RewriteRule. RewriteRule returned "RewriteCond: bad flag delimiters" when the 3rd argument of RewriteRule was not started with "[" or not ended with "]".
PR: 45082
Submitted by: Vitaly Polonetsky <m_vitaly topixoft.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@776325 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mappers/mod_rewrite.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index d276352025..372ce8e914 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -3226,7 +3226,7 @@ static const char *cmd_parseflagfield(apr_pool_t *p, void *cfg, char *key, endp = key + strlen(key) - 1; if (*key != '[' || *endp != ']') { - return "RewriteCond: bad flag delimiters"; + return "bad flag delimiters"; } *endp = ','; /* for simpler parsing */ @@ -3289,7 +3289,7 @@ static const char *cmd_rewritecond_setflag(apr_pool_t *p, void *_cfg, cfg->flags |= CONDFLAG_NOVARY; } else { - return apr_pstrcat(p, "RewriteCond: unknown flag '", key, "'", NULL); + return apr_pstrcat(p, "unknown flag '", key, "'", NULL); } return NULL; } @@ -3338,7 +3338,7 @@ static const char *cmd_rewritecond(cmd_parms *cmd, void *in_dconf, if (a3 != NULL) { if ((err = cmd_parseflagfield(cmd->pool, newcond, a3, cmd_rewritecond_setflag)) != NULL) { - return err; + return apr_pstrcat(cmd->pool, "RewriteCond: ", err, NULL); } } @@ -3585,7 +3585,7 @@ static const char *cmd_rewriterule_setflag(apr_pool_t *p, void *_cfg, ap_index_of_response(HTTP_INTERNAL_SERVER_ERROR); if (ap_index_of_response(status) == idx) { - return apr_psprintf(p, "RewriteRule: invalid HTTP " + return apr_psprintf(p, "invalid HTTP " "response code '%s' for " "flag 'R'", val); @@ -3628,7 +3628,7 @@ static const char *cmd_rewriterule_setflag(apr_pool_t *p, void *_cfg, } if (error) { - return apr_pstrcat(p, "RewriteRule: unknown flag '", --key, "'", NULL); + return apr_pstrcat(p, "unknown flag '", --key, "'", NULL); } return NULL; @@ -3674,7 +3674,7 @@ static const char *cmd_rewriterule(cmd_parms *cmd, void *in_dconf, if (a3 != NULL) { if ((err = cmd_parseflagfield(cmd->pool, newrule, a3, cmd_rewriterule_setflag)) != NULL) { - return err; + return apr_pstrcat(cmd->pool, "RewriteRule: ", err, NULL); } } |